From 567cca260d54a4515097ff3f2dc277d10ceaf613 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 15 Aug 2019 16:45:03 -0400 Subject: gnu: bash: Unconditionally configure PGRP_PIPE for *-linux systems. * gnu/packages/patches/bash-linux-pgrp-pipe.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/bash.scm (bash)[source]: Add the patch. --- gnu/local.mk | 1 + gnu/packages/bash.scm | 3 ++- gnu/packages/patches/bash-linux-pgrp-pipe.patch | 32 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/bash-linux-pgrp-pipe.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5705494090..d4006c56eb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -703,6 +703,7 @@ dist_patch_DATA = \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-4.4-linux-pgrp-pipe.patch \ %D%/packages/patches/bash-completion-directories.patch \ + %D%/packages/patches/bash-linux-pgrp-pipe.patch \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/beets-python-3.7-fix.patch \ diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index d3abeec6e6..f1ef7047bf 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -115,7 +115,8 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." (base32 "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l")) (patch-flags '("-p0")) - (patches %patch-series-5.0))) + (patches (cons (search-patch "bash-linux-pgrp-pipe.patch") + %patch-series-5.0)))) (version (string-append version "." (number->string (length %patch-series-5.0)))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/bash-linux-pgrp-pipe.patch b/gnu/packages/patches/bash-linux-pgrp-pipe.patch new file mode 100644 index 0000000000..234a55e897 --- /dev/null +++ b/gnu/packages/patches/bash-linux-pgrp-pipe.patch @@ -0,0 +1,32 @@ +Unconditionally enable PGRP_PIPE on Linux (the kernel), regardless of +the kernel version in use on the build machine. + +--- configure.ac.orig 2019-01-02 09:38:44.000000000 -0500 ++++ configure.ac 2019-08-15 16:40:24.271758379 -0400 +@@ -1108,10 +1108,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 1.*|2.[[0123]]*) : ;; +- *) AC_DEFINE(PGRP_PIPE) ;; +- esac ;; ++ AC_DEFINE(PGRP_PIPE) ;; + netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; + *qnx[[67]]*) LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; +--- configure.orig 2019-01-02 09:43:04.000000000 -0500 ++++ configure 2019-08-15 16:41:44.440155912 -0400 +@@ -16312,11 +16312,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 1.*|2.[0123]*) : ;; +- *) $as_echo "#define PGRP_PIPE 1" >>confdefs.h +- ;; +- esac ;; ++ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;; + netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; + *qnx[67]*) LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; -- cgit v1.2.3 From 001504a70ab8e34742aea3fe9e21619a7264dc25 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 26 Jun 2019 10:16:32 +0200 Subject: gnu: perl: Fix cross-compilation. * gnu/packages/perl.scm (perl)[arguments]: Use cross-libc instead of libc when cross-compiling. --- gnu/packages/perl.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 79d8f3b684..03bd710aa9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,7 +82,7 @@ "perl-reproducible-build-date.patch")))) (build-system gnu-build-system) (arguments - '(#:tests? #f + `(#:tests? #f #:configure-flags (let ((out (assoc-ref %outputs "out")) (libc (assoc-ref %build-inputs "libc"))) @@ -130,7 +131,9 @@ (add-after 'install 'remove-extra-references (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (libc (assoc-ref inputs "libc")) + (libc (assoc-ref inputs + ,(if (%current-target-system) + "cross-libc" "libc"))) (config1 (car (find-files (string-append out "/lib/perl5") "^Config_heavy\\.pl$"))) (config2 (find-files (string-append out "/lib/perl5") -- cgit v1.2.3 From 57ec9861f45784a16a469d8bfaf0792969a45455 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 6 Mar 2019 16:39:00 +0100 Subject: gnu: python: Fix cross compilation. * gnu/packages/python.scm (python-2.7)[arguments]: Add a configure flag to disable a check failing when cross-compiling. This is covered here: https://lists.yoctoproject.org/pipermail/poky/2013-June/008997.html, [native-inputs]: Add self and which when cross-compiling, (python-3.7)[arguments]: Refer to native python when cross-compiling. --- gnu/packages/python.scm | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 644c9d7666..b7a664271b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2017 Frederick M. Muriithi ;;; Copyright © 2017, 2018 Adriano Peluso ;;; Copyright © 2017 Ben Sturmfels -;;; Copyright © 2017, 2018 Mathieu Othacehe +;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018 Kei Kebreau @@ -150,6 +150,13 @@ "INSTALL=install -c" "MKDIR_P=mkdir -p" + ;; Disable runtime check failing if cross-compiling, see: + ;; https://lists.yoctoproject.org/pipermail/poky/2013-June/008997.html + ,@(if (%current-target-system) + '("ac_cv_buggy_getaddrinfo=no" + "ac_cv_file__dev_ptmx=no" + "ac_cv_file__dev_ptc=no") + '()) (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) ;; With no -j argument tests use all available cpus, so provide one. @@ -292,7 +299,12 @@ ("tcl" ,tcl) ("tk" ,tk))) ; for tkinter (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ;; When cross-compiling, a native version of Python itself is needed. + ,@(if (%current-target-system) + `(("self" ,this-package) + ("which" ,which)) + '()))) (native-search-paths (list (search-path-specification (variable "PYTHONPATH") @@ -388,13 +400,16 @@ data types.") (if (null? opt) "none" (car opt))) (for-each (lambda (file) (apply invoke - `(,(string-append out "/bin/python3") - ,@opt - "-m" "compileall" - "-f" ; force rebuild - ;; Don't build lib2to3, because it's Python 2 code. - "-x" "lib2to3/.*" - ,file))) + `(,,(if (%current-target-system) + "python3" + '(string-append out + "/bin/python3")) + ,@opt + "-m" "compileall" + "-f" ; force rebuild + ;; Don't build lib2to3, because it's Python 2 code. + "-x" "lib2to3/.*" + ,file))) (find-files out "\\.py$"))) (list '() '("-O") '("-OO"))) #t))))))) -- cgit v1.2.3 From 2ce30a37ad5d74e368a8db4a1f38877ee9759a02 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 26 Jun 2019 18:29:23 +0200 Subject: gnu: tcl: Fix cross-compilation. * gnu/packages/tcl.scm (tcl)[arguments]: Add configure flags to fix cross-compilation. --- gnu/packages/tcl.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 21ca185066..96f41e7928 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -53,7 +53,7 @@ "0kjzj7mkzfnb7ksxanbibibfpciyvsh5ffdlhs0bmfc75kgd435d")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda _ (chdir "unix") #t)) (add-after 'install 'install-private-headers @@ -73,9 +73,16 @@ ;; PREFIX/share/man. The 'validate-documentation-location' phase is ;; not able to fix this up because the default install populates both ;; PREFIX/man and PREFIX/share/man. - #:configure-flags (list (string-append "--mandir=" - (assoc-ref %outputs "out") - "/share/man")) + #:configure-flags + (list (string-append "--mandir=" + (assoc-ref %outputs "out") + "/share/man") + ;; This is needed when cross-compiling, see: + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719247 + ,@(if (%current-target-system) + '("tcl_cv_strtod_buggy=1" + "ac_cv_func_strtod=yes") + '())) ;; XXX: There are a few test failures (related to HTTP, most ;; likely related to name resolution), but that doesn't cause -- cgit v1.2.3 From ee4c8c899b91ff5a691213cb79ff181bc13fe76c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 26 Jun 2019 18:30:13 +0200 Subject: gnu: tk: Fix cross-compilation. * gnu/packages/tcl.scm (tk)[arguments]: Add configure flags to fix cross-compilation. --- gnu/packages/tcl.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 96f41e7928..9ef95b42ed 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -186,9 +186,16 @@ X11 GUIs.") "/lib -lfontconfig"))) #t)))) - #:configure-flags (list (string-append "--with-tcl=" - (assoc-ref %build-inputs "tcl") - "/lib")) + #:configure-flags + (list (string-append "--with-tcl=" + (assoc-ref %build-inputs "tcl") + "/lib") + ;; This is needed when cross-compiling, see: + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719247 + ,@(if (%current-target-system) + '("tcl_cv_strtod_buggy=1" + "ac_cv_func_strtod=yes") + '())) ;; The tests require a running X server, so we just skip them. #:tests? #f)) -- cgit v1.2.3 From da66bd38572840eb56a11e8cf3093bd811992eb5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 26 Jun 2019 18:31:45 +0200 Subject: gnu: libxslt: Fix cross-compilation. * gnu/packages/xml.scm (libxslt)[native-inputs]: Add pkg-config. --- gnu/packages/xml.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b8f3774039..042f06eed3 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -226,6 +226,8 @@ project (but it is usable outside of the Gnome platform).") ("libxml2" ,libxml2) ("python" ,python-minimal-wrapper) ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) (description "Libxslt is an XSLT C library developed for the GNOME project. It is based on libxml for XML parsing, tree manipulation and XPath support.") -- cgit v1.2.3 From d7c53647323963ec656852a5b967f3e3792b99c3 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 26 Jun 2019 18:43:22 +0200 Subject: gnu: xorg: Fix cross-compilation of multiple packages. * gnu/packages/xorg.scm (libxext)[arguments]: Disable zero malloc check that fails when cross-compiling, (libxrender)[arguments]: ditto, (libx11)[arguments]: ditto. --- gnu/packages/xorg.scm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b3d9fd3cb7..d7cd585664 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4552,6 +4552,13 @@ cannot be adequately worked around on the client side of the wire.") (base32 "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar")))) (build-system gnu-build-system) + ;; Disable zero malloc check that fails when cross-compiling. + (arguments + `(#:configure-flags + (list + ,@(if (%current-target-system) + '("--disable-malloc0returnsnull") + '())))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs @@ -4637,6 +4644,13 @@ cannot be adequately worked around on the client side of the wire.") (base32 "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0")))) (build-system gnu-build-system) + ;; Disable zero malloc check that fails when cross-compiling. + (arguments + `(#:configure-flags + (list + ,@(if (%current-target-system) + '("--disable-malloc0returnsnull") + '())))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs @@ -5245,16 +5259,22 @@ draggable titlebars and borders.") (outputs '("out" "doc")) ;8 MiB of man pages + XML (arguments - '(#:configure-flags (list (string-append "--mandir=" - (assoc-ref %outputs "doc") - "/share/man")))) + `(#:configure-flags + (list (string-append "--mandir=" + (assoc-ref %outputs "doc") + "/share/man") + ;; Disable zero malloc check that fails when cross-compiling. + ,@(if (%current-target-system) + '("--disable-malloc0returnsnull") + '())))) (propagated-inputs `(("xorgproto" ,xorgproto) ("libxcb" ,libxcb))) (inputs `(("xtrans" ,xtrans))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("xorgproto" ,xorgproto))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg Core X11 protocol client library") (description "Xorg Core X11 protocol client library.") -- cgit v1.2.3 From ceb9de75a6b39fd5df585418953d937361237202 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 29 Jun 2019 17:31:07 +0200 Subject: gnu: python: Further cross-compilation fixes. * gnu/packages/patches/python-2.7-search-paths.patch: Add cross-compilation support. * gnu/packages/patches/python-3-search-paths.patch: Ditto. * gnu/packages/patches/python-cross-compile.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add above new patch. * gnu/packages/python.scm (python-2.7)[patches]: Add new patch above, [arguments]: Set _PYTHON_HOST_PLATFORM env variable when cross compiling. --- gnu/local.mk | 1 + gnu/packages/patches/python-2.7-search-paths.patch | 10 +- gnu/packages/patches/python-3-search-paths.patch | 11 +- gnu/packages/patches/python-cross-compile.patch | 145 +++++++++++++++++++++ gnu/packages/python.scm | 23 +++- 5 files changed, 181 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/python-cross-compile.patch diff --git a/gnu/local.mk b/gnu/local.mk index d4006c56eb..7bde8663f8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1246,6 +1246,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ + %D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python-cffi-x87-stack-clean.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ diff --git a/gnu/packages/patches/python-2.7-search-paths.patch b/gnu/packages/patches/python-2.7-search-paths.patch index a012bc8fe0..5a345c7691 100644 --- a/gnu/packages/patches/python-2.7-search-paths.patch +++ b/gnu/packages/patches/python-2.7-search-paths.patch @@ -3,13 +3,17 @@ looking for headers and libraries. --- Python-2.7.10/setup.py 2015-10-07 18:33:18.125153186 +0200 +++ Python-2.7.10/setup.py 2015-10-07 18:33:47.497347552 +0200 -@@ -526,6 +526,10 @@ class PyBuildExt(build_ext): +@@ -526,6 +526,14 @@ class PyBuildExt(build_ext): inc_dirs += ['/system/include', '/atheos/autolnk/include'] inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + # Always honor these variables. -+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('CPATH', '').split(os.pathsep) ++ if not cross_compiling: ++ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) ++ inc_dirs += os.getenv('CPATH', '').split(os.pathsep) ++ else: ++ lib_dirs = os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep) ++ inc_dirs = os.getenv('CROSS_CPATH', '').split(os.pathsep) + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if host_platform in ['osf1', 'unixware7', 'openunix8']: diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index 5fea9c66b6..cf1647207b 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -3,7 +3,7 @@ looking for headers and libraries. --- a/setup.py 2015-10-07 23:32:58.891329173 +0200 +++ b/setup.py 2015-10-07 23:46:29.653349924 +0200 -@@ -575,8 +575,8 @@ +@@ -575,15 +575,15 @@ # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. if not cross_compiling: @@ -14,3 +14,12 @@ looking for headers and libraries. else: # Add the sysroot paths. 'sysroot' is a compiler option used to # set the logical path of the standard system headers and + # libraries. +- lib_dirs = (self.compiler.library_dirs + ++ lib_dirs = (os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep) + + sysroot_paths(('LDFLAGS', 'CC'), system_lib_dirs)) +- inc_dirs = (self.compiler.include_dirs + ++ inc_dirs = (os.getenv('CROSS_CPATH', '').split(os.pathsep) + + sysroot_paths(('CPPFLAGS', 'CFLAGS', 'CC'), + system_include_dirs)) + exts = [] diff --git a/gnu/packages/patches/python-cross-compile.patch b/gnu/packages/patches/python-cross-compile.patch new file mode 100644 index 0000000000..5a470e1852 --- /dev/null +++ b/gnu/packages/patches/python-cross-compile.patch @@ -0,0 +1,145 @@ +Patch taken from https://bugs.python.org/issue22724 and augmented with +following Nix patch +https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch +to fix the whole cross-compilation circus. + +--- + Makefile.pre.in | 14 +++++++------- + configure | 5 ++++- + setup.py | 9 ++++++--- + 3 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 2a14f3323b..6239fc32fc 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -492,7 +492,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + + platform: $(BUILDPYTHON) pybuilddir.txt +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform ++ $(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform + + # Create build directory and generate the sysconfig build-time data there. + # pybuilddir.txt contains the name of the build dir and is used for +@@ -503,7 +503,7 @@ platform: $(BUILDPYTHON) pybuilddir.txt + # or removed in case of failure. + pybuilddir.txt: $(BUILDPYTHON) + @echo "none" > ./pybuilddir.txt +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\ ++ $(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\ + if test $$? -ne 0 ; then \ + echo "generate-posix-vars failed" ; \ + rm -f ./pybuilddir.txt ; \ +@@ -525,7 +525,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o + esac; \ + $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ +- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build ++ $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build + + # Build static library + # avoid long command lines, same as LIBRARY_OBJS +@@ -928,7 +928,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKI + upgrade) ensurepip="--upgrade" ;; \ + install|*) ensurepip="" ;; \ + esac; \ +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \ ++ $(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) -m ensurepip \ + $$ensurepip --root=$(DESTDIR)/ ; \ + fi + +@@ -939,7 +939,7 @@ altinstall: commoninstall + upgrade) ensurepip="--altinstall --upgrade --no-default-pip" ;; \ + install|*) ensurepip="--altinstall --no-default-pip" ;; \ + esac; \ +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \ ++ $(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) -m ensurepip \ + $$ensurepip --root=$(DESTDIR)/ ; \ + fi + +@@ -1270,7 +1270,7 @@ libainstall: @DEF_MAKE_RULE@ python-config + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: sharedmods +- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ ++ $(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +@@ -1344,7 +1344,7 @@ frameworkinstallextras: + # This installs a few of the useful scripts in Tools/scripts + scriptsinstall: + SRCDIR=$(srcdir) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/setup.py install \ ++ $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --root=$(DESTDIR)/ +diff --git a/configure b/configure +index 67300fe2b6..6050f588c5 100755 +--- a/configure ++++ b/configure +@@ -741,6 +741,7 @@ CONFIG_ARGS + SOVERSION + VERSION + PYTHON_FOR_BUILD ++PY_BUILD_ENVIRON + PYTHON_FOR_REGEN + host_os + host_vendor +@@ -2964,7 +2965,8 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5 + $as_echo "$interp" >&6; } +- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp ++ PY_BUILD_ENVIRON='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR)' ++ PYTHON_FOR_BUILD=$interp + fi + elif test "$cross_compiling" = maybe; then + as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 +@@ -2974,6 +2976,7 @@ fi + + + ++ + if test "$prefix" != "/"; then + prefix=`echo "$prefix" | sed -e 's/\/$//g'` + fi +diff --git a/setup.py b/setup.py +index cb47a2339c..472e7e2b26 100644 +--- a/setup.py ++++ b/setup.py +@@ -497,8 +497,6 @@ class PyBuildExt(build_ext): + if not cross_compiling: + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') +- if cross_compiling: +- self.add_gcc_paths() + self.add_multiarch_paths() + + # Add paths specified in the environment variables LDFLAGS and +@@ -556,7 +554,10 @@ class PyBuildExt(build_ext): + # be assumed that no additional -I,-L directives are needed. + inc_dirs = self.compiler.include_dirs[:] + lib_dirs = self.compiler.library_dirs[:] +- if not cross_compiling: ++ if cross_compiling: ++ inc_dirs = [] ++ lib_dirs = [] ++ else: + for d in ( + '/usr/include', + ): +@@ -621,6 +622,8 @@ class PyBuildExt(build_ext): + # Some modules that are normally always on: + #exts.append( Extension('_weakref', ['_weakref.c']) ) + ++ self.compiler.library_dirs = lib_dirs + [ '.' ] ++ + # array objects + exts.append( Extension('array', ['arraymodule.c']) ) + +-- +2.17.1 + diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b7a664271b..504a468bab 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -109,7 +109,8 @@ "python-2-deterministic-build-info.patch" "python-2.7-site-prefixes.patch" "python-2.7-source-date-epoch.patch" - "python-2.7-adjust-tests.patch")) + "python-2.7-adjust-tests.patch" + "python-cross-compile.patch")) (modules '((guix build utils))) (snippet '(begin @@ -177,6 +178,12 @@ (add-before 'configure 'patch-lib-shells (lambda _ + ;; This variable is used in setup.py to enable cross compilation + ;; specific switches. As it is not set properly by configure + ;; script, set it manually. + ,@(if (%current-target-system) + '((setenv "_PYTHON_HOST_PLATFORM" "")) + '()) ;; Filter for existing files, since some may not exist in all ;; versions of python that are built with this recipe. (substitute* (filter file-exists? @@ -256,7 +263,9 @@ (if (null? opt) "none" (car opt))) (for-each (lambda (file) (apply invoke - `(,(string-append out "/bin/python") + `(,,(if (%current-target-system) + "python2" + '(string-append out "/bin/python")) ,@opt "-m" "compileall" "-f" ; force rebuild @@ -302,7 +311,7 @@ `(("pkg-config" ,pkg-config) ;; When cross-compiling, a native version of Python itself is needed. ,@(if (%current-target-system) - `(("self" ,this-package) + `(("python2" ,this-package) ("which" ,which)) '()))) (native-search-paths @@ -376,10 +385,11 @@ data types.") ((#:phases phases) `(modify-phases ,phases (add-before 'check 'set-TZDIR - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) ;; test_email requires the Olson time zone database. (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") + (string-append (assoc-ref + (or native-inputs inputs) "tzdata") "/share/zoneinfo")) #t)) ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it @@ -415,6 +425,9 @@ data types.") #t))))))) (native-inputs `(("tzdata" ,tzdata-for-tests) + ,@(if (%current-target-system) + `(("python3" ,this-package)) + '()) ,@(package-native-inputs python-2))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From 078784ce7c1ac5ed6483a00712b6c6badac8b2c9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 1 Jul 2019 15:31:48 +0200 Subject: gnu: http-parser: Fix cross-compilation. * gnu/packages/web.scm (http-parser)[arguments]: Set CC and AR variables in Makefile in order to fix cross-compilation. --- gnu/packages/web.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5b1f60cfdd..b415a149b7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -5243,10 +5244,22 @@ into your tests. It automatically starts up a HTTP server in a separate thread #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "CC=gcc" "library") + "library" + ,@(if (%current-target-system) + '() + '("CC=gcc"))) #:phases (modify-phases %standard-phases - (delete 'configure)))) + ,@(if (%current-target-system) + '((replace 'configure + (lambda* (#:key target #:allow-other-keys) + (substitute* (find-files "." "Makefile") + (("CC\\?=.*$") + (string-append "CC=" target "-gcc\n")) + (("AR\\?=.*$") + (string-append "AR=" target "-ar\n"))) + #t))) + '((delete 'configure)))))) (synopsis "HTTP request/response parser for C") (description "This is a parser for HTTP messages written in C. It parses both requests and responses. The parser is designed to be used in -- cgit v1.2.3 From bc5ae287b75ea76ce4dfef2867ddb3dbf30735e5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 1 Jul 2019 16:58:53 +0200 Subject: gnu: libgit2: Fix cross compilation. * gnu/packages/version-control.scm (libgit2)[arguments]: Set PKG_CONFIG_EXECUTABLE variable when cross-compiling. Also do not run test suite if cross-compiling. --- gnu/packages/version-control.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 573fa6f8cc..192fa666d9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -545,7 +545,14 @@ everything from small to very large projects with speed and efficiency.") (build-system cmake-build-system) (outputs '("out" "debug")) (arguments - `(#:configure-flags '("-DUSE_SHA1DC=ON") ; SHA-1 collision detection + `(#:configure-flags + (list "-DUSE_SHA1DC=ON" ; SHA-1 collision detection + ,@(if (%current-target-system) + `((string-append + "-DPKG_CONFIG_EXECUTABLE=" + (assoc-ref %build-inputs "pkg-config") + "/bin/" ,(%current-target-system) "-pkg-config")) + '())) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-hardcoded-paths @@ -560,9 +567,13 @@ everything from small to very large projects with speed and efficiency.") (lambda _ (for-each make-file-writable (find-files ".")) #t)) - ;; Run checks more verbosely. + ;; Run checks more verbosely, unless we are cross-compiling. (replace 'check - (lambda _ (invoke "./libgit2_clar" "-v" "-Q")))))) + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (invoke "./libgit2_clar" "-v" "-Q") + ;; Tests may be disabled if cross-compiling. + (format #t "Test suite not run.~%"))))))) (inputs `(("libssh2" ,libssh2) ("http-parser" ,http-parser))) -- cgit v1.2.3 From 283fb648514b68c07203a388fc04cbd2ba7cd3a4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 6 Mar 2019 11:26:35 +0100 Subject: gnu: ath9k-htc-firmware: Fix cross compilation. * gnu/packages/firmware.scm (ath9k-htc-firmware)[phases]: Search for "cross-gcc" in native-inputs and inputs in "configure" phase. --- gnu/packages/firmware.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index c473ccd920..3104d78b39 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Vagrant Cascadian +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,7 +60,7 @@ '(#:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) (chdir "target_firmware") ;; 'configure' is a simple script that runs 'cmake' with @@ -67,7 +68,7 @@ (substitute* "configure" (("^TOOLCHAIN=.*$") (string-append "TOOLCHAIN=" - (assoc-ref inputs "cross-gcc") + (assoc-ref (or native-inputs inputs) "cross-gcc") "\n"))) #t)) (replace 'install -- cgit v1.2.3 From b5ebab80238dfaea3acb0bd2c6b29fa5fb2bb45e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 09:34:28 +0200 Subject: gnu: mit-krb5: Fix cross-compilation. * gnu/packages/kerberos.scm (mit-krb5)[arguments]: Disable tests when cross-compiling. Add cross-compilation specific configure-flags and make-flags. Search for perl in native-inputs or inputs. --- gnu/packages/kerberos.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 1253a58546..bf344ce8ce 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Vong +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,9 +69,21 @@ ("perl" ,perl))) (arguments `(;; XXX: On 32-bit systems, 'kdb5_util' hangs on an fcntl/F_SETLKW call - ;; while running the tests in 'src/tests'. - #:tests? ,(string=? (%current-system) "x86_64-linux") + ;; while running the tests in 'src/tests'. Also disable tests when + ;; cross-compiling. + #:tests? ,(and (not (%current-target-system)) + (string=? (%current-system) "x86_64-linux")) + ,@(if (%current-target-system) + '(#:configure-flags + (list "krb5_cv_attr_constructor_destructor=yes" + "ac_cv_func_regcomp=yes" + "ac_cv_printf_positional=yes" + "ac_cv_file__etc_environment=yes" + "ac_cv_file__etc_TIMEZONE=no") + #:make-flags + (list "CFLAGS+=-DDESTRUCTOR_ATTR_WORKS=1")) + '()) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source-directory @@ -78,8 +91,8 @@ (chdir "src") #t)) (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (let ((perl (assoc-ref inputs "perl"))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((perl (assoc-ref (or native-inputs inputs) "perl"))) (substitute* "plugins/kdb/db2/libdb2/test/run.test" (("/bin/cat") (string-append perl "/bin/perl")) (("D/bin/sh") (string-append "D" (which "sh"))) -- cgit v1.2.3 From 642328abcdd5986c177702fa7cb20bb9aef35d17 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 10:58:04 +0200 Subject: gnu: help2man: Fix cross-compilation. * gnu/packages/man.scm (help2man)[native-inputs]: Add perl. --- gnu/packages/man.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 42e1918597..79e24cf02d 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -216,6 +216,8 @@ Linux kernel and C library interfaces employed by user-space programs.") ;; ("perl-LocaleGettext" ,perl-LocaleGettext) ;; ("gettext" ,gettext-minimal) )) + (native-inputs + `(("perl" ,perl))) (home-page "https://www.gnu.org/software/help2man/") (synopsis "Automatically generate man pages from program --help") (description -- cgit v1.2.3 From 1475554147d8e287afb243912d3cb6e5a3b20baf Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 17:21:37 +0200 Subject: gnu: xmlto: Fix cross-compilation. * gnu/packages/xml.scm (xmlto)[native-inputs]: Add util-linux. --- gnu/packages/xml.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 042f06eed3..47a7e7b793 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -940,6 +940,8 @@ code for classes that correspond to data structures defined by XMLSchema.") (assoc-ref %build-inputs "util-linux") "/bin/getopt")))) + (native-inputs + `(("util-linux" ,util-linux))) (inputs `(("util-linux" ,util-linux) ; for 'getopt' ("libxml2" ,libxml2) ; for 'xmllint' -- cgit v1.2.3 From 5fd395db3f6b425a04675b96279f92ea86aa1c54 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 17:46:34 +0200 Subject: gnu: libarchive: Fix cross-compilation. * gnu/packages/backup.scm (libarchive)[arguments]: Do not build and run tests when cross-compiling. --- gnu/packages/backup.scm | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a92c8c9aca..512882c17c 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Alex Vong ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -230,24 +231,34 @@ backups (called chunks) to allow easy burning to CD/DVD.") (("/bin/pwd") (which "pwd"))) #t)) (replace 'check - (lambda _ - ;; XXX: The test_owner_parse, test_read_disk, and - ;; test_write_disk_lookup tests expect user 'root' to exist, but - ;; the chroot's /etc/passwd doesn't have it. Turn off those tests. - ;; - ;; XXX: Adjust test that fails with zstd 1.4.1 because the default - ;; options compresses two bytes better than this test expects. - ;; https://github.com/libarchive/libarchive/issues/1226 - (substitute* "libarchive/test/test_write_filter_zstd.c" - (("compression-level\", \"6\"") - "compression-level\", \"7\"")) - - ;; The tests allow one to disable tests matching a globbing pattern. - (invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test") - ;; XXX: This glob disables too much. - (invoke "./libarchive_test" "^test_*_disk*") - (invoke "./bsdcpio_test" "^test_owner_parse") - (invoke "./bsdtar_test"))) + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + ;; XXX: The test_owner_parse, test_read_disk, and + ;; test_write_disk_lookup tests expect user 'root' to + ;; exist, but the chroot's /etc/passwd doesn't have + ;; it. Turn off those tests. + ;; + ;; XXX: Adjust test that fails with zstd 1.4.1 + ;; because the default options compresses two bytes + ;; better than this test expects. + ;; https://github.com/libarchive/libarchive/issues/1226 + (begin + (substitute* "libarchive/test/test_write_filter_zstd.c" + (("compression-level\", \"6\"") + "compression-level\", \"7\"")) + + ;; The tests allow one to disable tests matching a globbing pattern. + (invoke "make" + "libarchive_test" + "bsdcpio_test" + "bsdtar_test") + + ;; XXX: This glob disables too much. + (invoke "./libarchive_test" "^test_*_disk*") + (invoke "./bsdcpio_test" "^test_owner_parse") + (invoke "./bsdtar_test")) + ;; Tests may be disabled if cross-compiling. + (format #t "Test suite not run.~%")))) (add-after 'install 'add--L-in-libarchive-pc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 2b9ef6e5ef13a4f17312633e514f034f7fd6f155 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 18:14:12 +0200 Subject: gnu: tcsh: Fix cross-compilation. * gnu/packages/shells.scm (tcsh)[arguments]: Replace "cc" by "gcc" as native gethost compiler when cross-compiling. --- gnu/packages/shells.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0579c167fc..cf578151b4 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -356,6 +357,14 @@ written by Paul Haahr and Byron Rakitzis.") (arguments `(#:phases (modify-phases %standard-phases + ,@(if (%current-target-system) + '((add-before 'configure 'set-cross-cc + (lambda _ + (substitute* "configure" + (("CC_FOR_GETHOST=\"cc\"") + "CC_FOR_GETHOST=\"gcc\"")) + #t))) + '()) (add-before 'check 'patch-test-scripts (lambda _ ;; Take care of pwd -- cgit v1.2.3 From 032974aae621e871c86c9654f94de9c07e2fde43 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 18:26:48 +0200 Subject: gnu: pkg-config: Fix cross-compilation. * gnu/packages/pkg-config.scm (%pkg-config)[arguments]: Add configure-flags to disable tests that fail when cross-compiling. --- gnu/packages/pkg-config.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index 6fc19a975d..329a63658a 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,7 +49,17 @@ (base32 "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--with-internal-glib"))) + (arguments + `(#:configure-flags + '("--with-internal-glib" + ;; Those variables are guessed incorrectly when cross-compiling. + ;; See: https://developer.gimp.org/api/2.0/glib/glib-cross-compiling.html. + ,@(if (%current-target-system) + '("glib_cv_stack_grows=no" + "glib_cv_uscore=no" + "ac_cv_func_posix_getpwuid_r=yes" + "ac_cv_func_posix_getgrgid_r=yes") + '())))) (native-search-paths (list (search-path-specification (variable "PKG_CONFIG_PATH") -- cgit v1.2.3 From 9b70f2c38647c32459cfecfb2755800fbb31ea29 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 18:41:05 +0200 Subject: gnu: alsa-utils: Fix cross-compilation. * gnu/packages/linux.scm (alsa-utils)[inputs]: Move gettext from here ... [native-inputs]: ... to here, in order to fix cross-compilation. --- gnu/packages/linux.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b65303ae6f..32b0cd009d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Gábor Boskovits -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017 nee @@ -1524,12 +1524,13 @@ MIDI functionality to the Linux-based operating system.") (("\\$\\(MKDIR_P\\) .*ASOUND_STATE_DIR.*") "true\n")) #t))))) + (native-inputs + `(("gettext" ,gettext-minimal))) (inputs `(("libsamplerate" ,libsamplerate) ("ncurses" ,ncurses) ("alsa-lib" ,alsa-lib) - ("xmlto" ,xmlto) - ("gettext" ,gettext-minimal))) + ("xmlto" ,xmlto))) (home-page "http://www.alsa-project.org/") (synopsis "Utilities for the Advanced Linux Sound Architecture (ALSA)") (description -- cgit v1.2.3 From 5a2f58d52caea7a2a94a8ff18ef1ce9bebab7166 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 4 Sep 2019 18:25:17 +0200 Subject: gnu: texinfo: Fix cross-compilation. * gnu/packages/texinfo.scm (texinfo)[arguments]: Do not reset environment before running configure with the native compiler, in a cross-compilation context, [inputs]: move perl from here ... [native-inputs]: ... to here. Also add ncurses that is needed in a cross-compilation context to build texinfo native tools. --- gnu/packages/texinfo.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index befdd78551..9b96d2d0cf 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -41,8 +41,28 @@ (base32 "0rixv4c301djr0d0cnsxs8c1wjndi6bf9vi5axz6mwjkv80cmfcv")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses) - ("perl" ,perl))) + (arguments + ;; When cross-compiling, the package is configured twice: once with the + ;; native compiler and once with the cross-compiler. During the configure + ;; with the native compiler, the environment is reset. This leads to + ;; multiple environment variables missing. Do not reset the environment + ;; to prevent that. + (if (%current-target-system) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-cross-configure + (lambda _ + (substitute* "configure" + (("env -i") + "env ")) + #t)))) + '())) + (inputs `(("ncurses" ,ncurses))) + ;; When cross-compiling, texinfo will build some of its own binaries with + ;; the native compiler. This means ncurses is needed both in both inputs + ;; and native-inputs. + (native-inputs `(("perl" ,perl) + ("ncurses" ,ncurses))) (native-search-paths ;; This is the variable used by the standalone Info reader. -- cgit v1.2.3 From c096028a372d2f19a8efdc741d44cffbdc74ee03 Mon Sep 17 00:00:00 2001 From: Pierre-Moana Levesque Date: Tue, 2 Jul 2019 19:37:56 +0200 Subject: gnu: texinfo-5: Fix cross-compilation. * gnu/packages/texinfo.scm (texinfo-5)[native-inputs]: Keep native-inputs from inherited package texinfo. --- gnu/packages/texinfo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 9b96d2d0cf..a79330d20e 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,8 +92,7 @@ is on expressing the content semantically, avoiding physical markup commands.") (patches (search-patches "texinfo-5-perl-compat.patch")) (sha256 (base32 - "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal")))) - (native-inputs '()))) + "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal")))))) (define-public texinfo-4 (package (inherit texinfo) -- cgit v1.2.3 From 6fe3e25006308ebd570996d444475a6a30d4d30e Mon Sep 17 00:00:00 2001 From: Pierre-Moana Levesque Date: Thu, 4 Jul 2019 19:21:37 +0200 Subject: gnu: texinfo-4: Fix cross compilation * gnu/packages/texinfo.scm (texinfo-4)[native-inputs]: Add automake and native-inputs from texinfo package, [arguments]: Replace outdated config.sub and config.guess by the ones taken from automake above. Also make sure native tools are built before build phase. --- gnu/packages/texinfo.scm | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index a79330d20e..1603db0b4e 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -21,9 +21,11 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages texinfo) + #:use-module (gnu packages autotools) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -106,8 +108,37 @@ is on expressing the content semantically, avoiding physical markup commands.") (sha256 (base32 "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d")))) - (native-inputs '()) - (inputs `(("ncurses" ,ncurses) ("xz" ,xz))))) + (inputs `(("ncurses" ,ncurses) + ("xz" ,xz))) + (native-inputs + `(("automake" ,automake) + ,@(package-native-inputs texinfo))) + (arguments + (substitute-keyword-arguments (package-arguments texinfo) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess. + (with-directory-excursion "build-aux" + (for-each + (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t)) + ;; Build native version of tools before running 'build phase. + ,@(if (%current-target-system) + `((add-before 'build 'make-native-gnu-lib + (lambda* (#:key inputs #:allow-other-keys) + (invoke "make" "-C" "tools/gnulib/lib") + #t))) + '()))))))) (define-public info-reader ;; The idea of this package is to have the standalone Info reader without -- cgit v1.2.3 From c3d523b04812c49080fbb5f95db5a03b73e36429 Mon Sep 17 00:00:00 2001 From: Pierre-Moana Levesque Date: Thu, 8 Aug 2019 17:16:50 +0200 Subject: gnu: guile-xcb: Fix cross-compilation. * gnu/packages/guile-wm.scm (guile-xcb)[native-inputs]: Add guile. --- gnu/packages/guile-wm.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 622fc560d9..3a6eebc91a 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Alex ter Weele ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017 ng0 +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,8 @@ "--with-guile-site-ccache-dir=" (assoc-ref %outputs "out") "/lib/guile/2.2/site-ccache")))) - (native-inputs `(("pkg-config" ,pkg-config) + (native-inputs `(("guile" ,guile-2.2) + ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.2) ("xcb" ,xcb-proto))) -- cgit v1.2.3 From e373adc13969bb8d5bf7c040fb32b8a51b40c91b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 20 Sep 2019 09:30:24 +0200 Subject: gnu: libgpg-error: Fix cross compilation. * gnu/packages/gnupg.scm (libgpg-error)[arguments]: Add a lock-obj header to the target platform when cross-compiling, [native-inputs]: add gettext that is needed when cross-compiling. --- gnu/packages/gnupg.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 56db412145..4acc434093 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -96,6 +96,31 @@ (("namespace=errnos") "pkg_namespace=errnos")) #t)))) (build-system gnu-build-system) + (arguments + (if (%current-target-system) + `(#:modules ((ice-9 match) + (guix build gnu-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + ;; When cross-compiling, some platform specific properties cannot + ;; be detected. Create a symlink to the appropriate platform + ;; file. See Cross-Compiling section at: + ;; https://github.com/gpg/libgpg-error/blob/master/README + (add-after 'unpack 'cross-symlinks + (lambda* (#:key target inputs #:allow-other-keys) + (let ((triplet + (match (string-take target + (string-index target #\-)) + ("armhf" "arm-unknown-linux-gnueabi") + (x + (string-append x "-unknown-linux-gnu"))))) + (symlink + (string-append "lock-obj-pub." triplet ".h") + "src/syscfg/lock-obj-pub.linux-gnu.h")) + #t)))) + '())) + (native-inputs `(("gettext" ,gettext-minimal))) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") (description -- cgit v1.2.3 From 3fe8fe5360a0c53296d807a5109d6a94adc5d95f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 2 Jul 2019 16:20:19 +0200 Subject: gnu: libpaper: Fix aarch64 cross-compilation. The packaged config.sub and config.guess do not have aarch64 support. Replace them by the ones from automake. * gnu/packages/ghostscript.scm (libpaper)[arguments]: Replace outdated config.sub and config.guess, taken from ... [native-inputs]: ... here, by adding automake. --- gnu/packages/ghostscript.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 3b74a96966..7839ac5b72 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -84,6 +85,24 @@ Consortium standard (ICC), approved as ISO 15076-1.") (sha256 (base32 "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q")))) (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'. + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (for-each (lambda (file) + (install-file + (string-append (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess")) + #t))))) (synopsis "Library for handling paper sizes") (description "The paper library and accompanying files are intended to provide a simple -- cgit v1.2.3 From 59bd4b90e8ffb960430d8659cc2dac0c19fe8217 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 3 Jul 2019 16:15:39 +0200 Subject: gnu: indent: Fix aarch64 cross-compilation. The packaged config.sub and config.guess do not have aarch64 support. Replace them by the ones from automake. * gnu/packages/code.scm (indent)[arguments]: Replace outdated config.sub and config.guess, taken from ... [native-inputs]: ... here, by adding automake. (indent-2.2.12)[native-inputs]: Inherit from indent native-inputs to keep automake that is added above. --- gnu/packages/code.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 13e2c4ad44..50d6870bc7 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -29,6 +29,7 @@ (define-module (gnu packages code) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -644,9 +645,24 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming languages.") ;; overrides this to be in PREFIX/doc. Fix this. (substitute* "doc/Makefile.in" (("^docdir = .*$") "docdir = @docdir@\n")) + #t)) + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (with-directory-excursion "config" + (for-each (lambda (file) + (install-file + (string-append (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) #t))))) (native-inputs - `(("texinfo" ,texinfo))) + `(("texinfo" ,texinfo) + ("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'. (synopsis "Code reformatter") (description "Indent is a program that makes source code easier to read by -- cgit v1.2.3 From 1a1bce6b5dd1f1f3c566feb5146279d69a2c9483 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 4 Jul 2019 09:01:44 +0200 Subject: gnu: libsamplerate: Fix aarch64 cross-compilation. The packaged config.sub and config.guess do not have aarch64 support. Replace them by the ones from automake. * gnu/packages/pulseaudio.scm (libsamplerate)[arguments]: Replace outdated config.sub and config.guess, taken from ... [native-inputs]: ... here, by adding automake. --- gnu/packages/pulseaudio.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index ff4049d707..89773d8be2 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix utils) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix build-system gnu) #:use-module (guix build-system python) @@ -102,10 +104,28 @@ for reading and writing new sound file formats.") "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("automake" ,automake))) ;For up to date 'config.guess' and 'config.sub'. (propagated-inputs `(("libsndfile" ,libsndfile) ("fftw" ,fftw))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (with-directory-excursion "Cfg" + (for-each (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t))))) (home-page "http://www.mega-nerd.com/SRC/index.html") (synopsis "Audio sample rate conversion library") (description -- cgit v1.2.3 From f8dae88c1e5808394aca8a45a7433d60ee1b71bb Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 18:34:09 +0200 Subject: gnu: mkfontdir: Fix aarch64 cross-compilation. The packaged config.sub and config.guess do not have aarch64 support. Replace them by the ones from automake. * gnu/packages/xorg.scm (mkfontdir)[arguments]: Replace outdated config.sub and config.guess, by the ones taken from ... [native-inputs]: ... here, by adding automake. --- gnu/packages/xorg.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d7cd585664..d5d983a8d2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2019 nee ;;; Copyright © 2019 Yoshinori Arai +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -4742,8 +4743,21 @@ protocol and arbitrary X extension protocol.") "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (for-each (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess")) + #t)) (add-after 'install 'wrap-mkfontdir (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") @@ -4755,7 +4769,8 @@ protocol and arbitrary X extension protocol.") (inputs `(("mkfontscale" ,mkfontscale))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("automake" ,automake))) ;For up to date 'config.guess' and 'config.sub'. (home-page "https://www.x.org/wiki/") (synopsis "Create an index of X font files in a directory") (description -- cgit v1.2.3 From eff633257cc191d33b93cb1ada6ef34daa969c00 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 8 Jul 2019 14:12:32 +0200 Subject: gnu: lvm2: Fix cross-compilation. * gnu/packages/linux.scm (lvm2)[arguments]: Add cross-compilation specific configure-flags. --- gnu/packages/linux.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 32b0cd009d..7ac5a771c8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2654,7 +2654,7 @@ time.") (inputs `(("udev" ,eudev))) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (add-after 'configure 'set-makefile-shell (lambda _ @@ -2689,7 +2689,12 @@ time.") (assoc-ref %outputs "out") "/lib,-rpath=" (assoc-ref %outputs "out") - "/lib/device-mapper")) + "/lib/device-mapper") + ;; This is needed when cross-compiling. + ,@(if (%current-target-system) + '("ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes") + '())) ;; The tests use 'mknod', which requires root access. #:tests? #f)) -- cgit v1.2.3 From 8e8855f9aa0521ade0741896b2285d9ddf493fed Mon Sep 17 00:00:00 2001 From: Pierre-Moana Levesque Date: Wed, 31 Jul 2019 13:18:08 +0200 Subject: gnu: nghttp2: Fix cross-compilation. * gnu/packages/web.scm (nghttp2)[arguments]: In set-timezone-directory phase, search in both inputs and native-inputs. --- gnu/packages/web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b415a149b7..d23f6cb400 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -6444,9 +6445,10 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (assoc-ref outputs "lib"))) #t)) (add-before 'check 'set-timezone-directory - (lambda* (#:key inputs #:allow-other-keys) - (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (setenv "TZDIR" (string-append + (assoc-ref (or native-inputs inputs) "tzdata") + "/share/zoneinfo")) #t))))) (home-page "https://nghttp2.org/") (synopsis "HTTP/2 protocol client, proxy, server, and library") -- cgit v1.2.3 From f0d5ce5a117b8195f2e5a3eb059d3f9038b5a90a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 2 Aug 2019 11:32:06 +0200 Subject: gnu: procps: Fix cross-compilation. * gnu/packages/linux.scm (procps)[arguments]: Add configure flags needed from cross-compilation. --- gnu/packages/linux.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7ac5a771c8..351087e556 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1141,10 +1141,16 @@ by Robert Shea and Robert Anton Wilson.") "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h")))) (build-system gnu-build-system) (arguments - '(#:modules ((guix build utils) + `(#:modules ((guix build utils) (guix build gnu-build-system) (srfi srfi-1) (srfi srfi-26)) + ,@(if (%current-target-system) + '(#:configure-flags + (list + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes")) + '()) #:phases (modify-phases %standard-phases (add-after -- cgit v1.2.3 From f22997b1a7e9ae480398c8963a5e28c6c5afa64e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 18 Aug 2019 12:59:48 +0200 Subject: gnu: console-setup: Fix cross-compilation. * gnu/packages/xorg.scm (console-setup)[native-inputs]: Add perl, [arguments]: search for bash in both native-inputs and inputs. --- gnu/packages/xorg.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d5d983a8d2..ecd8c29f21 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6412,25 +6412,28 @@ output.") " "))) #t)) (add-before 'build 'make-doubled-bdfs - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (invoke "make" "-C" "Fonts" "doubled_bdfs" (string-append "SHELL=" - (assoc-ref inputs "bash") + (assoc-ref (or native-inputs inputs) + "bash") "/bin/bash")))) (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) (invoke "make" "install-linux" (string-append "prefix=" out) (string-append "SHELL=" - (assoc-ref inputs "bash") + (assoc-ref (or native-inputs inputs) + "bash") "/bin/bash")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("bdftopcf" ,bdftopcf) ("bdfresize" ,bdfresize) - ("sharutils" ,sharutils))) ;for 'uuencode' + ("sharutils" ,sharutils) ;for 'uuencode' + ("perl" ,perl))) (inputs `(("perl" ,perl))) ;used by 'ckbcomp' (synopsis "Set up the Linux console font and keyboard") -- cgit v1.2.3 From 7dbd3a8e3e9492dbe7338886d2bc1e23f917933f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 18 Aug 2019 13:01:17 +0200 Subject: gnu: mdadm: Fix cross-compilation. * gnu/packages/linux.scm (mdadm)[arguments]: Search for coreutils in both native-inputs and inputs. --- gnu/packages/linux.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 351087e556..461c019d64 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3503,8 +3503,9 @@ MPEG-2 and audio over Linux IEEE 1394.") #:phases (modify-phases %standard-phases (add-before 'build 'patch-program-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((coreutils (assoc-ref inputs "coreutils"))) + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((coreutils (assoc-ref (or native-inputs inputs) + "coreutils"))) (substitute* "udev-md-raid-arrays.rules" (("/usr/bin/(readlink|basename)" all program) (string-append coreutils "/bin/" program)))) -- cgit v1.2.3 From 06b2bc550fdcd943e19471873e0838e712217681 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 3 Jul 2019 09:25:39 +0200 Subject: gnu: bc: Fix cross-compilation. * gnu/packages/patches/bc-fix-cross-compilation.patch: New patch file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/algebra.scm (bc)[origin]: Apply it, [native-inputs]: Add automake and autoconf, [arguments]: Add a new 'autogen phase that is needed by the new patch. --- gnu/local.mk | 1 + gnu/packages/algebra.scm | 15 +- .../patches/bc-fix-cross-compilation.patch | 171 +++++++++++++++++++++ 3 files changed, 184 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/bc-fix-cross-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7bde8663f8..a1190af0db 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -706,6 +706,7 @@ dist_patch_DATA = \ %D%/packages/patches/bash-linux-pgrp-pipe.patch \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ + %D%/packages/patches/bc-fix-cross-compilation.patch \ %D%/packages/patches/beets-python-3.7-fix.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/benchmark-unbundle-googletest.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 02b4d4ca21..956f349d0b 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -681,15 +682,23 @@ binary.") (uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz")) (sha256 (base32 - "0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2")))) + "0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2")) + (patches (search-patches "bc-fix-cross-compilation.patch")))) (build-system gnu-build-system) (native-inputs - `(("ed" ,ed) + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("ed" ,ed) ("flex" ,flex) ("texinfo" ,texinfo))) (arguments '(#:configure-flags - (list "--with-readline"))) + (list "--with-readline") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (invoke "autoreconf" "-vif")))))) (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") (description diff --git a/gnu/packages/patches/bc-fix-cross-compilation.patch b/gnu/packages/patches/bc-fix-cross-compilation.patch new file mode 100644 index 0000000000..14dfecdbde --- /dev/null +++ b/gnu/packages/patches/bc-fix-cross-compilation.patch @@ -0,0 +1,171 @@ +Patch taken from nix. + +commit fdda59736ddc048cf38a2c7103f4f5d9eeaf995e +Author: Ben Gamari +Date: Tue Oct 17 10:51:34 2017 -0400 + + Try implementing cross-compilation + +diff --git a/bc/Makefile.am b/bc/Makefile.am +index d9d412e..fdef633 100644 +--- a/bc/Makefile.am ++++ b/bc/Makefile.am +@@ -17,6 +17,7 @@ MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \ + + AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../h + LIBBC = ../lib/libbc.a ++LIBBC_HOST = ../lib/libbc_host.a + LIBL = @LEXLIB@ + LDADD = $(LIBBC) $(LIBL) @READLINELIB@ + +@@ -29,12 +30,20 @@ $(PROGRAMS): libmath.h $(LIBBC) + scan.o: bc.h + global.o: libmath.h ++ ++main_host.c : main.c ++ cp $< $@ + +-fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o ++fbcOBJ = $(addsuffix _host,main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o) ++ ++%.o_host : CC:=$(CC_FOR_BUILD) ++ ++%.o_host : %.c ++ $(COMPILE) -c $(CFLAGS) $(INCLUDES) -o $@ $< + +-libmath.h: libmath.b $(fbcOBJ) $(LIBBC) ++libmath.h: libmath.b $(fbcOBJ) $(LIBBC_HOST) + echo '{0}' > libmath.h +- $(MAKE) global.o +- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS) ++ $(MAKE) global.o_host ++ $(CC_FOR_BUILD) -o fbc $(fbcOBJ) global.o_host $(LIBBC_HOST) $(LIBL) ${READLINELIB} $(LIBS) + ./fbc -c $(srcdir)/libmath.b libmath.h + $(srcdir)/fix-libmath_h + rm -f ./fbc ./global.o +diff --git a/configure.ac b/configure.ac +index fc74573..5cabb73 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,6 +20,7 @@ m4_define([dc_version], 1.4.1) + + AC_INIT([bc],[bc_version]) + AC_CONFIG_SRCDIR(doc/bc.1) ++AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([dist-bzip2]) + AC_CONFIG_HEADERS(config.h) + +@@ -35,6 +36,7 @@ AC_DEFINE([DC_COPYRIGHT], + [Define the dc copyright line.]) + + AC_PROG_CC ++AX_CC_FOR_BUILD + AC_USE_SYSTEM_EXTENSIONS + + AM_PROG_LEX +diff --git a/lib/Makefile.am b/lib/Makefile.am +index ec4bf59..c670f5b 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,5 +1,5 @@ + ## Process this file with automake to produce Makefile.in +-noinst_LIBRARIES = libbc.a ++noinst_LIBRARIES = libbc.a libbc_host.a + + AM_CPPFLAGS = -I. -I.. -I$(srcdir)/../h + +@@ -24,3 +24,11 @@ testmul: testmul.o number.o + + specialnumber: newnumber.o + cp newnumber.o number.o ++ ++%.o_host : CC:=$(CC_FOR_BUILD) ++%.o_host : %.c ++ $(COMPILE) -c $(CFLAGS) $(INCLUDES) -o $@ $< ++ ++libbc_host.a : $(addsuffix _host,$(libbc_a_OBJECTS)) ++ ar cru $@ $+ ++ ranlib $@ +diff --git a/m4/cc_for_build.m4 b/m4/cc_for_build.m4 +new file mode 100644 +index 0000000..c62ffad +--- /dev/null ++++ b/m4/cc_for_build.m4 +@@ -0,0 +1,77 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CC_FOR_BUILD ++# ++# DESCRIPTION ++# ++# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD. ++# ++# LICENSE ++# ++# Copyright (c) 2010 Reuben Thomas ++# Copyright (c) 1999 Richard Henderson ++# ++# This program is free software: you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation, either version 3 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ++# Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program. If not, see . ++# ++# As a special exception, the respective Autoconf Macro's copyright owner ++# gives unlimited permission to copy, distribute and modify the configure ++# scripts that are the output of Autoconf when processing the Macro. You ++# need not follow the terms of the GNU General Public License when using ++# or distributing such scripts, even though portions of the text of the ++# Macro appear in them. The GNU General Public License (GPL) does govern ++# all other use of the material that constitutes the Autoconf Macro. ++# ++# This special exception to the GPL applies to versions of the Autoconf ++# Macro released by the Autoconf Archive. When you make and distribute a ++# modified version of the Autoconf Macro, you may extend this special ++# exception to the GPL to apply to your modified version as well. ++ ++#serial 3 ++ ++dnl Get a default for CC_FOR_BUILD to put into Makefile. ++AC_DEFUN([AX_CC_FOR_BUILD], ++[# Put a plausible default for CC_FOR_BUILD in Makefile. ++if test -z "$CC_FOR_BUILD"; then ++ if test "x$cross_compiling" = "xno"; then ++ CC_FOR_BUILD='$(CC)' ++ else ++ CC_FOR_BUILD=gcc ++ fi ++fi ++AC_SUBST(CC_FOR_BUILD) ++# Also set EXEEXT_FOR_BUILD. ++if test "x$cross_compiling" = "xno"; then ++ EXEEXT_FOR_BUILD='$(EXEEXT)' ++else ++ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext, ++ [rm -f conftest* ++ echo 'int main () { return 0; }' > conftest.c ++ bfd_cv_build_exeext= ++ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5 ++ for file in conftest.*; do ++ case $file in ++ *.c | *.o | *.obj | *.ilk | *.pdb) ;; ++ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;; ++ esac ++ done ++ rm -f conftest* ++ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no]) ++ EXEEXT_FOR_BUILD="" ++ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext} ++fi ++AC_SUBST(EXEEXT_FOR_BUILD)])dnl -- cgit v1.2.3 From 647cfcf68184e8558fcea751ef6d95b6e5d86ae1 Mon Sep 17 00:00:00 2001 From: Pierre-Moana Levesque Date: Thu, 4 Jul 2019 19:18:48 +0200 Subject: gnu: libtool: Fix cross-compilation. * gnu/packages/autotools.scm (libtool)[arguments]: Do not run tests and use bash from native-inputs when cross-compiling. --- gnu/packages/autotools.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index ceb70dfee7..98f31f6bca 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -354,21 +355,22 @@ Makefile, simplifying the entire process for the developer.") ;; XXX: There are test failures on mips64el-linux starting from 2.4.4: ;; . - #:tests? ,(not (string-prefix? "mips64" - (or (%current-target-system) + ;; Also, do not run tests when cross compiling + #:tests? ,(not (or (%current-target-system) + (string-prefix? "mips64" (%current-system)))) #:phases (modify-phases %standard-phases (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) ;; Run the test suite in parallel, if possible. (setenv "TESTSUITEFLAGS" (string-append "-j" (number->string (parallel-job-count)))) ;; Patch references to /bin/sh. - (let ((bash (assoc-ref inputs "bash"))) + (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) (substitute* "tests/testsuite" (("/bin/sh") (string-append bash "/bin/sh"))) -- cgit v1.2.3 From 57bc2dcf0bfa300dcdc52d64a201e435c4e65a2c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 14 Oct 2019 15:37:25 +0200 Subject: gnu: commencement: Remove 'm4-boot0*'. * gnu/packages/commencement.scm (m4-boot0*): Remove. (bison-boot0, flex-boot0): Use M4-BOOT0 instead. --- gnu/packages/commencement.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 54746151ce..0b01d4f307 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1716,12 +1716,6 @@ exec " gcc "/bin/" program #:implicit-inputs? #f ,@(package-arguments m4))))) -(define m4-boot0* - (package - ;; TODO: On the next rebuild cycle, use M4-BOOT0 as is. - (inherit m4-boot0) - (name "m4"))) - (define bison-boot0 ;; This Bison is needed to build MiG so we need it early in the process. ;; Recent versions of Linux-Libre headers also depend on this. @@ -1729,7 +1723,7 @@ exec " gcc "/bin/" program (inherit bison) ;; TODO: On the next build cycle, do: ;;(name "bison-boot0") - (propagated-inputs `(("m4" ,m4-boot0*))) + (propagated-inputs `(("m4" ,m4-boot0))) (native-inputs `(("perl" ,perl-boot0))) (inputs (%boot0-inputs)) ;remove Flex... (arguments @@ -1765,12 +1759,7 @@ exec " gcc "/bin/" program (package (inherit flex) (native-inputs `(("bison" ,bison-boot0))) - (propagated-inputs - ;; XXX: Here we use an 'm4-boot0' package that's not eq? so that it - ;; appears twice in '%build-inputs', like when we were using - ;; 'package-with-explicit-inputs'. - ;; TODO: Remove this hack on the next rebuild cycle. - `(("m4" ,(package (inherit m4-boot0*))))) + (propagated-inputs `(("m4" ,m4-boot0))) (inputs (%boot0-inputs)) (arguments `(#:implicit-inputs? #f -- cgit v1.2.3 From e5c1f5cfdfe0ba4c0893779e7c5103edb6843465 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 14 Oct 2019 15:38:23 +0200 Subject: gnu: bison-boot0: Set name to "bison-boot0". * gnu/packages/commencement.scm (bison-boot0)[name]: New field. --- gnu/packages/commencement.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 0b01d4f307..1e30027c49 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1721,8 +1721,7 @@ exec " gcc "/bin/" program ;; Recent versions of Linux-Libre headers also depend on this. (package (inherit bison) - ;; TODO: On the next build cycle, do: - ;;(name "bison-boot0") + (name "bison-boot0") (propagated-inputs `(("m4" ,m4-boot0))) (native-inputs `(("perl" ,perl-boot0))) (inputs (%boot0-inputs)) ;remove Flex... -- cgit v1.2.3 From 62548232711b2f34fa6a03caee2b3cf082c99ada Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 14 Oct 2019 15:40:35 +0200 Subject: gnu: bison-boot0: Remove conditional parallel build/test flags. * gnu/packages/commencement.scm (bison-boot0)[arguments]: Remove conditional #:parallel-build? and #:parallel-tests? flags. Append (package-arguments bison). --- gnu/packages/commencement.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1e30027c49..26b0a94c74 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1730,17 +1730,6 @@ exec " gcc "/bin/" program #:implicit-inputs? #f #:guile ,%bootstrap-guile - ;; XXX: These flags should be unconditional, but for now - ;; we just add them on x86 to avoid a full rebuild. - ;; TODO: On the next core-updates, use - ;; 'substitute-keyword-arguments' to inherit them from - ;; BISON. - ,@(if (member (%current-system) - '("x86_64-linux" "i686-linux")) - '(#:parallel-build? #f - #:parallel-tests? #f) - '()) - ;; Zero timestamps in liby.a; this must be done ;; explicitly here because the bootstrap Binutils don't ;; do that (default is "cru".) @@ -1751,7 +1740,9 @@ exec " gcc "/bin/" program "RANLIB=ranlib") (_ "RANLIB=ranlib -D")) - "V=1"))))) + "V=1") + + ,@(package-arguments bison))))) (define flex-boot0 ;; This Flex is needed to build MiG as well as Linux-Libre headers. -- cgit v1.2.3 From fd67cdb7e3a617bfc7ab5091a6b3bf894cf4c28c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 14 Oct 2019 15:42:42 +0200 Subject: gnu: commencement: Clean up 'gnu-make-final' dependencies. * gnu/packages/commencement.scm (gnu-make-final): Remove GUILE-FINAL from the inputs of 'pkg-config'. --- gnu/packages/commencement.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 26b0a94c74..58ee3ba5d9 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2375,13 +2375,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define gnu-make-final ;; The final GNU Make, which uses the final Guile. - ;; FIXME: This is a mistake: we shouldn't be propagating GUILE-FINAL to - ;; PKG-CONFIG. - ;; TODO: Fix that on the next rebuild cycle. (let ((pkg-config (package (inherit pkg-config) - (inputs `(("guile" ,guile-final) - ,@(%boot5-inputs))) + (inputs (%boot5-inputs)) (arguments `(#:implicit-inputs? #f ,@(package-arguments pkg-config)))))) -- cgit v1.2.3 From 10bb4e165056199dfc3b3f0910a83dd7b4aa5e55 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 26 May 2019 10:15:28 +0200 Subject: guix: Add helper for generating desktop entry files. * guix/build/utils.scm (make-desktop-entry-file): New procedure. --- guix/build/utils.scm | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index b8be73ead4..cee4e8aaa2 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -1324,6 +1324,105 @@ not supported." (&wrap-error (program prog) (type 'no-interpreter-found))))))))) +(define* (make-desktop-entry-file destination #:key + (type "Application") ; One of "Application", "Link" or "Directory". + (version "1.1") + name + (generic-name name) + (no-display #f) + comment + icon + (hidden #f) + only-show-in + not-show-in + (d-bus-activatable #f) + try-exec + exec + path + (terminal #f) + actions + mime-type + (categories "Application") + implements + keywords + (startup-notify #t) + startup-w-m-class + #:rest all-args) + "Create a desktop entry file at DESTINATION. +You must specify NAME. + +Values can be booleans, numbers, strings or list of strings. + +Additionally, locales can be specified with an alist where the key is the +locale. The #f key specifies the default. Example: + + #:name '((#f \"I love Guix\") (\"fr\" \"J'aime Guix\")) + +produces + + Name=I love Guix + Name[fr]=J'aime Guix + +For a complete description of the format, see the specifications at +https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html." + (define (escape-semicolon s) + (string-join (string-split s #\;) "\\;")) + (define* (parse key value #:optional locale) + (set! value (match value + (#t "true") + (#f "false") + ((? number? n) n) + ((? string? s) (escape-semicolon s)) + ((? list? value) + (catch 'wrong-type-arg + (lambda () (string-join (map escape-semicolon value) ";")) + (lambda args (error "List arguments can only contain strings: ~a" args)))) + (_ (error "Value must be a boolean, number, string or list of strings")))) + (format #t "~a=~a~%" + (if locale + (format #f "~a[~a]" key locale) + key) + value)) + + (define key-error-message "This procedure only takes key arguments beside DESTINATION") + + (unless name + (error "Missing NAME key argument")) + (unless (member #:type all-args) + (set! all-args (append (list #:type type) all-args))) + (mkdir-p (dirname destination)) + + (with-output-to-file destination + (lambda () + (format #t "[Desktop Entry]~%") + (let loop ((args all-args)) + (match args + (() #t) + ((_) (error key-error-message)) + ((key value . ...) + (unless (keyword? key) + (error key-error-message)) + (set! key + (string-join (map string-titlecase + (string-split (symbol->string + (keyword->symbol key)) + #\-)) + "")) + (match value + (((_ . _) . _) + (for-each (lambda (locale-subvalue) + (parse key + (if (and (list? (cdr locale-subvalue)) + (= 1 (length (cdr locale-subvalue)))) + ;; Support both proper and improper lists for convenience. + (cadr locale-subvalue) + (cdr locale-subvalue)) + (car locale-subvalue))) + value)) + (_ + (parse key value))) + (loop (cddr args)))))))) + ;;; ;;; Locales. -- cgit v1.2.3 From a9a507613b15272a0a4e89bd7a2160734205fc46 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 27 May 2019 09:04:13 +0200 Subject: gnu: emacs-exwm: Use make-desktop-entry-file. * gnu/packages/emacs-xyz.scm (emacs-exwm)[arguments]: Do it. --- gnu/packages/emacs-xyz.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bbafd548b1..12c2eede94 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9072,15 +9072,12 @@ It should enable you to implement low-level X11 applications.") ;; Add a .desktop file to xsessions (mkdir-p xsessions) (mkdir-p bin) - (with-output-to-file - (string-append xsessions "/exwm.desktop") - (lambda _ - (format #t "[Desktop Entry]~@ - Name=~a~@ - Comment=~a~@ - Exec=~a~@ - TryExec=~:*~a~@ - Type=Application~%" ,name ,synopsis exwm-executable))) + (make-desktop-entry-file + (string-append xsessions "/exwm.desktop") + #:name ,name + #:comment ,synopsis + #:exec exwm-executable + #:try-exec exwm-executable) ;; Add a shell wrapper to bin (with-output-to-file exwm-executable (lambda _ -- cgit v1.2.3 From 96a320e5c7cb80d613e47eca48ef68641fa3344f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 27 May 2019 09:04:55 +0200 Subject: gnu: tome4: Use make-desktop-entry-file. * gnu/packages/games.scm (tome4)[arguments]: Do it. --- gnu/packages/games.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2ed505bbc4..839fc155cd 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5259,19 +5259,13 @@ Crowther & Woods, its original authors, in 1995. It has been known as (copy-recursively "game" (string-append data "/game")) ;; launcher (mkdir-p applications) - (with-output-to-file (string-append applications "/" - ,name ".desktop") - (lambda () - (display - (string-append - "[Desktop Entry] -Name=ToME4 -Comment=" ,synopsis "\n" -"Exec=" ,name "\n" -"Icon=" icon "\n" -"Terminal=false -Type=Application -Categories=Game;RolePlaying;\n"))))) + (make-desktop-entry-file + (string-append applications "/" ,name ".desktop") + #:name "ToME4" + #:comment ,synopsis + #:exec ,name + #:icon icon + #:categories '("Game" "RolePlaying"))) #t))))) (home-page "https://te4.org") (description "Tales of Maj’Eyal (ToME) RPG, featuring tactical turn-based -- cgit v1.2.3 From 47f4df157f999a361fb1d37c07a82f2089fffb4d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 27 May 2019 09:05:15 +0200 Subject: gnu: drascula: Use make-desktop-entry-file. * gnu/packages/games.scm (drascula)[arguments]: Do it. --- gnu/packages/games.scm | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 839fc155cd..b5023e1ee7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7556,22 +7556,18 @@ on items and player adaptability for character progression.") ;; game, so we borrow SCUMMVM's. (let ((apps (string-append out "/share/applications"))) (mkdir-p apps) - (with-output-to-file (string-append apps "/drascula.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=Drascula: The Vampire Strikes Back~@ - GenericName=Drascula~@ - Exec=~a/bin/drascula~@ - Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@ - Categories=AdventureGame;Game;RolePlaying;~@ - Keywords=game;adventure;roleplaying;2D,fantasy;~@ - Comment=Classic 2D point and click adventure game~@ - Comment[de]=klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier~@ - Comment[fr]=Jeux classique d'aventure pointer-et-cliquer en 2D~@ - Comment[it]=Gioco classico di avventura punta e clicca 2D~@ - Type=Application~%" - out scummvm)))) + (make-desktop-entry-file + (string-append apps "/drascula.desktop") + #:name "Drascula: The Vampire Strikes Back" + #:generic-name "Drascula" + #:exec (string-append out "/bin/drascula") + #:icon (string-append scummvm "/share/icons/hicolor/scalable/apps/scummvm.svg") + #:categories '("AdventureGame" "Game" "RolePlaying") + #:keywords '("game" "adventure" "roleplaying" "2D" "fantasy") + #:comment '((#f "Classic 2D point and click adventure game") + ("de" "Klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier") + ("fr" "Jeu classique d'aventure pointer-et-cliquer en 2D") + ("it" "Gioco classico di avventura punta e clicca 2D")))) #t)))) (native-inputs `(("bash" ,bash) -- cgit v1.2.3 From 7da3e81aa1b95ba2d72118e393c4531da44d5536 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 10 Sep 2019 11:02:16 +0900 Subject: gnu: glib: Reference dbus-launch by its absolute path. * gnu/packages/glib.scm (glib)[phases]{patch-dbus-launch-path}: New phase. --- gnu/packages/glib.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index c558d9fcb6..62f09436a2 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -201,6 +201,14 @@ shared NFS home directories.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-dbus-launch-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((dbus (assoc-ref inputs "dbus"))) + (substitute* "gio/gdbusaddress.c" + (("command_line = g_strdup_printf \\(\"dbus-launch") + (string-append "command_line = g_strdup_printf (\"" + dbus "/bin/dbus-launch"))) + #t))) (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. -- cgit v1.2.3 From 1051facc8108110e582f2c0a9d8a5fd38b1486b6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 26 Oct 2019 17:19:57 -0400 Subject: gnu: file: Update to 5.37 [fixes CVE-2019-18218]. * gnu/packages/file.scm (file): Update to 5.37. * gnu/packages/patches/file-CVE-2019-18218.patch: New file. * gnu/packages/patches/file-CVE-2018-10360.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/file.scm | 6 +-- gnu/packages/patches/file-CVE-2018-10360.patch | 27 ------------- gnu/packages/patches/file-CVE-2019-18218.patch | 55 ++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 31 deletions(-) delete mode 100644 gnu/packages/patches/file-CVE-2018-10360.patch create mode 100644 gnu/packages/patches/file-CVE-2019-18218.patch diff --git a/gnu/local.mk b/gnu/local.mk index e46d74be64..336be3cb8d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -822,7 +822,7 @@ dist_patch_DATA = \ %D%/packages/patches/fcgi-2.4.0-poll.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ - %D%/packages/patches/file-CVE-2018-10360.patch \ + %D%/packages/patches/file-CVE-2019-18218.patch \ %D%/packages/patches/findutils-gnulib-libio.patch \ %D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-makedev.patch \ diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 9ba51d1b74..cf770297c4 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -30,15 +30,15 @@ (define-public file (package (name "file") - (version "5.33") + (version "5.37") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.astron.com/pub/file/file-" version ".tar.gz")) - (patches (search-patches "file-CVE-2018-10360.patch")) + (patches (search-patches "file-CVE-2019-18218.patch")) (sha256 (base32 - "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw")))) + "0zz0p9bqnswfx0c16j8k62ivjq1m16x10xqv4hy9lcyxyxkkkhg9")))) (build-system gnu-build-system) ;; When cross-compiling, this package depends upon a native install of diff --git a/gnu/packages/patches/file-CVE-2018-10360.patch b/gnu/packages/patches/file-CVE-2018-10360.patch deleted file mode 100644 index 9285611c04..0000000000 --- a/gnu/packages/patches/file-CVE-2018-10360.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://github.com/file/file/commit/a642587a9c9e2dd7feacdf513c3643ce26ad3c22.patch -The leading part of the patch starting at line 27 was trimmed off. -This patch should be OK to drop with file@5.35. - -From a642587a9c9e2dd7feacdf513c3643ce26ad3c22 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sat, 9 Jun 2018 16:00:06 +0000 -Subject: [PATCH] Avoid reading past the end of buffer (Rui Reis) - ---- - src/readelf.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/readelf.c b/src/readelf.c -index 79c83f9f5..1f41b4611 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -842,7 +842,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, - - cname = (unsigned char *) - &nbuf[doff + prpsoffsets(i)]; -- for (cp = cname; *cp && isprint(*cp); cp++) -+ for (cp = cname; cp < nbuf + size && *cp -+ && isprint(*cp); cp++) - continue; - /* - * Linux apparently appends a space at the end diff --git a/gnu/packages/patches/file-CVE-2019-18218.patch b/gnu/packages/patches/file-CVE-2019-18218.patch new file mode 100644 index 0000000000..21069823b7 --- /dev/null +++ b/gnu/packages/patches/file-CVE-2019-18218.patch @@ -0,0 +1,55 @@ +Fix CVE-2019-18218: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-18218 + +Patch copied from upstream source repository: + +https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84 + +From 46a8443f76cec4b41ec736eca396984c74664f84 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Mon, 26 Aug 2019 14:31:39 +0000 +Subject: [PATCH] Limit the number of elements in a vector (found by oss-fuzz) + +--- + src/cdf.c | 9 ++++----- + src/cdf.h | 1 + + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/cdf.c b/src/cdf.c +index 9d6396742..bb81d6374 100644 +--- a/src/cdf.c ++++ b/src/cdf.c +@@ -1027,8 +1027,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, + goto out; + } + nelements = CDF_GETUINT32(q, 1); +- if (nelements == 0) { +- DPRINTF(("CDF_VECTOR with nelements == 0\n")); ++ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) { ++ DPRINTF(("CDF_VECTOR with nelements == %" ++ SIZE_T_FORMAT "u\n", nelements)); + goto out; + } + slen = 2; +@@ -1070,8 +1071,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, + goto out; + inp += nelem; + } +- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", +- nelements)); + for (j = 0; j < nelements && i < sh.sh_properties; + j++, i++) + { +diff --git a/src/cdf.h b/src/cdf.h +index 2f7e554b7..05056668f 100644 +--- a/src/cdf.h ++++ b/src/cdf.h +@@ -48,6 +48,7 @@ + typedef int32_t cdf_secid_t; + + #define CDF_LOOP_LIMIT 10000 ++#define CDF_ELEMENT_LIMIT 100000 + + #define CDF_SECID_NULL 0 + #define CDF_SECID_FREE -1 -- cgit v1.2.3 From 373007882def43f43d8da9678f6ab81047e32230 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Thu, 7 Nov 2019 08:08:32 +0100 Subject: gnu: wayland: Update to 1.18.0. * gnu/packages/freedesktop.scm (wayland): Update to 1.18.0. --- gnu/packages/freedesktop.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4339f14f35..b184dcd8ad 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -552,7 +552,7 @@ Python.") (define-public wayland (package (name "wayland") - (version "1.17.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (string-append "https://wayland.freedesktop.org/releases/" -- cgit v1.2.3 From ba469f1ad916ca12e7cec44af7edd209f1a146a0 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Thu, 7 Nov 2019 08:12:27 +0100 Subject: gnu: wayland-protocols: Update to 1.18. * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.18. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b184dcd8ad..c893c7f221 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -588,7 +588,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) (uri (string-append @@ -596,7 +596,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz")))) + "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) -- cgit v1.2.3 From f6c51f598ebb63c6933a8e157ea4592f8d078258 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 9 Nov 2019 21:03:19 +0200 Subject: gnu: fribidi: Fix CVE-2019-18397. * gnu/packages/fribidi.scm (fribidi): Replace with fribidi/fixed. (fribidi/fixed): New variable. * gnu/packages/patches/fribidi-CVE-2019-18397.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/fribidi.scm | 13 ++++++++++-- gnu/packages/patches/fribidi-CVE-2019-18397.patch | 26 +++++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/fribidi-CVE-2019-18397.patch diff --git a/gnu/local.mk b/gnu/local.mk index 336be3cb8d..64f0ba268d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -831,6 +831,7 @@ dist_patch_DATA = \ %D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ + %D%/packages/patches/fribidi-CVE-2019-18397.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/gawk-shell.patch \ diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index dfd2a77c20..61aa6fd726 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Marek Benc -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -22,10 +22,12 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix licenses)) + #:use-module (guix licenses) + #:use-module (gnu packages)) (define-public fribidi (package + (replacement fribidi/fixed) (name "fribidi") (version "1.0.5") (source @@ -45,3 +47,10 @@ Algorithm. This algorithm is used to properly display text in left-to-right or right-to-left ordering as necessary.") (home-page "https://github.com/fribidi/fribidi") (license lgpl2.1+))) + +(define fribidi/fixed + (package + (inherit fribidi) + (source + (origin (inherit (package-source fribidi)) + (patches (search-patches "fribidi-CVE-2019-18397.patch")))))) diff --git a/gnu/packages/patches/fribidi-CVE-2019-18397.patch b/gnu/packages/patches/fribidi-CVE-2019-18397.patch new file mode 100644 index 0000000000..aff1a669b2 --- /dev/null +++ b/gnu/packages/patches/fribidi-CVE-2019-18397.patch @@ -0,0 +1,26 @@ +https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch + +From 034c6e9a1d296286305f4cfd1e0072b879f52568 Mon Sep 17 00:00:00 2001 +From: Dov Grobgeld +Date: Thu, 24 Oct 2019 09:37:29 +0300 +Subject: [PATCH] Truncate isolate_level to FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL + +--- + lib/fribidi-bidi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c +index 6c84392..d384878 100644 +--- a/lib/fribidi-bidi.c ++++ b/lib/fribidi-bidi.c +@@ -747,7 +747,9 @@ fribidi_get_par_embedding_levels_ex ( + } + + RL_LEVEL (pp) = level; +- RL_ISOLATE_LEVEL (pp) = isolate_level++; ++ RL_ISOLATE_LEVEL (pp) = isolate_level; ++ if (isolate_level < FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL-1) ++ isolate_level++; + base_level_per_iso_level[isolate_level] = new_level; + + if (!FRIBIDI_IS_NEUTRAL (override)) -- cgit v1.2.3 From 4e6febec687f7ae443b511ebf8c41637459a595e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Nov 2019 10:16:43 +0200 Subject: gnu: fribidi: Ungraft. * gnu/packages/fribidi.scm (fribidi)[replacement]: Remove field. [source]: Add patch. (fribidi/fixed): Remove variable. --- gnu/packages/fribidi.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index 61aa6fd726..b775053ba5 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -27,7 +27,6 @@ (define-public fribidi (package - (replacement fribidi/fixed) (name "fribidi") (version "1.0.5") (source @@ -38,7 +37,8 @@ "/download/v" version "/fribidi-" version ".tar.bz2")) (sha256 - (base32 "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a")))) + (base32 "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a")) + (patches (search-patches "fribidi-CVE-2019-18397.patch")))) (build-system gnu-build-system) (synopsis "Implementation of the Unicode bidirectional algorithm") (description @@ -47,10 +47,3 @@ Algorithm. This algorithm is used to properly display text in left-to-right or right-to-left ordering as necessary.") (home-page "https://github.com/fribidi/fribidi") (license lgpl2.1+))) - -(define fribidi/fixed - (package - (inherit fribidi) - (source - (origin (inherit (package-source fribidi)) - (patches (search-patches "fribidi-CVE-2019-18397.patch")))))) -- cgit v1.2.3 From bb750fa0212fc565a1ecf8a03ce97820c5743c93 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Nov 2019 12:11:32 +0200 Subject: gnu: fribidi: Update to 1.0.7. * gnu/packages/fribidi.scm (fribidi): Update to 1.0.7. --- gnu/packages/fribidi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index b775053ba5..b6cabdc4b0 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -28,7 +28,7 @@ (define-public fribidi (package (name "fribidi") - (version "1.0.5") + (version "1.0.7") (source (origin (method url-fetch) @@ -37,7 +37,7 @@ "/download/v" version "/fribidi-" version ".tar.bz2")) (sha256 - (base32 "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a")) + (base32 "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das")) (patches (search-patches "fribidi-CVE-2019-18397.patch")))) (build-system gnu-build-system) (synopsis "Implementation of the Unicode bidirectional algorithm") -- cgit v1.2.3 From 4554d6b77e0f306a3dc33a8c1f68c9a302967a08 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 14 Nov 2019 22:30:24 +0100 Subject: gnu: aspell: Truly honor $ASPELL_DICT_DIR. Fixes . Reported by Oleg Pykhalov . * gnu/packages/aspell.scm (aspell)[arguments]: Remove 'wrap-aspell' phase. * gnu/packages/patches/aspell-default-dict-dir.patch: Add hunk to expand the right-hand size of '|' in values like "<$FOO|$BAR/baz>". Change DICT_DIR to refer to "$HOME" on the right-hand side. --- gnu/packages/aspell.scm | 10 +-------- gnu/packages/patches/aspell-default-dict-dir.patch | 24 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 4f6f1a1cca..f0e0fbcc21 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2015, 2016 Alex Kost ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2017, 2019 Efraim Flashner @@ -65,14 +65,6 @@ (("\"filter-path(.*)DICT_DIR" _ middle) (string-append "\"filter-path" middle "\"" libdir "\""))) - #t))) - (add-after 'install 'wrap-aspell - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin/aspell (string-append (assoc-ref outputs "out") - "/bin/aspell"))) - (wrap-program bin/aspell - '("ASPELL_CONF" "" = - ("${ASPELL_CONF:-\"dict-dir ${GUIX_PROFILE:-$HOME/.guix-profile}/lib/aspell\"}"))) #t)))))) (inputs `(("perl" ,perl))) diff --git a/gnu/packages/patches/aspell-default-dict-dir.patch b/gnu/packages/patches/aspell-default-dict-dir.patch index 17a6ff606f..5f759a66d9 100644 --- a/gnu/packages/patches/aspell-default-dict-dir.patch +++ b/gnu/packages/patches/aspell-default-dict-dir.patch @@ -8,12 +8,34 @@ However it is necessary for applications that use libaspell since --- a/common/config.cpp +++ b/common/config.cpp +@@ -651,7 +651,20 @@ namespace acommon { + } else { // sep == '|' + assert(replace[0] == '$'); + const char * env = getenv(replace.c_str()+1); +- final_str += env ? env : second; ++ if (env) { ++ final_str += env; ++ } else if (second[0] == '$') { ++ // Expand the right-hand side of '|', which starts with a ++ // reference to an environment variable. ++ auto slash = second.find('/'); ++ String variable = second.substr(1, slash - 1); ++ const char * env = getenv(variable.c_str()); ++ String value = env ? String(env) : ""; ++ value += second.substr(slash, second.size() - slash); ++ final_str += value; ++ } else { ++ final_str += second; ++ } + } + replace = ""; + in_replace = false; @@ -1349,6 +1349,9 @@ namespace acommon { # define REPL ".aspell..prepl" #endif +#undef DICT_DIR -+#define DICT_DIR "<$ASPELL_DICT_DIR|home-dir/.guix-profile/lib/aspell>" ++#define DICT_DIR "<$ASPELL_DICT_DIR|$HOME/.guix-profile/lib/aspell>" + static const KeyInfo config_keys[] = { // the description should be under 50 chars -- cgit v1.2.3 From 2387e2f2d1839b79f13ddd832f9a008bb220eed6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 14 Nov 2019 22:38:10 +0100 Subject: gnu: aspell: Update to 0.60.8. * gnu/packages/aspell.scm (aspell): Update to 0.60.8. [source]: Remove "aspell-gcc-compat.patch". * gnu/packages/patches/aspell-gcc-compat.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/aspell.scm | 7 +++---- gnu/packages/patches/aspell-gcc-compat.patch | 31 ---------------------------- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/aspell-gcc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 64f0ba268d..29988d25e6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -695,7 +695,6 @@ dist_patch_DATA = \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ - %D%/packages/patches/aspell-gcc-compat.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index f0e0fbcc21..70d0561004 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -38,7 +38,7 @@ (define-public aspell (package (name "aspell") - (version "0.60.6.1") + (version "0.60.8") (source (origin (method url-fetch) @@ -46,9 +46,8 @@ version ".tar.gz")) (sha256 (base32 - "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm")) - (patches (search-patches "aspell-default-dict-dir.patch" - "aspell-gcc-compat.patch")))) + "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr")) + (patches (search-patches "aspell-default-dict-dir.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/aspell-gcc-compat.patch b/gnu/packages/patches/aspell-gcc-compat.patch deleted file mode 100644 index 94c44f8fb6..0000000000 --- a/gnu/packages/patches/aspell-gcc-compat.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix GCC7 warnings. - -Taken from upstream: -https://git.savannah.gnu.org/cgit/aspell.git/commit/?id=8089fa02122fed0a6394eba14bbedcb1d18e2384 - -diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp -index a979539..19ab63c 100644 ---- a/modules/filter/tex.cpp -+++ b/modules/filter/tex.cpp -@@ -174,7 +174,7 @@ namespace { - - if (c == '{') { - -- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0') -+ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0') - push_command(Parm); - - top.in_what = Parm; -diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp -index db54f3d..89ee09d 100644 ---- a/prog/check_funs.cpp -+++ b/prog/check_funs.cpp -@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) { - } - } - if (i == width-1) { -- if (word == '\0') -+ if (*word == '\0') - put(out,' '); - else if (word[len] == '\0') - put(out, word, len); -- cgit v1.2.3 From bdcdd55000c61f46649164fe43289f33c6132417 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 2 Jul 2019 11:42:12 +0200 Subject: gnu: openssl: Fix cross-compilation. * gnu/packages/tls.scm (openssl-next)[arguments]: Pass CROSS_COMPILE environment variable and target system to configure script. --- gnu/packages/tls.scm | 62 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 2def6ee703..b93b4ef6e6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -297,6 +298,23 @@ required structures.") #:disallowed-references ,(list (canonical-package perl)) #:phases (modify-phases %standard-phases + ,@(if (%current-target-system) + '((add-before + 'configure 'set-cross-compile + (lambda* (#:key target outputs #:allow-other-keys) + (setenv "CROSS_COMPILE" (string-append target "-")) + (setenv "CONFIGURE_TARGET_ARCH" + (cond + ((string-prefix? "i686" target) + "linux-x86") + ((string-prefix? "x86_64" target) + "linux-x86_64") + ((string-prefix? "arm" target) + "linux-armv4") + ((string-prefix? "aarch64" target) + "linux-aarch64"))) + #t))) + '()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -306,7 +324,9 @@ required structures.") (("/usr/bin/env") (string-append (assoc-ref %build-inputs "coreutils") "/bin/env"))) - (invoke "./config" + (invoke ,@(if (%current-target-system) + '("./Configure") + '("./config")) "shared" ;build shared libraries "--libdir=lib" @@ -317,7 +337,10 @@ required structures.") "/share/openssl-" ,version) (string-append "--prefix=" out) - (string-append "-Wl,-rpath," lib))))) + (string-append "-Wl,-rpath," lib) + ,@(if (%current-target-system) + '((getenv "CONFIGURE_TARGET_ARCH")) + '()))))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. @@ -432,21 +455,26 @@ required structures.") (("^MANDIR[[:blank:]]*=.*$") (string-append "MANDIR = " out "/share/man\n"))) #t))) - (replace 'configure - ;; Override this phase because OpenSSL 1.0 does not understand -rpath. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./config" - "shared" ;build shared libraries - "--libdir=lib" - - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" ,version) - - (string-append "--prefix=" out))))) + (replace 'configure + ;; Override this phase because OpenSSL 1.0 does not understand -rpath. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke ,@(if (%current-target-system) + '("./Configure") + '("./config")) + "shared" ;build shared libraries + "--libdir=lib" + + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) + + (string-append "--prefix=" out) + ,@(if (%current-target-system) + '((getenv "CONFIGURE_TARGET_ARCH")) + '()))))) (delete 'move-extra-documentation) (add-after 'install 'move-man3-pages (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 534537e2efd7ff3d521a0c4cc60170a126d9c9f3 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 2 Jul 2019 15:22:16 +0200 Subject: gnu: cmake: Fix cross-compilation. * gnu/packages/cmake.scm (cmake-minimal-cross): New package. * guix/build-system/cmake.scm (default-cmake): Add new target argument and use it to select cmake-minimal or cmake-minimal-cross. (lower): Pass target to default-cmake. --- gnu/packages/cmake.scm | 8 ++++++++ guix/build-system/cmake.scm | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 64349be444..13252a9486 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -219,6 +219,14 @@ and workspaces that can be used in the compiler environment of your choice.") (append (search-patches "cmake-curl-certificates.patch") (origin-patches (package-source cmake)))))))) +(define-public cmake-minimal-cross + (package + (inherit cmake-minimal) + (name "cmake-minimal-cross") + (native-search-paths '()) + (search-paths + (package-native-search-paths cmake-minimal)))) + (define-public emacs-cmake-mode (package (inherit cmake) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index ca88fadddf..aa0f4187ec 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -43,16 +43,19 @@ `((guix build cmake-build-system) ,@%gnu-build-system-modules)) -(define (default-cmake) +(define (default-cmake target) "Return the default CMake package." ;; Do not use `@' to avoid introducing circular dependencies. (let ((module (resolve-interface '(gnu packages cmake)))) - (module-ref module 'cmake-minimal))) + (module-ref module + (if target + 'cmake-minimal-cross + 'cmake-minimal)))) (define* (lower name #:key source inputs native-inputs outputs system target - (cmake (default-cmake)) + (cmake (default-cmake target)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." -- cgit v1.2.3 From e45c333c5569c42debbf3cd888b251d1a1e209e4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 6 Mar 2019 10:33:29 +0100 Subject: gnu: groff: Fix cross compilation. * gnu/packages/groff.scm (groff)[native-inputs]: Add self, [arguments]: set GROFF_BIN_PATH and GROFFBIN variables when cross-compiling. (groff-minimal)[native-inputs]: Add groff. --- gnu/packages/groff.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index 98f17914bf..5fe353a901 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Ludovic Courtès ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Eric Bavier +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,12 +56,28 @@ ;; from 'inputs'. (inputs `(("ghostscript" ,ghostscript))) - (native-inputs `(("bison" ,bison) + + ;; When cross-compiling, this package depends upon a native install of + ;; itself. + (native-inputs `(,@(if (%current-target-system) + `(("self" ,this-package)) + '()) + ("bison" ,bison) ("perl" ,perl) ("psutils" ,psutils) ("texinfo" ,texinfo))) (arguments `(#:parallel-build? #f ; parallel build fails + ,@(if (%current-target-system) + `(#:make-flags + ;; In groff-minimal package, that inherits from this package, + ;; we'll need to locate "groff" instead of "self". + (let ((groff (or (assoc-ref %build-host-inputs "groff") + (assoc-ref %build-host-inputs "self")))) + (list + (string-append "GROFF_BIN_PATH=" groff) + (string-append "GROFFBIN=" groff "/bin/groff")))) + '()) #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-relocatability @@ -115,7 +132,8 @@ is usually the formatter of \"man\" documentation pages.") ;; Omit the DVI, PS, PDF, and HTML backends. (inputs '()) (native-inputs `(("bison" ,bison) - ("perl" ,perl))) + ("perl" ,perl) + ("groff" ,groff))) (arguments `(#:disallowed-references (,perl) -- cgit v1.2.3 From 3382a4f344e04ad6dad374bb25ddf15a010d14a3 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 10:34:13 +0200 Subject: gnu: cyrus-sasl: Fix cross-compilation. * gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/cyrus-sasl.scm (cyrus-sasl)[origin]: Apply it. [native-tools]: Add autoconf, automake and libtool. [arguments]: Run autoconf to apply m4 modification in patch above. --- gnu/local.mk | 1 + gnu/packages/cyrus-sasl.scm | 17 +++++++++++++++-- gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch | 12 ++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 29988d25e6..8a0d9bd805 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -763,6 +763,7 @@ dist_patch_DATA = \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ + %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index f84136e631..3e65a1faf6 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (gnu packages cyrus-sasl) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages dbm) #:use-module (gnu packages kerberos) #:use-module (gnu packages tls) @@ -41,8 +43,13 @@ "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-" version ".tar.gz"))) (sha256 (base32 - "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")))) + "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")) + (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch")))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("gdbm" ,gdbm) ("openssl" ,openssl))) (propagated-inputs @@ -57,7 +64,13 @@ ;; 'plugin_common.c'. When building the shared libraries there, libtool ;; ends up doing "ln -s plugin_common.lo plugin_common.o", which can ;; fail with EEXIST when building things in parallel. - #:parallel-build? #f)) + #:parallel-build? #f + + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (invoke "autoreconf" "-vif")))))) (synopsis "Simple Authentication Security Layer implementation") (description "SASL (Simple Authentication Security Layer) is an Internet diff --git a/gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch b/gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch new file mode 100644 index 0000000000..8662e812e9 --- /dev/null +++ b/gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch @@ -0,0 +1,12 @@ +--- a/m4/sasl2.m4 2018-11-18 22:33:29.902625600 +0300 ++++ b/m4/sasl2.m4 2018-11-18 22:33:59.828746176 +0300 +@@ -339,7 +339,8 @@ + ], + [ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) + AC_MSG_RESULT(yes) ], +- AC_MSG_RESULT(no)) ++ AC_MSG_RESULT(no), ++ AC_MSG_RESULT(no)) + LIBS="$cmu_save_LIBS" + + else -- cgit v1.2.3 From 63eb30c1915e774d1384c9c74feff28b2fbad744 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 17:10:31 +0200 Subject: gnu: icu4c: Fix cross-compilation. * gnu/packages/icu4c.scm (icu4c-build-root): New variable. (icu4c)[native-inputs]: Add it. [arguments]: Pass it as a configure-flag. --- gnu/packages/icu4c.scm | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 922dfbd348..c70871f7e7 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (gnu packages python) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) @@ -70,13 +72,23 @@ (sha256 (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) (build-system gnu-build-system) + ;; When cross-compiling, this package needs a source directory of a + ;; native-build of itself. (native-inputs - `(("python" ,python-minimal))) + `(("python" ,python-minimal) + ,@(if (%current-target-system) + `(("icu4c-build-root" ,icu4c-build-root)) + '()))) (inputs `(("perl" ,perl))) (arguments `(#:configure-flags - '("--enable-rpath") + (list + "--enable-rpath" + ,@(if (%current-target-system) + '((string-append "--with-cross-build=" + (assoc-ref %build-inputs "icu4c-build-root"))) + '())) #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source @@ -105,6 +117,25 @@ C/C++ part.") (license x11) (home-page "http://site.icu-project.org/"))) +(define-public icu4c-build-root + (package + (inherit icu4c) + (name "icu4c-build-root") + (arguments + (substitute-keyword-arguments (package-arguments icu4c) + ((#:tests? _ '()) + #f) + ((#:out-of-source? _ '()) + #t) + ((#:phases phases) + `(modify-phases ,phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "../build" out) + #t))))))) + (native-inputs '()))) + (define-public java-icu4j (package (name "java-icu4j") -- cgit v1.2.3 From a4c04bee7bc3faadf7ef6d98d83f57959f911fd1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 8 Jul 2019 13:08:01 +0200 Subject: gnu: boost: Fix cross-compilation. * gnu/packages/patches/boost-dumpversion.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/boost.scm (boost)[source]: Apply it, [native-inputs]: add python unless cross-compiling, [arguments]: pass cross-compilation mandatory flags and fill a user-config.jam file pointing to cross-compiler. Disable python support that is broken when cross-compiling. Disable provide-libboost_python when cross-compiling. --- gnu/local.mk | 1 + gnu/packages/boost.scm | 59 ++++++++++++++++++++++------ gnu/packages/patches/boost-dumpversion.patch | 24 +++++++++++ 3 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/boost-dumpversion.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8a0d9bd805..7118b251f0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -720,6 +720,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ + %D%/packages/patches/boost-dumpversion.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index a2253a9efc..4e1e68204f 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,8 @@ (string-append "https://dl.bintray.com/boostorg/release/" version "/source/boost_" version-with-underscores ".tar.bz2")))) + (patches + (search-patches "boost-dumpversion.patch")) (sha256 (base32 "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")))) @@ -62,7 +65,9 @@ ("zlib" ,zlib))) (native-inputs `(("perl" ,perl) - ("python" ,python-2) + ,@(if (%current-target-system) + '() + `(("python" ,python-2))) ("tcsh" ,tcsh))) (arguments `(#:tests? #f @@ -76,7 +81,24 @@ ;; Set the RUNPATH to $libdir so that the libs find each other. (string-append "linkflags=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib")) + (assoc-ref %outputs "out") "/lib") + ,@(if (%current-target-system) + `("--user-config=user-config.jam" + ;; Python is not supported when cross-compiling. + "--without-python" + "binary-format=elf" + "target-os=linux" + ,@(cond + ((string-prefix? "arm" (%current-target-system)) + '("abi=aapcs" + "address-model=32" + "architecture=arm")) + ((string-prefix? "aarch64" (%current-target-system)) + '("abi=aapcs" + "address-model=64" + "architecture=arm")) + (else '()))) + '())) #:phases (modify-phases %standard-phases (delete 'bootstrap) @@ -94,6 +116,14 @@ (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) + ,@(if (%current-target-system) + `((call-with-output-file "user-config.jam" + (lambda (port) + (format port + "using gcc : cross : ~a-c++ ;" + ,(%current-target-system))))) + '()) + (invoke "./bootstrap.sh" (string-append "--prefix=" out) ;; Auto-detection looks for ICU only in traditional @@ -108,17 +138,20 @@ (replace 'install (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "./b2" "install" make-flags))) - (add-after 'install 'provide-libboost_python - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Boost can build support for both Python 2 and Python 3 since - ;; version 1.67.0, and suffixes each library with the Python - ;; version. Many consumers only check for libboost_python - ;; however, so we provide it here as suggested in - ;; . - (with-directory-excursion (string-append out "/lib") - (symlink "libboost_python27.so" "libboost_python.so")) - #t)))))) + ,@(if (%current-target-system) + '() + '((add-after 'install 'provide-libboost_python + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Boost can build support for both Python 2 and + ;; Python 3 since version 1.67.0, and suffixes each + ;; library with the Python version. Many consumers + ;; only check for libboost_python however, so we + ;; provide it here as suggested in + ;; . + (with-directory-excursion (string-append out "/lib") + (symlink "libboost_python27.so" "libboost_python.so")) + #t)))))))) (home-page "https://www.boost.org") (synopsis "Peer-reviewed portable C++ source libraries") diff --git a/gnu/packages/patches/boost-dumpversion.patch b/gnu/packages/patches/boost-dumpversion.patch new file mode 100644 index 0000000000..7df779cfe6 --- /dev/null +++ b/gnu/packages/patches/boost-dumpversion.patch @@ -0,0 +1,24 @@ +This issue is described here: https://github.com/openwrt/packages/pull/8685 +and has not been solved as of 1.70.0 release. + +--- a/tools/build/src/tools/common.jam ++++ b/tools/build/src/tools/common.jam +@@ -973,18 +973,6 @@ + } + } + +- # From GCC 5, versioning changes and minor becomes patch +- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ] +- { +- version = $(version[1]) ; +- } +- +- # Ditto, from Clang 4 +- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ] +- { +- version = $(version[1]) ; +- } +- + # On intel, version is not added, because it does not matter and it is the + # version of vc used as backend that matters. Ideally, we should encode the + # backend version but that would break compatibility with V1. -- cgit v1.2.3 From 213e1764f4acf158cf470534c4c5fccfe0a92cb5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 8 Jul 2019 13:41:59 +0200 Subject: gnu: eudev: Fix cross-compilation. * gnu/packages/linux.scm (eudev)[arguments]: Look for xsltproc in both native-inputs and inputs. Also, do not run udevadm when cross-compiling. We need to find another way to generate hwdb.bin file for cross-built systems. --- gnu/packages/linux.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ccde9d172d..ed6df21ae0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2620,7 +2620,7 @@ from the module-init-tools project.") (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'make-source-writable (lambda _ @@ -2629,19 +2629,25 @@ from the module-init-tools project.") (for-each make-file-writable (find-files ".")) #t)) (add-before 'bootstrap 'patch-file-names - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) (substitute* "man/make.sh" (("/usr/bin/xsltproc") - (string-append (assoc-ref inputs "xsltproc") + (string-append (assoc-ref + (or native-inputs inputs) "xsltproc") "/bin/xsltproc"))) #t)) (add-after 'install 'build-hwdb (lambda* (#:key outputs #:allow-other-keys) ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and ;; similar tools to display product names. + ;; + ;; XXX: This can't be done when cross-compiling. Find another way + ;; to generate hwdb.bin for cross-built systems. (let ((out (assoc-ref outputs "out"))) - (invoke (string-append out "/bin/udevadm") - "hwdb" "--update"))))) + ,@(if (%current-target-system) + '(#t) + '((invoke (string-append out "/bin/udevadm") + "hwdb" "--update"))))))) #:configure-flags (list "--enable-manpages"))) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 63539587bc63e1be0a838ba2230c73774dd18ffe Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 22 Aug 2019 14:48:33 +0200 Subject: gnu: bdb: Fix cross-compilation. * gnu/packages/dbm.scm (bdb-4.8)[arguments]: Pass host argument to configure when cross-compiling. --- gnu/packages/dbm.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index 5191c475c2..84c5817a79 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -55,7 +55,7 @@ #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key target outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (doc (assoc-ref outputs "doc"))) ;; '--docdir' is not honored, so we need to patch. @@ -74,6 +74,10 @@ '("--build=aarch64-unknown-linux-gnu") '()) + ,@(if (%current-target-system) ; cross building + '((string-append "--host=" target)) + '()) + ;; Remove 7 MiB of .a files. "--disable-static" -- cgit v1.2.3 From 1c8b1870a60de12f6c19d809522f5d8362215131 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 31 Jul 2019 16:54:28 +0200 Subject: gnu: openldap: Fix cross-compilation. * gnu/packages/openldap.scm (openldap)[inputs]: Move groff from here to ... [native-inputs]: ... here. Also add bdb and automake. [arguments]: Add cross-compilation specific configure-flags. Do not strip when cross-compiling. Add a new fix-configure phase to update outdated config.sub and config.guess. Add a fix-cross-gcc phase to set CC variable to cross-compiler name when cross-compiling. --- gnu/packages/openldap.scm | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 7abe9ab6f0..8316a593e6 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +51,7 @@ #:use-module (gnu packages) #:use-module ((guix licenses) #:select (openldap2.8 lgpl2.1+ gpl3+ psfl)) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -79,16 +81,46 @@ (inputs `(("bdb" ,bdb-5.3) ("cyrus-sasl" ,cyrus-sasl) ("gnutls" ,gnutls) - ("groff" ,groff) ("icu4c" ,icu4c) ("libgcrypt" ,libgcrypt) ("zlib" ,zlib))) - (native-inputs `(("libtool" ,libtool))) + (native-inputs `(("libtool" ,libtool) + ("groff" ,groff) + ("bdb" ,bdb-5.3) + ;; For up to date 'config.guess' and 'config.sub'. + ("automake" ,automake))) (arguments `(#:tests? #f - #:configure-flags '("--disable-static") + #:configure-flags + '("--disable-static" + ,@(if (%current-target-system) + '("--with-yielding_select=yes" + "ac_cv_func_memcmp_working=yes") + '())) + ;; Disable install stripping as it breaks cross-compiling. + #:make-flags '("STRIP=") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (with-directory-excursion "build" + (for-each (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t)) + ,@(if (%current-target-system) + '((add-before 'configure 'fix-cross-gcc + (lambda* (#:key target #:allow-other-keys) + (setenv "CC" (string-append target "-gcc")) + #t))) + '()) (add-after 'install 'patch-sasl-path ;; Give -L arguments for cyrus-sasl to avoid propagation. (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From 457e1166981db9f7593340f0fc2f4d228cf11361 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 31 Jul 2019 18:17:30 +0200 Subject: gnu: swig: Fix cross-compilation. * gnu/packages/swig.scm (swig)[inputs]: Add pcre that is needed when cross-compiling. --- gnu/packages/swig.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index b1b17fc68d..90d698a8b4 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -62,6 +62,7 @@ (native-inputs `(("boost" ,boost) ("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(;; Provide these to run the corresponding tests. + ("pcre" ,pcre) ("guile" ,guile-2.0) ("perl" ,perl))) ;; FIXME: reactivate input python as soon as the test failures -- cgit v1.2.3 From 6beb6cc6dff8b7285c820fbce508bd97ae2de214 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 2 Aug 2019 11:22:47 +0200 Subject: gnu: git: Fix cross-compilation. * gnu/packages/version-control.scm (git-cross-configure-flags): New variable, (git)[arguments]: add it to configure-flags. Also add cross curl-config script to PATH. (git-minimal): Add previous variable to configure-flags. --- gnu/packages/version-control.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 192fa666d9..947873e6d5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -141,6 +141,10 @@ changes to project files over time. It supports both a distributed workflow as well as the classic centralized workflow.") (license license:gpl2+))) +(define git-cross-configure-flags + '("ac_cv_fread_reads_directories=yes" + "ac_cv_snprintf_returns_bogus=no")) + (define-public git (package (name "git") @@ -233,7 +237,10 @@ as well as the classic centralized workflow.") ;; absolute file name to 'wish'. #:configure-flags (list (string-append "--with-tcltk=" (assoc-ref %build-inputs "tk") - "/bin/wish8.6")) ; XXX + "/bin/wish8.6") ; XXX + ,@(if (%current-target-system) + git-cross-configure-flags + '())) #:modules ((srfi srfi-1) (srfi srfi-26) @@ -250,6 +257,15 @@ as well as the classic centralized workflow.") (remove (cut string-prefix? bash-full <>) path) ":")) #t))) + ;; Add cross curl-config script to PATH when cross-compiling. + ,@(if (%current-target-system) + '((add-before 'configure 'add-cross-curl-config + (lambda* (#:key inputs #:allow-other-keys) + (setenv "PATH" + (string-append (assoc-ref inputs "curl") "/bin:" + (getenv "PATH"))) + #t))) + '()) (add-after 'configure 'patch-makefiles (lambda _ (substitute* "Makefile" @@ -506,7 +522,10 @@ everything from small to very large projects with speed and efficiency.") (string-append out "/share/gitweb")) #t))))) ((#:configure-flags flags) - ''()) + `(list + ,@(if (%current-target-system) + git-cross-configure-flags + '()))) ((#:disallowed-references lst '()) `(,perl ,@lst)))) (outputs '("out")) -- cgit v1.2.3 From 21b0ed1f9d6fec4cd49e2fa9cf94a07552ff7cf9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 2 Aug 2019 11:35:37 +0200 Subject: gnu: doxygen: Fix cross-compilation. * gnu/packages/documentation.scm (doxygen)[arguments]: Force cmake to use iconv.h from cross-libc. --- gnu/packages/documentation.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 19c42b00eb..eda8ca3368 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages python) #:use-module (gnu packages bison) @@ -145,7 +147,15 @@ markup) can be customized and extended by the user.") (inputs `(("bash" ,bash-minimal))) (arguments - `(#:test-target "tests" + ;; Force cmake to use iconv header from cross-libc instead of the one + ;; from native libc. + `(,@(if (%current-target-system) + '(#:configure-flags + (list (string-append "-DICONV_INCLUDE_DIR=" + (assoc-ref %build-inputs "cross-libc") + "/include"))) + '()) + #:test-target "tests" #:phases (modify-phases %standard-phases (add-before 'configure 'patch-sh (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From 891fd849ce1cfaaaf3e6cb4d236a02dd21df5036 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 18 Aug 2019 09:47:19 +0200 Subject: gnu: guile-gcrypt: Fix cross-compilation. * gnu/packages/gnupg.scm (guile-gcrypt) [native-inputs]: Add guile, [arguments]: add libgcrypt-config to PATH when cross-compiling. --- gnu/packages/gnupg.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f97f687d36..b31781a7b6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Björn Höfling +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -492,11 +493,26 @@ gpgpme starting with version 1.7.") "1mhc5m4xygkfj7x18f8apiqpfdn9mrql0am5sk13cf5xn8x1r63z")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) + (arguments + ;; When cross-compiling, the bash script libgcrypt-config provided by + ;; libgcrypt must be accessible during configure phase. + `(,@(if (%current-target-system) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'add-libgrypt-config + (lambda _ + (setenv "PATH" (string-append + (assoc-ref %build-inputs "libgcrypt") + "/bin:" + (getenv "PATH"))) + #t)))) + '()))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) ("automake" ,automake) - ("texinfo" ,texinfo))) + ("texinfo" ,texinfo) + ("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2) ("libgcrypt" ,libgcrypt))) -- cgit v1.2.3 From e53bf62e31793d199d7691f99bbf2767e7067b29 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 18 Aug 2019 09:10:58 +0200 Subject: gnu: guile-sqlite3: Fix cross-compilation. * gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/guile.scm (guile-sqlite3)[source]: Apply previous patch, [native-inputs]: add guile. --- gnu/local.mk | 1 + gnu/packages/guile.scm | 7 ++- .../guile-sqlite3-fix-cross-compilation.patch | 55 ++++++++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7118b251f0..21318afe66 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -941,6 +941,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-relocatable.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ + %D%/packages/patches/guile-sqlite3-fix-cross-compilation.patch \ %D%/packages/patches/gstreamer-buffer-reset-offset.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 49a6e964a3..f142b73a9d 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2019 Ricardo Wurmus ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Amirouche ;;; Copyright © 2018 Danny Milosavljevic @@ -536,11 +536,14 @@ Guile's foreign function interface.") (sha256 (base32 "1nv8j7wk6b5n4p22szyi8lv8fs31rrzxhzz16gyj8r38c1fyp9qp")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (string-append name "-" version "-checkout")) + (patches + (search-patches "guile-sqlite3-fix-cross-compilation.patch")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) + ("guile" ,guile-2.2) ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2) diff --git a/gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch b/gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch new file mode 100644 index 0000000000..9ea9a47677 --- /dev/null +++ b/gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch @@ -0,0 +1,55 @@ +From a6e9e62a77ecc5012929613e20da23b2636450a5 Mon Sep 17 00:00:00 2001 +From: Mathieu Othacehe +Date: Mon, 25 Mar 2019 11:00:38 +0100 +Subject: [PATCH] cross compile + +--- + build-aux/guile.am | 2 +- + configure.ac | 19 ++++++++++++------- + 2 files changed, 13 insertions(+), 8 deletions(-) + +diff --git a/build-aux/guile.am b/build-aux/guile.am +index dc1e63f..3126372 100644 +--- a/build-aux/guile.am ++++ b/build-aux/guile.am +@@ -16,4 +16,4 @@ EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES) + GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat + SUFFIXES = .scm .go + .scm.go: +- $(AM_V_GEN)$(top_builddir)/env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<" ++ $(AM_V_GEN)$(top_builddir)/env $(GUILE_TOOLS) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<" +diff --git a/configure.ac b/configure.ac +index f648fcb..2d34d0a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -21,15 +21,20 @@ PKG_CHECK_MODULES([SQLITE], [sqlite3]) + SQLITE_LIBDIR="`"$PKG_CONFIG" sqlite3 --variable libdir`" + AC_SUBST([SQLITE_LIBDIR]) + +-AC_MSG_CHECKING([whether '$SQLITE_LIBDIR/libsqlite3' is usable]) +-GUILE_CHECK([retval], +- [(dynamic-func \"sqlite3_open_v2\" ++if test "$cross_compiling" = "no"; then ++ AC_MSG_CHECKING([whether '$SQLITE_LIBDIR/libsqlite3' is usable]) ++ GUILE_CHECK([retval], ++ [(dynamic-func \"sqlite3_open_v2\" + (dynamic-link \"$SQLITE_LIBDIR/libsqlite3\"))]) +-if test "$retval" != 0; then +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([failed to load '$SQLITE_LIBDIR/libsqlite3']) ++ if test "$retval" != 0; then ++ AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([failed to load '$SQLITE_LIBDIR/libsqlite3']) ++ else ++ AC_MSG_RESULT([yes]) ++ fi + else +- AC_MSG_RESULT([yes]) ++ GUILE_TARGET="--target=$host_alias" ++ AC_SUBST([GUILE_TARGET]) + fi + + AC_CONFIG_FILES([Makefile sqlite3.scm]) +-- +2.17.1 + -- cgit v1.2.3 From c41f88699d8dce182ab422433d9f87cdb83ce2a4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 30 Sep 2019 15:03:18 +0200 Subject: gnu: libnl: Move python outputs to separate packages. Cross compiling python extensions is currently broken. To allow libnl cross compilation, move its python2 and python3 outputs to separate packages. * gnu/packages/linux.scm (libnl)[outputs]: Remove python2 and python3 and replace by ... (libnl-python-package): ... this new procedure, (libnl-python2, libnl-python3): new variables. --- gnu/packages/linux.scm | 66 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ed6df21ae0..911bd592b6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1997,35 +1997,18 @@ transparently through a bridge.") "/libnl-doc-" version ".tar.gz")) (sha256 (base32 "19p5y8q3cm5wqvamqc4s5syxnnkvzxy3gw8ivxk6fv9ybn8jm35h")))))) - (inputs - `(("python-2" ,python-2) - ("python-3" ,python-3))) - (outputs '("out" "doc" "python2" "python3")) + (outputs `("out" "doc")) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - #:phases + `(#:phases (modify-phases %standard-phases - (add-after 'install 'install-python - (lambda* (#:key outputs #:allow-other-keys) - (define (python-inst python) - (invoke python "setup.py" "build") - (invoke python "setup.py" "install" - (string-append "--prefix=" - (assoc-ref %outputs python))) - (invoke python "setup.py" "clean")) - (setenv "LDFLAGS" (format #f "-Wl,-rpath=~a/lib" - (assoc-ref %outputs "out"))) - (with-directory-excursion "./python" - (for-each python-inst '("python2" "python3"))) - #t)) (add-after 'install 'install-doc - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) (let ((dest (string-append (assoc-ref outputs "doc") "/share/doc/libnl"))) (mkdir-p dest) - (invoke "tar" "xf" (assoc-ref inputs "libnl3-doc") + (invoke "tar" "xf" (assoc-ref + (or native-inputs inputs) + "libnl3-doc") "--strip-components=1" "-C" dest))))))) (home-page "https://www.infradead.org/~tgr/libnl/") (synopsis "NetLink protocol library suite") @@ -2040,6 +2023,43 @@ configuration and monitoring interfaces.") ;; 'nl-addr-add.c'), so the result is GPLv2-only. (license license:gpl2))) +;; libnl python extensions used to be outputs of libnl. However, as +;; cross-compiling python extensions is currently broken, create separate +;; packages for libnl python extensions. +(define (libnl-python-package python) + (let ((name (string-append "libnl-" python))) + (package + (inherit libnl) + (name name) + (inputs `(,@(cond + ((string=? python "python2") + `(("python-2" ,python-2))) + ((string=? python "python3") + `(("python-3" ,python-3)))))) + (propagated-inputs `(("libnl" ,libnl))) + (outputs '("out")) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (define (python-inst python) + (invoke python "setup.py" "build") + (invoke python "setup.py" "install" + (string-append "--prefix=" + (assoc-ref %outputs "out"))) + (invoke python "setup.py" "clean")) + (setenv "LDFLAGS" (format #f "-Wl,-rpath=~a/lib" + (assoc-ref inputs "libnl"))) + (with-directory-excursion "./python" (python-inst ,python)) + #t)))))))) + +(define-public libnl-python2 (libnl-python-package "python2")) +(define-public libnl-python3 (libnl-python-package "python3")) + (define-public iw (package (name "iw") -- cgit v1.2.3 From 3403a4201057a9f7b02d332029d0c4f2ba158376 Mon Sep 17 00:00:00 2001 From: Pierre-Moana Levesque Date: Wed, 14 Aug 2019 09:40:21 +0200 Subject: gnu: crda: Fix cross-compilation * gnu/packages/linux.scm (crda)[arguments]: Patch Makefile to use cross pkg-config when cross-compiling. Also search for wireless-regdb in both native-inputs and inputs. Set CC variable to cross-compiler when cross-compiling. --- gnu/packages/linux.scm | 67 +++++++++++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 911bd592b6..3950d86cbb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2854,13 +2854,23 @@ interface.") (patches (search-patches "crda-optional-gcrypt.patch")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (delete 'configure) (add-after 'unpack 'gzip-determinism (lambda _ (substitute* "Makefile" (("gzip") "gzip --no-name")) #t)) + ,@(if (%current-target-system) + '((add-after + 'unpack 'fix-pkg-config + (lambda* (#:key target #:allow-other-keys) + (substitute* + "Makefile" + (("pkg-config") + (string-append target "-pkg-config"))) + #t))) + '()) (add-before 'build 'no-werror-no-ldconfig (lambda _ @@ -2870,37 +2880,44 @@ interface.") #t)) (add-before 'build 'set-regulator-db-file-name - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; Tell CRDA where to find our database. - (let ((regdb (assoc-ref inputs "wireless-regdb"))) + (let ((regdb (assoc-ref (or native-inputs inputs) + "wireless-regdb"))) (substitute* "crda.c" (("\"/lib/crda/regulatory.bin\"") (string-append "\"" regdb "/lib/crda/regulatory.bin\""))) #t)))) #:test-target "verify" - #:make-flags (let ((out (assoc-ref %outputs "out")) - (regdb (assoc-ref %build-inputs "wireless-regdb"))) - (list "CC=gcc" "V=1" - - ;; Disable signature-checking on 'regulatory.bin'. - ;; The reason is that this simplifies maintenance - ;; on our side (no need to manage a distro key - ;; pair), and we can guarantee integrity of - ;; 'regulatory.bin' by other means anyway, such as - ;; 'guix gc --verify'. See - ;; - ;; for a discssion. - "USE_OPENSSL=0" - - (string-append "PREFIX=" out) - (string-append "SBINDIR=" out "/sbin/") - (string-append "UDEV_RULE_DIR=" - out "/lib/udev/rules.d") - (string-append "LDFLAGS=-Wl,-rpath=" - out "/lib -L.") - (string-append "REG_BIN=" regdb - "/lib/crda/regulatory.bin"))))) + #:make-flags (let ((out (assoc-ref %outputs "out")) + (regdb (assoc-ref %build-inputs "wireless-regdb")) + (target ,(%current-target-system))) + (list + (string-append + "CC=" (if target + (string-append target "-gcc") "gcc")) + "V=1" + + ;; Disable signature-checking on 'regulatory.bin'. + ;; The reason is that this simplifies maintenance + ;; on our side (no need to manage a distro key + ;; pair), and we can guarantee integrity of + ;; 'regulatory.bin' by other means anyway, such as + ;; 'guix gc --verify'. See + ;; + ;; for a discssion. + "USE_OPENSSL=0" + + (string-append "PREFIX=" out) + (string-append "SBINDIR=" out "/sbin/") + (string-append "UDEV_RULE_DIR=" + out "/lib/udev/rules.d") + (string-append "LDFLAGS=-Wl,-rpath=" + out "/lib -L.") + (string-append "REG_BIN=" regdb + "/lib/crda/regulatory.bin") + "all_noverify")))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-2) ("wireless-regdb" ,wireless-regdb))) -- cgit v1.2.3 From a8446b40295c18ce1fcce66081c828bb391c09c9 Mon Sep 17 00:00:00 2001 From: Pierre-Moana Levesque Date: Mon, 5 Aug 2019 22:50:54 +0200 Subject: gnu: cmake: Fix cross-compilation. * gnu/packages/cmake.scm (cmake-minimal)[inputs]: Move all inputs to ... [native-inputs]: ... here, except for ncurses. --- gnu/packages/cmake.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 13252a9486..b9ac84ad7e 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -145,16 +146,17 @@ (replace 'configure (lambda* (#:key (configure-flags '()) #:allow-other-keys) (apply invoke "./configure" configure-flags)))))) - (inputs + (native-inputs `(("bzip2" ,bzip2) ("curl" ,curl) ("expat" ,expat) ("file" ,file) ("libarchive" ,libarchive) ("libuv" ,libuv) - ("ncurses" ,ncurses) ; required for ccmake ("rhash" ,rhash) ("zlib" ,zlib))) + (inputs + `(("ncurses" ,ncurses))) ; required for ccmake (native-search-paths (list (search-path-specification (variable "CMAKE_PREFIX_PATH") -- cgit v1.2.3 From 94f60b4bc98d9a054be731e613b81073e1082ce3 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 20 Aug 2019 17:45:50 +0200 Subject: utils: Use target-aarch64? and target-arm? helpers. * guix/utils.scm (target-aarch64?, target-arm?): New exported procedures. --- guix/utils.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index 1f99c5b3f5..c9236ad165 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -78,6 +78,8 @@ package-name->name+version target-mingw? target-arm32? + target-aarch64? + target-arm? target-64bit? version-compare version>? @@ -494,6 +496,12 @@ a character other than '@'." (define (target-arm32?) (string-prefix? "arm" (or (%current-target-system) (%current-system)))) +(define (target-aarch64?) + (string-prefix? "aarch64" (or (%current-target-system) (%current-system)))) + +(define (target-arm?) + (or (target-arm32?) (target-aarch64?))) + (define (target-64bit?) (let ((system (or (%current-target-system) (%current-system)))) (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64")))) -- cgit v1.2.3 From 8ac892c99cd451993c8472933b895eca1aa00c2c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 23 Aug 2019 09:51:33 +0200 Subject: build: vm: Fix arm32 support. * gnu/build/vm.scm (load-in-linux-vm): Disable qemu highmem support on ARM32 systems. --- gnu/build/vm.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index a5d9fefa62..b85398ed24 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -102,6 +102,14 @@ the #:references-graphs parameter of 'derivation'." ;; hardware limits imposed by other machines. ,@(if target-arm32? '("-M" "virt") '()) + ;; On ARM32, if the kernel is built without LPAE support, ECAM conflicts + ;; with VIRT_PCIE_MMIO causing PCI devices not to show up. Disable + ;; explicitely highmem to fix it. + ;; See: https://bugs.launchpad.net/qemu/+bug/1790975. + ,@(if target-arm32? + '("-machine" "highmem=off") + '()) + ;; Only enable kvm if we see /dev/kvm exists. This allows users without ;; hardware virtualization to still use these commands. KVM support is ;; still buggy on some ARM32 boards. Do not use it even if available. -- cgit v1.2.3 From fd02b831ba70c0902dd103707f253aa07ea64bfb Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 20 Aug 2019 18:00:40 +0200 Subject: system: vm: Add arm64 support. * gnu/build/vm.scm (load-in-linux-vm): Add target-arm64? argument and use it to pass correct arguments to qemu. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass the new target-arm64? argument added above. Do not add ESP partition on all ARM targets. Do not pass grub-efi package to initialize-hard-disk on ARM targets. --- gnu/build/vm.scm | 19 +++++++++++++------ gnu/system/vm.scm | 15 +++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index b85398ed24..6f920aec9e 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -82,6 +82,7 @@ make-disk-image? single-file-output? target-arm32? + target-aarch64? (disk-image-size (* 100 (expt 2 20))) (disk-image-format "qcow2") (references-graphs '())) @@ -97,10 +98,14 @@ access it via /dev/hda. REFERENCES-GRAPHS can specify a list of reference-graph files as produced by the #:references-graphs parameter of 'derivation'." + (define target-arm? (or target-arm32? target-aarch64?)) + (define arch-specific-flags `(;; On ARM, a machine has to be specified. Use "virt" machine to avoid ;; hardware limits imposed by other machines. - ,@(if target-arm32? '("-M" "virt") '()) + ,@(if target-arm? + '("-M" "virt") + '()) ;; On ARM32, if the kernel is built without LPAE support, ECAM conflicts ;; with VIRT_PCIE_MMIO causing PCI devices not to show up. Disable @@ -112,9 +117,9 @@ the #:references-graphs parameter of 'derivation'." ;; Only enable kvm if we see /dev/kvm exists. This allows users without ;; hardware virtualization to still use these commands. KVM support is - ;; still buggy on some ARM32 boards. Do not use it even if available. + ;; still buggy on some ARM boards. Do not use it even if available. ,@(if (and (file-exists? "/dev/kvm") - (not target-arm32?)) + (not target-arm?)) '("-enable-kvm") '()) @@ -125,11 +130,11 @@ the #:references-graphs parameter of 'derivation'." ;; The serial port name differs between emulated ;; architectures/machines. " console=" - (if target-arm32? "ttyAMA0" "ttyS0")) + (if target-arm? "ttyAMA0" "ttyS0")) ;; NIC is not supported on ARM "virt" machine, so use a user mode ;; network stack instead. - ,@(if target-arm32? + ,@(if target-arm? '("-device" "virtio-net-pci,netdev=mynet" "-netdev" "user,id=mynet") '("-net" "nic,model=virtio")))) @@ -153,7 +158,9 @@ the #:references-graphs parameter of 'derivation'." (_ #f)) (apply invoke qemu "-nographic" "-no-reboot" - "-smp" (number->string (parallel-job-count)) + ;; CPU "max" behaves as "host" when KVM is enabled, and like a system + ;; CPU with the maximum possible feature set otherwise. + "-cpu" "max" "-m" (number->string memory-size) "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" "-device" "virtio-rng-pci,rng=guixsd-vm-rng" diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index ac6e4ded92..de20030848 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -235,10 +235,12 @@ made available under the /xchg CIFS share." #:memory-size #$memory-size #:make-disk-image? #$make-disk-image? #:single-file-output? #$single-file-output? - ;; FIXME: ‘target-arm32?’ may not operate on - ;; the right system/target values. Rewrite + ;; FIXME: ‘target-arm32?’ and + ;; ‘target-aarch64?’ may not operate on the + ;; right system/target values. Rewrite ;; using ‘let-system’ when available. #:target-arm32? #$(target-arm32?) + #:target-aarch64? #$(target-aarch64?) #:disk-image-format #$disk-image-format #:disk-image-size size #:references-graphs graphs)))))) @@ -452,10 +454,10 @@ system." ;; bootloaders if we are not targeting ARM because UEFI ;; support in U-Boot is experimental. ;; - ;; FIXME: ‘target-arm32?’ may be not operate on the right + ;; FIXME: ‘target-arm?’ may be not operate on the right ;; system/target values. Rewrite using ‘let-system’ when ;; available. - (if #$(target-arm32?) + (if #$(target-arm?) '() (list (partition ;; The standalone grub image is about 10MiB, but @@ -466,10 +468,11 @@ system." ;; when mounting. The actual FAT-ness is based ;; on file system size (16 in this case). (file-system "vfat") - (flags '(esp)))))))) + (flags '(esp))))))) + (grub-efi #$(and (not (target-arm?)) grub-efi))) (initialize-hard-disk "/dev/vda" #:partitions partitions - #:grub-efi #$grub-efi + #:grub-efi grub-efi #:bootloader-package #$(bootloader-package bootloader) #:bootcfg #$bootcfg-drv -- cgit v1.2.3 From 4ba3c0da4f76e8ec487036f23a14f9353f09131a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 21 Aug 2019 09:19:58 +0200 Subject: system: vm: Support cross-compilation. * gnu/system.scm (system-linux-image-file-name): Add support for cross-built systems. Remove system argument that was ignored, (operating-system-kernel-file): adapt by removing ignored os argument. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Add target argument and turn inputs into native-inputs. Pass target to qemu-command and gexp->derivation calls. (iso9660-image): Add target argument and pass it to expression->derivation-in-linux-vm. Remove qemu from inputs as it is not necessary. (qemu-image): Add target argument, also remove qemu from inputs. Pass target argument to expression->derivation-in-linux-vm call. --- gnu/system.scm | 15 ++++++++------- gnu/system/vm.scm | 18 +++++++++++++----- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index a353b1a5c8..96c2b5aad3 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -447,20 +447,21 @@ from the initrd." "Return the list of swap services for OS." (map swap-service (operating-system-swap-devices os))) -(define* (system-linux-image-file-name #:optional (system (%current-system))) +(define* (system-linux-image-file-name) "Return the basename of the kernel image file for SYSTEM." ;; FIXME: Evaluate the conditional based on the actual current system. - (cond - ((string-prefix? "arm" (%current-system)) "zImage") - ((string-prefix? "mips" (%current-system)) "vmlinuz") - ((string-prefix? "aarch64" (%current-system)) "Image") - (else "bzImage"))) + (let ((target (or (%current-target-system) (%current-system)))) + (cond + ((string-prefix? "arm" target) "zImage") + ((string-prefix? "mips" target) "vmlinuz") + ((string-prefix? "aarch64" target) "Image") + (else "bzImage")))) (define (operating-system-kernel-file os) "Return an object representing the absolute file name of the kernel image of OS." (file-append (operating-system-kernel os) - "/" (system-linux-image-file-name os))) + "/" (system-linux-image-file-name))) (define* (operating-system-directory-base-entries os) "Return the basic entries of the 'system' directory of OS for use as the diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index de20030848..c900b2d435 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -143,7 +143,7 @@ (define* (expression->derivation-in-linux-vm name exp #:key - (system (%current-system)) + (system (%current-system)) target (linux linux-libre) initrd (qemu qemu-minimal) @@ -214,7 +214,8 @@ made available under the /xchg CIFS share." (use-modules (guix build utils) (gnu build vm)) - (let* ((inputs '#$(list qemu (canonical-package coreutils))) + (let* ((native-inputs + '#+(list qemu (canonical-package coreutils))) (linux (string-append #$linux "/" #$(system-linux-image-file-name))) (initrd #$initrd) @@ -222,16 +223,18 @@ made available under the /xchg CIFS share." (graphs '#$(match references-graphs (((graph-files . _) ...) graph-files) (_ #f))) + (target #$(or (%current-target-system) (%current-system))) (size #$(if (eq? 'guess disk-image-size) #~(+ (* 70 (expt 2 20)) ;ESP (estimated-partition-size graphs)) disk-image-size))) - (set-path-environment-variable "PATH" '("bin") inputs) + (set-path-environment-variable "PATH" '("bin") native-inputs) (load-in-linux-vm loader #:output #$output #:linux linux #:initrd initrd + #:qemu (qemu-command target) #:memory-size #$memory-size #:make-disk-image? #$make-disk-image? #:single-file-output? #$single-file-output? @@ -248,6 +251,7 @@ made available under the /xchg CIFS share." (gexp->derivation name builder ;; TODO: Require the "kvm" feature. #:system system + #:target target #:env-vars env-vars #:guile-for-build guile-for-build #:references-graphs references-graphs))) @@ -263,6 +267,7 @@ made available under the /xchg CIFS share." file-system-label file-system-uuid (system (%current-system)) + (target (%current-target-system)) (qemu qemu-minimal) os bootcfg-drv @@ -299,7 +304,7 @@ INPUTS is a list of inputs (as for packages)." (setlocale LC_ALL "en_US.utf8") (let ((inputs - '#$(append (list qemu parted e2fsprogs dosfstools xorriso) + '#$(append (list parted e2fsprogs dosfstools xorriso) (map canonical-package (list sed grep coreutils findutils gawk)))) @@ -328,6 +333,7 @@ INPUTS is a list of inputs (as for packages)." #:volume-uuid #$(and=> file-system-uuid uuid-bytevector)))))) #:system system + #:target target ;; Keep a local file system for /tmp so that we can populate it directly as ;; root and have files owned by root. See . @@ -346,6 +352,7 @@ INPUTS is a list of inputs (as for packages)." (define* (qemu-image #:key (name "qemu-image") (system (%current-system)) + (target (%current-target-system)) (qemu qemu-minimal) (disk-image-size 'guess) (disk-image-format "qcow2") @@ -404,7 +411,7 @@ system." (setlocale LC_ALL "en_US.utf8") (let ((inputs - '#$(append (list qemu parted e2fsprogs dosfstools) + '#$(append (list parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)))) @@ -481,6 +488,7 @@ system." #:bootloader-installer #$(bootloader-installer bootloader))))))) #:system system + #:target target #:make-disk-image? #t #:disk-image-size disk-image-size #:disk-image-format disk-image-format -- cgit v1.2.3 From e4696c69d75f4fcf54c42beeb928032726bdaf7d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 18 Aug 2019 13:09:05 +0200 Subject: scripts: system: Add --target option. * guix/scripts/system.scm (%options): Add target option, (%default-options): ditto, (process-action): Rename existing target variable to target-file and pass new target variable to run-with-store procedure. --- guix/scripts/system.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 27b014db68..d3e10b6dc7 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017, 2018 Chris Marusich -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Christopher Baines ;;; @@ -931,6 +931,8 @@ Some ACTIONS support additional ARGS.\n")) --full-boot for 'vm', make a full boot sequence")) (display (G_ " --skip-checks skip file system and initrd module safety checks")) + (display (G_ " + --target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\"")) (display (G_ " -v, --verbosity=LEVEL use the given verbosity LEVEL")) (newline) @@ -1004,6 +1006,10 @@ Some ACTIONS support additional ARGS.\n")) (lambda (opt name arg result) (alist-cons 'system arg (alist-delete 'system result eq?)))) + (option '("target") #t #f + (lambda (opt name arg result) + (alist-cons 'target arg + (alist-delete 'target result eq?)))) (option '(#\r "root") #t #f (lambda (opt name arg result) (alist-cons 'gc-root arg result))) @@ -1012,6 +1018,7 @@ Some ACTIONS support additional ARGS.\n")) (define %default-options ;; Alist of default option values. `((system . ,(%current-system)) + (target . #f) (substitutes? . #t) (build-hook? . #t) (print-build-trace? . #t) @@ -1045,6 +1052,7 @@ resulting from command-line parsing." ((x . _) x))) (expr (assoc-ref opts 'expression)) (system (assoc-ref opts 'system)) + (target (assoc-ref opts 'target)) (os (ensure-operating-system (or file expr) (cond @@ -1061,7 +1069,7 @@ resulting from command-line parsing." (dry? (assoc-ref opts 'dry-run?)) (bootloader? (assoc-ref opts 'install-bootloader?)) - (target (match args + (target-file (match args ((first second) second) (_ #f))) (bootloader-target @@ -1103,9 +1111,10 @@ resulting from command-line parsing." (_ #f)) opts) #:install-bootloader? bootloader? - #:target target + #:target target-file #:bootloader-target bootloader-target #:gc-root (assoc-ref opts 'gc-root))))) + #:target target #:system system)) (warn-about-disk-space))) -- cgit v1.2.3 From eacd072c09f8e4b5e0264d39ea9afe7814247f46 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 16 Nov 2019 18:14:31 +0100 Subject: gnu: linux-libre: Remove cross-libc from CROSS_CPATH. * gnu/packages/linux.scm (make-linux-libre*)[arguments]: Do not unset CROSS_CPATH completely, instead remove cross-libc from CROSS_CPATH in the same way that libc is removed from CPATH. --- gnu/packages/linux.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 19432817ca..3552c2e281 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -679,23 +679,26 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." #t)) (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) - ;; Unset CROSS_CPATH to make sure that cross-libc is not - ;; found. Otherwise, some of its header would conflict with the - ;; one from linux (stdint.h and linux/types.h) - ,@(if (%current-target-system) - '((unsetenv "CROSS_CPATH")) - '()) - - ;; On AArch64 (at least), we need to remove glibc headers from CPATH - ;; (they are still available as "system headers"), so that the kernel - ;; can override uint64_t. See . - (setenv "CPATH" - (string-join - (remove (cut string-prefix? (assoc-ref inputs "libc") <>) - (string-split (getenv "CPATH") #\:)) - ":")) - (format #t "environment variable `CPATH' changed to `~a'~%" - (getenv "CPATH")) + ;; On AArch64 (at least), we need to remove glibc headers from + ;; CPATH (they are still available as "system headers"), so that + ;; the kernel can override uint64_t. See + ;; . This is also true when + ;; cross-compiling, except in that case, cross-libc must be + ;; removed from CROSS_CPATH. + (let ((var ,(if (%current-target-system) + "CROSS_CPATH" + "CPATH")) + (libc ,(if (%current-target-system) + "cross-libc" + "libc"))) + (setenv var + (string-join + (remove + (cut string-prefix? (assoc-ref inputs libc) <>) + (string-split (getenv var) #\:)) + ":")) + (format #t "environment variable `~a' changed to `~a'~%" + var (getenv var))) ;; Avoid introducing timestamps (setenv "KCONFIG_NOTIMESTAMP" "1") -- cgit v1.2.3 From 86b38e4af465a69d45cedbcceb3748e4be8b2fcb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 17:58:16 +0200 Subject: gnu: libidn2: Update to 2.3.0. * gnu/packages/libidn.scm (libidn2): Update to 2.3.0. --- gnu/packages/libidn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index ea9ce70dfb..8731ed3f83 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -59,14 +59,14 @@ Java libraries.") (define-public libidn2 (package (name "libidn2") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libidn/" name "-" version ".tar.lz")) (sha256 (base32 - "1a5cv79q6b719jv4fpwjl3r0mmx9qcpla98v9dk64cgxn8f8di10")))) + "14yw4w37ya6rcqa7h6p44x6711dwgq2j22xg6k79ybbf04sj88kb")))) (native-inputs `(("lzip" ,lzip))) (inputs -- cgit v1.2.3 From a0361e09658a728ec4b7f36fba0e9625948b4ea1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 22:18:44 +0200 Subject: gnu: bison: Update to 3.4.2. * gnu/packages/bison.scm (bison): Update to 3.4.2. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 12f19b785e..e65ef34c94 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -31,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.4.1") + (version "3.4.2") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "03c2pmq3bs0drdislnz6gm1rwz3n4pb2rz9navyxydppxg2rl597")))) + "185zd8rl9diy5sl3zmizml05kcvcin05ppbax1lxqdcpd4s5bl17")))) (build-system gnu-build-system) (arguments '(;; Building in parallel on many-core systems may cause an error such as -- cgit v1.2.3 From ba6008760a84b22d71f3d70e6a15f7d89960b4bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 22:24:35 +0200 Subject: gnu: libgcrypt: Update to 1.8.5. * gnu/packages/gnupg.scm (libgcrypt): Update to 1.8.5. [replacement]: Remove field. (libgcrypt-1.8.5): Remove variable. --- gnu/packages/gnupg.scm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 7f01f8a0a6..3ba49c884f 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -137,15 +137,14 @@ Daemon and possibly more in the future.") (define-public libgcrypt (package (name "libgcrypt") - (version "1.8.4") - (replacement libgcrypt-1.8.5) + (version "1.8.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" version ".tar.bz2")) (sha256 (base32 - "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n")))) + "1hvsazms1bfd769q0ngl0r9g5i4m9mpz9jmvvrdzyzk3rfa2ljiv")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error-host" ,libgpg-error))) @@ -171,18 +170,6 @@ generation.") (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/libgcrypt"))))) -(define-public libgcrypt-1.8.5 - (package - (inherit libgcrypt) - (version "1.8.5") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" - version ".tar.bz2")) - (sha256 - (base32 - "1hvsazms1bfd769q0ngl0r9g5i4m9mpz9jmvvrdzyzk3rfa2ljiv")))))) - (define-public libassuan (package (name "libassuan") -- cgit v1.2.3 From 7ad3c81240b366b99f29c4ac5f7c42173c91f38a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 22:26:20 +0200 Subject: gnu: gsl: Update to 2.6. * gnu/packages/maths.scm (gsl): Update to 2.6. [source]: Remove patch. * gnu/packages/patches/gsl-test-i686.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/maths.scm | 5 ++--- gnu/packages/patches/gsl-test-i686.patch | 17 ----------------- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/gsl-test-i686.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4cf68dcfd9..e97a5083d1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -938,7 +938,6 @@ dist_patch_DATA = \ %D%/packages/patches/grep-timing-sensitive-test.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ - %D%/packages/patches/gsl-test-i686.patch \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 16a9d97a47..fd7159a411 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -375,15 +375,14 @@ semiconductors.") (define-public gsl (package (name "gsl") - (version "2.5") + (version "2.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gsl/gsl-" version ".tar.gz")) (sha256 (base32 - "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04")) - (patches (search-patches "gsl-test-i686.patch")))) + "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp")))) (build-system gnu-build-system) (arguments `(;; Currently there are numerous tests that fail on "exotic" diff --git a/gnu/packages/patches/gsl-test-i686.patch b/gnu/packages/patches/gsl-test-i686.patch deleted file mode 100644 index 8828c08614..0000000000 --- a/gnu/packages/patches/gsl-test-i686.patch +++ /dev/null @@ -1,17 +0,0 @@ -Work around a test failure due to a rounding issue on 32-bit -platforms, as reported at: - - https://lists.gnu.org/archive/html/bug-gsl/2016-10/msg00000.html - ---- gsl-2.2.1/linalg/test.c 2016-10-05 13:27:42.464059730 +0200 -+++ gsl-2.2.1/linalg/test.c 2016-10-05 13:27:46.988095882 +0200 -@@ -4843,9 +4843,6 @@ main(void) - gsl_test(test_cholesky_decomp_unit(), "Cholesky Decomposition [unit triangular]"); - gsl_test(test_cholesky_solve(), "Cholesky Solve"); - -- gsl_test(test_cholesky_decomp(r), "Cholesky Decomposition"); -- gsl_test(test_cholesky_invert(r), "Cholesky Inverse"); -- gsl_test(test_pcholesky_decomp(r), "Pivoted Cholesky Decomposition"); - gsl_test(test_pcholesky_solve(r), "Pivoted Cholesky Solve"); - gsl_test(test_pcholesky_invert(r), "Pivoted Cholesky Inverse"); - gsl_test(test_mcholesky_decomp(r), "Modified Cholesky Decomposition"); -- cgit v1.2.3 From 4e4aedf097b9c81af090fe5a4751dfbc9c54955d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Nov 2019 11:25:31 +0200 Subject: gnu: binutils: Update to 2.33.1. * gnu/packages/base.scm (binutils): Update to 2.33.1. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3a3360dc7a..87eee4787c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -414,14 +414,14 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.32") + (version "2.33.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "0b8767nyal1bc4cyzg5h9iis8kpkln1i3wkamig75cifj1fb2f6y")) + "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c")) (patches (search-patches "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 3f0f0d61bbcbba2300f0dcebdf87a8c61015ebc3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Nov 2019 15:13:17 +0200 Subject: gnu: bash: Update to patch level 11. * gnu/packages/bash.scm (%patch-series-5.0): Add patches 8 through 11. --- gnu/packages/bash.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 9ed0e2dae4..84406d02ff 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -69,7 +69,11 @@ (4 "021gqqvgydixkrmqss64b6srfdlkvnx88lyfzpxfrn5d6bc7li0l") (5 "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav") (6 "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn") - (7 "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p"))) + (7 "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p") + (8 "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf") + (9 "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d") + (10 "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn") + (11 "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c"))) (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of -- cgit v1.2.3 From 8456f9fcd93034150460e7e950aa502db3cc3d38 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Nov 2019 19:58:52 +0200 Subject: gnu: gcc-7: Update to 7.5.0. * gnu/packages/gcc.scm (gcc-7): Update to 7.5.0. --- gnu/packages/gcc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index bda6a2b48a..4c036933e1 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -491,14 +491,14 @@ Go. It also includes runtime support libraries for these languages.") (define-public gcc-7 (package (inherit gcc-6) - (version "7.4.0") + (version "7.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "0lgy170b0pp60j9cczqkmaqyjjb584vfamj4c30swd7k0j6y5pgd")) + "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq")) (patches (search-patches "gcc-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch")))) (description -- cgit v1.2.3 From fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:12:49 +0200 Subject: gnu: sqlite: Build with column metadata. * gnu/packages/sqlite.scm (sqlite)[arguments]: Add configure flag to enable column metadata. (sqlite-with-column-metadata): Remove variable. * gnu/packages/fontutils.scm (fontmanager)[inputs]: Replace sqlite-with-column-metadata with sqlite. * gnu/packages/messaging (dino)[inputs]: Ditto. * gnu/packages/music.scm (clementine)[inputs]: Ditto. * gnu/packages/qt.scm (qtbase)[inputs]: Ditto. * gnu/packages/telephony.scm (jami)[inputs]: Remove sqlite-with-column-metadata. [arguments]: Remove custom 'wrap phase. --- gnu/packages/fontutils.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/sqlite.scm | 15 ++------------- gnu/packages/telephony.scm | 22 +--------------------- 6 files changed, 8 insertions(+), 39 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index aba6f07537..7a88ad9a12 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -762,7 +762,7 @@ maintain the Noto Fonts project.") ("desktop-file-utils" ,desktop-file-utils))) (inputs `(("json-glib" ,json-glib) - ("sqlite-with-column-metadata" ,sqlite-with-column-metadata) + ("sqlite" ,sqlite) ("fonconfig" ,fontconfig) ("freetype" ,freetype) ("gtk+" ,gtk+))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3f223c2cfe..5f791ca642 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -753,7 +753,7 @@ on Axolotl and PEP.") ("libgcrypt" ,libgcrypt) ("libsoup" ,libsoup) ("qrencode" ,qrencode) - ("sqlite" ,sqlite-with-column-metadata) + ("sqlite" ,sqlite) ("gpgme" ,gpgme) ("gtk+" ,gtk+) ("glib-networking" ,glib-networking) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 241ede58d8..3f69e88b26 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -297,7 +297,7 @@ score, keyboard, guitar, drum and controller views.") ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras) - ("sqlite" ,sqlite-with-column-metadata) + ("sqlite" ,sqlite) ("sparsehash" ,sparsehash) ("taglib" ,taglib))) (home-page "https://clementine-player.org") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 241e73d575..e012ffaf9b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -189,7 +189,7 @@ system, and the core design of Django is reused in Grantlee.") ("postgresql" ,postgresql) ("pulseaudio" ,pulseaudio) ("pcre2" ,pcre2) - ("sqlite" ,sqlite-with-column-metadata) + ("sqlite" ,sqlite) ("udev" ,eudev) ("unixodbc" ,unixodbc) ("wayland" ,wayland) @@ -385,7 +385,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") ("pcre2" ,pcre2) ("postgresql" ,postgresql) ("pulseaudio" ,pulseaudio) - ("sqlite" ,sqlite-with-column-metadata) + ("sqlite" ,sqlite) ("unixodbc" ,unixodbc) ("xcb-util" ,xcb-util) ("xcb-util-image" ,xcb-util-image) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 6d6df17f90..1a064197b8 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -74,7 +74,8 @@ (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " "-DSQLITE_ENABLE_FTS3 " "-DSQLITE_ENABLE_UNLOCK_NOTIFY " - "-DSQLITE_ENABLE_DBSTAT_VTAB")))) + "-DSQLITE_ENABLE_DBSTAT_VTAB " + "-DSQLITE_ENABLE_COLUMN_METADATA")))) (home-page "https://www.sqlite.org/") (synopsis "The SQLite database management system") (description @@ -83,15 +84,3 @@ zero-configuration, transactional SQL database engine. SQLite is the most widely deployed SQL database engine in the world. The source code for SQLite is in the public domain.") (license license:public-domain))) - -;; This is used by Qt. -(define-public sqlite-with-column-metadata - (package/inherit sqlite - (name "sqlite-with-column-metadata") - (arguments - (substitute-keyword-arguments (package-arguments sqlite) - ((#:configure-flags flags) - `(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " - "-DSQLITE_ENABLE_UNLOCK_NOTIFY " - "-DSQLITE_ENABLE_DBSTAT_VTAB " - "-DSQLITE_ENABLE_COLUMN_METADATA"))))))) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index abb68f62b2..21f00f51a1 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -60,7 +60,6 @@ #:use-module (gnu packages qt) #:use-module (gnu packages serialization) #:use-module (gnu packages speech) - #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) #:use-module (gnu packages video) @@ -858,19 +857,7 @@ This package provides a library common to all Jami clients.") ("clutter-gtk" ,clutter-gtk) ("gettext" ,gnu-gettext) ("libcanberra" ,libcanberra) - ("webkitgtk" ,webkitgtk) - ;; TODO: We must wrap ring-client-gnome to force using the - ;; `sqlite-with-column-metadata' package instead of `sqlite' or else it - ;; fails with: - ;; - ;; /gnu/store/...-qtbase-5.11.2/lib/qt5/plugins/sqldrivers/libqsqlite.so: - ;; undefined symbol: sqlite3_column_table_name16 - ;; - ;; qtbase is built against sqlite-with-column-metadata but somehow - ;; jami-client-gnome ends up with both `sqlite' and - ;; `sqlite-with-column-metadata' as inputs and it seems that - ;; libqsqlite.so gets confused. - ("sqlite" ,sqlite-with-column-metadata))) + ("webkitgtk" ,webkitgtk))) (native-inputs `(("pkg-config" ,pkg-config) ("glib:bin" ,glib "bin") @@ -886,13 +873,6 @@ This package provides a library common to all Jami clients.") (add-after 'unpack 'change-directory (lambda _ (chdir "client-gnome") - #t)) - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (path (string-append (assoc-ref inputs "sqlite") "/lib"))) - (wrap-program (string-append out "/bin/gnome-ring") - `("LD_LIBRARY_PATH" ":" prefix (,path)))) #t))))) (synopsis "Distributed multimedia communications platform") (description "Jami (formerly GNU Ring) is a secure and distributed voice, -- cgit v1.2.3 From b7fd304e28a3206e565d568c3f988a72b57d0b16 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:20:37 +0200 Subject: gnu: Remove static-bash-for-bootstrap. * gnu/packages/make-bootstrap.scm (static-bash-for-bootstrap): Remove variable. (%static-inputs): Let gawk use static-bash if %current-target-system. Use static-bash. --- gnu/packages/make-bootstrap.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index b8d1b2af3e..d149a7ec1a 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -167,15 +167,6 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (current-source-location) #:native-inputs native-inputs)) -(define static-bash-for-bootstrap - (package - (inherit static-bash) - (source (origin - (inherit (package-source static-bash)) - (patches - (cons (search-patch "bash-reproducible-linux-pgrp-pipe.patch") - (origin-patches (package-source static-bash)))))))) - (define %static-inputs ;; Packages that are to be used as %BOOTSTRAP-INPUTS. (let ((coreutils (package (inherit coreutils) @@ -252,7 +243,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (("-Wl,-export-dynamic") "")) #t))))))) (inputs (if (%current-target-system) - `(("bash" ,static-bash-for-bootstrap)) + `(("bash" ,static-bash)) '())))) (tar (package (inherit tar) (arguments @@ -298,7 +289,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ("sed" ,sed) ("grep" ,grep) ("gawk" ,gawk))) - ("bash" ,static-bash-for-bootstrap)))) + ("bash" ,static-bash)))) (define %static-binaries (package -- cgit v1.2.3 From 7ed91f8c8de0de7df992c1534a1c86219ab5ba84 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Dec 2019 10:31:28 +0200 Subject: gnu: swig: Clean up inputs. * gnu/packages/swig.scm (swig)[inputs]: Move perl, guile-2.0 ... [inputs]: ... to here. --- gnu/packages/swig.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 90d698a8b4..e10e30b332 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,18 +61,12 @@ (("-isystem ") "-I")) #t))))) (native-inputs `(("boost" ,boost) - ("pcre" ,pcre "bin"))) ;for 'pcre-config' - (inputs `(;; Provide these to run the corresponding tests. - ("pcre" ,pcre) - ("guile" ,guile-2.0) - ("perl" ,perl))) - ;; FIXME: reactivate input python as soon as the test failures - ;; fatal error: Python.h: No such file or directory - ;; # include - ;; are fixed. - ;; The python part probably never worked and does not seem to - ;; be needed for currently dependent packages. -;; ("python" ,python-wrapper))) + ("pcre" ,pcre "bin") ;for 'pcre-config' + ;; The following are for tests and examples: + ("guile" ,guile-2.0) + ("perl" ,perl))) + ;;("python" ,python-wrapper) + (inputs `(("pcre" ,pcre))) (home-page "http://swig.org/") (synopsis "Interface compiler that connects C/C++ code to higher-level languages") -- cgit v1.2.3 From 60bd56c6d8368c23dcd97b26501771c82316fc8c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Dec 2019 10:35:09 +0200 Subject: gnu: swig.scm: Sort module inputs alphabetically. * gnu/packages/swig.scm: Sort module inputs alphabetically. --- gnu/packages/swig.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index e10e30b332..655c1a19ab 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -25,11 +25,11 @@ #:use-module (guix licenses) #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages pcre) - #:use-module (gnu packages guile) #:use-module (gnu packages boost) - #:use-module (gnu packages python) - #:use-module (gnu packages perl)) + #:use-module (gnu packages guile) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages python)) (define-public swig (package -- cgit v1.2.3 From 3d46333539e4a8271d61108574f69bc323de5f19 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Dec 2019 17:29:55 +0100 Subject: gnu: libjpeg-turbo: Remove graft for 2.0.3. * gnu/packages/image.scm (libjpeg-turbo): Update to 2.0.3. [replacement]: Remove. [source](patches): New field. --- gnu/packages/image.scm | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0536779b64..b8640227f9 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1486,15 +1486,15 @@ is hereby granted.")))) (define-public libjpeg-turbo (package (name "libjpeg-turbo") - (version "2.0.2") - (replacement libjpeg-turbo/fixed) + (version "2.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libjpeg-turbo/" version "/libjpeg-turbo-" version ".tar.gz")) + (patches (search-patches "libjpeg-turbo-CVE-2019-2201.patch")) (sha256 (base32 - "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c")))) + "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2")))) (build-system cmake-build-system) (native-inputs `(("nasm" ,nasm))) @@ -1517,20 +1517,6 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") license:ijg ;the libjpeg library and associated tools license:zlib)))) ;the libjpeg-turbo SIMD extensions -;; Replacement package to fix CVE-2019-13960 and CVE-2019-2201. -(define libjpeg-turbo/fixed - (package - (inherit libjpeg-turbo) - (version "2.0.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/libjpeg-turbo/" - version "/libjpeg-turbo-" version ".tar.gz")) - (sha256 - (base32 - "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2")) - (patches (search-patches "libjpeg-turbo-CVE-2019-2201.patch")))))) - (define-public niftilib (package (name "niftilib") -- cgit v1.2.3 From c8817d11011dc85c8523daa9ba3ec4676ab37e8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 17:49:32 +0200 Subject: gnu: perl: Remove obsolete workaround. * gnu/packages/perl.scm (perl)[arguments]: Remove phase "make-shared-objects-writable". --- gnu/packages/perl.scm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 47eeb48b5e..86bbeabf86 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -116,18 +116,6 @@ (lambda* (#:key configure-flags #:allow-other-keys) (format #t "Perl configure flags: ~s~%" configure-flags) (apply invoke "./Configure" configure-flags))) - (add-before - 'strip 'make-shared-objects-writable - (lambda* (#:key outputs #:allow-other-keys) - ;; The 'lib/perl5' directory contains ~50 MiB of .so. Make them - ;; writable so that 'strip' actually strips them. - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib"))) - (for-each (lambda (dso) - (chmod dso #o755)) - (find-files lib "\\.so$")) - #t))) - (add-after 'install 'remove-extra-references (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 6711ad08c723ffa21a0307c41aa8f966b7614cdd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:29:47 +0100 Subject: gnu: fribidi: Remove defunct replacement. * gnu/packages/fribidi.scm (fribidi)[replacement]: Remove. (fribidi/fixed): Remove variable. --- gnu/packages/fribidi.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index ada7c261dd..b6cabdc4b0 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -27,7 +27,6 @@ (define-public fribidi (package - (replacement fribidi/fixed) (name "fribidi") (version "1.0.7") (source @@ -48,10 +47,3 @@ Algorithm. This algorithm is used to properly display text in left-to-right or right-to-left ordering as necessary.") (home-page "https://github.com/fribidi/fribidi") (license lgpl2.1+))) - -(define fribidi/fixed - (package - (inherit fribidi) - (source - (origin (inherit (package-source fribidi)) - (patches (search-patches "fribidi-CVE-2019-18397.patch")))))) -- cgit v1.2.3 From edb8aa3a28d410ef6fcb9355b57f9be26f87caed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:40:45 +0100 Subject: gnu: avahi: Incorporate grafted changes. * gnu/packages/avahi.scm (avahi)[replacement]: Remove. [source](patches): Add avahi-CVE-2018-1000845.patch. [properties]: New field. (avahi/fixed): Remove variable. --- gnu/packages/avahi.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index e84fed6a71..f82a421e08 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -35,7 +35,6 @@ (package (name "avahi") (version "0.7") - (replacement avahi/fixed) (home-page "http://avahi.org") (source (origin (method url-fetch) @@ -44,7 +43,10 @@ (sha256 (base32 "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap")) - (patches (search-patches "avahi-localstatedir.patch")))) + (patches (search-patches "avahi-localstatedir.patch" + "avahi-CVE-2018-1000845.patch")))) + ;; Hide a duplicate of the CVE fixed above. + (properties `((lint-hidden-cve . ("CVE-2017-6519")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-distro=none" @@ -75,17 +77,6 @@ network. It is an implementation of the mDNS (for \"Multicast DNS\") and DNS-SD (for \"DNS-Based Service Discovery\") protocols.") (license lgpl2.1+))) -(define avahi/fixed - (package - (inherit avahi) - (source (origin - (inherit (package-source avahi)) - (patches - (append (search-patches "avahi-CVE-2018-1000845.patch") - (origin-patches (package-source avahi)))))) - ;; Hide a duplicate of the CVE fixed above. - (properties `((lint-hidden-cve . ("CVE-2017-6519")))))) - (define-public nss-mdns (package (name "nss-mdns") -- cgit v1.2.3 From 6cd34029c588a5e0d19a77571888968d7acaf0e7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 2 Dec 2019 23:56:25 +0100 Subject: gnu: expat: Remove grafted replacement. * gnu/packages/xml.scm (expat): Update to 2.2.9. [replacement]: Remove. (expat-2.2.9): Remove variable. --- gnu/packages/xml.scm | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 698d1f6188..b3aae8d219 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -66,8 +66,7 @@ (define-public expat (package (name "expat") - (version "2.2.7") - (replacement expat-2.2.9) + (version "2.2.9") (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c)))) (origin (method url-fetch) @@ -79,7 +78,7 @@ "/expat-" version ".tar.xz"))) (sha256 (base32 - "1y5yax6bq8p9xk49zqkd62pxk8bq266wrgbrqgaxp3wsrw5g9qrh"))))) + "1960mmgbb4cm64n1p0nz3hrs1pw03hkrfcw8prmnn4622mdrd9hy"))))) (build-system gnu-build-system) (home-page "https://libexpat.github.io/") (synopsis "Stream-oriented XML parser library written in C") @@ -89,23 +88,6 @@ stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags).") (license license:expat))) -(define expat-2.2.9 - (package - (inherit expat) - (version "2.2.9") - (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c)))) - (origin - (method url-fetch) - (uri (list (string-append "mirror://sourceforge/expat/expat/" - version "/expat-" version ".tar.xz") - (string-append - "https://github.com/libexpat/libexpat/releases/download/R_" - (string-map dot->underscore version) - "/expat-" version ".tar.xz"))) - (sha256 - (base32 - "1960mmgbb4cm64n1p0nz3hrs1pw03hkrfcw8prmnn4622mdrd9hy"))))))) - (define-public libebml (package (name "libebml") -- cgit v1.2.3 From 767abd373b595fee5f46189627ea761c9fa555e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 05:22:24 +0100 Subject: gnu: expat: Do not build static libraries. * gnu/packages/xml.scm (expat)[arguments]: New field. --- gnu/packages/xml.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b3aae8d219..d1376a5bee 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -80,6 +80,8 @@ (base32 "1960mmgbb4cm64n1p0nz3hrs1pw03hkrfcw8prmnn4622mdrd9hy"))))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (home-page "https://libexpat.github.io/") (synopsis "Stream-oriented XML parser library written in C") (description -- cgit v1.2.3 From f09ef814d9d6150cb06bc0e329f994602b525917 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 04:22:29 +0100 Subject: gnu: nghttp2: Update to 1.40.0. * gnu/packages/web.scm (nghttp2): Update to 1.40.0. [replacement]: Remove. (nghttp2-1.39.1): Remove variable. --- gnu/packages/web.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index da8049ee41..6330c73c16 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6762,8 +6762,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.39.1") - (replacement nghttp2-1.39.2) + (version "1.40.0") (source (origin (method url-fetch) @@ -6772,7 +6771,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") "nghttp2-" version ".tar.xz")) (sha256 (base32 - "0j0lk37k8k3f61r9nw647hg4b22z1753l36n3xrp9x01civ614b7")))) + "0wwhwv7cvi1vxpdjwvg0kpa4jzhszclpnwrwfcw728zz53a47z09")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 @@ -6842,19 +6841,6 @@ compressed JSON header blocks. @end itemize\n") (license license:expat))) -(define nghttp2-1.39.2 - (package - (inherit nghttp2) - (version "1.39.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/nghttp2/nghttp2/" - "releases/download/v" version "/" - "nghttp2-" version ".tar.xz")) - (sha256 - (base32 - "12yfsjghbaypp4w964d45ih9vs38g6anih80wbsflaxx192idlm2")))))) - (define-public hpcguix-web (let ((commit "f39c90b35e99e4122b0866ec4337020d61c81508") (revision "4")) -- cgit v1.2.3 From f3e00778d8c949ee28266d6b362a04905dd70496 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 Nov 2019 23:48:35 +0100 Subject: gnu: curl: Update to 7.67.0. * gnu/packages/curl.scm (curl): Update to 7.67.0. [replacement]: Remove field. (curl-7.66.0): Remove variable. --- gnu/packages/curl.scm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index aa5d24c401..a05c8e2c79 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,15 +50,14 @@ (define-public curl (package (name "curl") - (version "7.65.3") - (replacement curl-7.66.0) + (version "7.67.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1sjz4fq7jg96mpmpqq82nd61njna6jp3c4m9yrbx2j1rh5a8ingj")))) + "0v2k1v28ams5fa9gkybmnpnlkfqa2im5diywa8wqqcvr0crfglpm")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -143,18 +142,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define curl-7.66.0 - (package - (inherit curl) - (version "7.66.0") - (source (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "1hcqxpibhknhjy56wcxz5vd6m9ggx3ykwp3wp5wx05ih36481d6v")))))) - (define-public kurly (package (name "kurly") -- cgit v1.2.3 From e554eba02c8f5fc090ca54476a0ad6a1de9cc5c0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:04:11 +0100 Subject: gnu: OpenSSL: Incorporate grafted changes. * gnu/packages/tls.scm (openssl): Update to 1.1.1d. [replacement]: Remove field. (openssl-1.1.1d): Remove variable. --- gnu/packages/tls.scm | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index da9ba9346f..7e1bf832ba 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -300,8 +300,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.1.1c") - (replacement openssl-1.1.1d) + (version "1.1.1d") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -313,7 +312,7 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn")) + "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy")) (patches (search-patches "openssl-1.1-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" @@ -425,24 +424,6 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define openssl-1.1.1d - (package/inherit - openssl - (version "1.1.1d") - (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openssl.org/source/openssl-" - version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/" - "openssl-" version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/old/" - (string-trim-right version char-set:letter) - "/openssl-" version ".tar.gz"))) - (patches (search-patches "openssl-1.1-c-rehash-in.patch")) - (sha256 - (base32 - "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy")))))) - (define-public openssl-1.0 (package (inherit openssl) -- cgit v1.2.3 From c751e5c6bba28365073c99bdbebf4c64b382dce5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 Nov 2019 22:16:56 +0100 Subject: gnu: ghostscript: Incorporate grafted changes. * gnu/packages/ghostscript.scm (ghostscript)[replacement]: Remove field. [arguments]: Add "--disable-compile-inits" and "--with-fontpath" in #:configure-flags. [native-inputs]: Add PKG-CONFIG. [inputs]: Add FONTCONFIG and GS-FONTS. (ghostscript/fixed): Remove variable. --- gnu/packages/ghostscript.scm | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 7839ac5b72..224a83641b 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -157,12 +157,6 @@ printing, and psresize, for adjusting page sizes.") (package (name "ghostscript") (version "9.27") - - ;; The problems addressed by GHOSTSCRIPT/FIXED are not security-related, - ;; but they have a significant impact on usability, hence this graft. - ;; TODO: Ungraft on next update cycle. - (replacement ghostscript/fixed) - (source (origin (method url-fetch) @@ -205,6 +199,10 @@ printing, and psresize, for adjusting page sizes.") (string-append "ZLIBDIR=" (assoc-ref %build-inputs "zlib") "/include") "--enable-dynamic" + "--disable-compile-inits" + (string-append "--with-fontpath=" + (assoc-ref %build-inputs "gs-fonts") + "/share/fonts/type1/ghostscript") ,@(if (%current-target-system) '(;; Specify the native compiler, which is used to build 'echogs' @@ -268,6 +266,7 @@ printing, and psresize, for adjusting page sizes.") #t)))))) (native-inputs `(("perl" ,perl) + ("pkg-config" ,pkg-config) ;needed for freetype ("python" ,python-wrapper) ("tcl" ,tcl) @@ -278,7 +277,9 @@ printing, and psresize, for adjusting page sizes.") ("libjpeg/native" ,libjpeg)) '()))) (inputs - `(("freetype" ,freetype) + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("gs-fonts" ,gs-fonts) ("jbig2dec" ,jbig2dec) ("libjpeg" ,libjpeg) ("libpaper" ,libpaper) @@ -294,25 +295,6 @@ output file formats and printers.") (home-page "https://www.ghostscript.com/") (license license:agpl3+))) -(define ghostscript/fixed - ;; This adds the Freetype dependency (among other things), which fixes the - ;; rendering issues described in . - (package/inherit - ghostscript - (arguments - (substitute-keyword-arguments (package-arguments ghostscript) - ((#:configure-flags flags ''()) - `(append (list "--disable-compile-inits" - (string-append "--with-fontpath=" - (assoc-ref %build-inputs "gs-fonts") - "/share/fonts/type1/ghostscript")) - ,flags)))) - (native-inputs `(("pkg-config" ,pkg-config) ;needed for freetype - ,@(package-native-inputs ghostscript))) - (inputs `(("gs-fonts" ,gs-fonts) - ("fontconfig" ,fontconfig) - ,@(package-inputs ghostscript))))) - (define-public ghostscript/x (package/inherit ghostscript (name (string-append (package-name ghostscript) "-with-x")) -- cgit v1.2.3 From e0fb90490e47e6304dd6f12f16b0b66df1c56c50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 Nov 2019 23:47:24 +0100 Subject: gnu: ghostscript: Update to 9.50. * gnu/packages/ghostscript.scm (ghostscript): Update to 9.50. * gnu/packages/patches/ghostscript-no-header-id.patch: Adjust context. --- gnu/packages/ghostscript.scm | 4 ++-- gnu/packages/patches/ghostscript-no-header-id.patch | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 224a83641b..72a38fddf5 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -156,7 +156,7 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (version "9.27") + (version "9.50") (source (origin (method url-fetch) @@ -166,7 +166,7 @@ printing, and psresize, for adjusting page sizes.") "/ghostscript-" version ".tar.xz")) (sha256 (base32 - "06dnj0mxyaryfbwlsjwaqf847w91w2h8f108kxxcc41nrnx1y3zw")) + "1m770dwc82afdgzgq2kar3120r1lbybm3mssdm79f8kggf0v16yv")) (patches (search-patches "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) diff --git a/gnu/packages/patches/ghostscript-no-header-id.patch b/gnu/packages/patches/ghostscript-no-header-id.patch index da1aa5530f..45fc95fd6e 100644 --- a/gnu/packages/patches/ghostscript-no-header-id.patch +++ b/gnu/packages/patches/ghostscript-no-header-id.patch @@ -9,10 +9,10 @@ See: https://bugs.ghostscript.com/show_bug.cgi?id=698208 diff -ur orig/gnu-ghostscript-9.14.0/devices/vector/gdevpdf.c gnu-ghostscript-9.14.0/devices/vector/gdevpdf.c --- orig/gnu-ghostscript-9.14.0/devices/vector/gdevpdf.c 2017-07-09 23:30:28.960479189 +0200 +++ gnu-ghostscript-9.14.0/devices/vector/gdevpdf.c 2017-07-09 23:34:34.306524488 +0200 -@@ -1785,8 +1785,11 @@ +@@ -1810,8 +1810,11 @@ * +1 for the linearisation dict and +1 for the primary hint stream. */ - linear_params->FirsttrailerOffset = gp_ftell_64(linear_params->Lin_File.file); + linear_params->FirsttrailerOffset = gp_ftell(linear_params->Lin_File.file); - gs_sprintf(LDict, "\ntrailer\n<>\nstartxref\r\n0\n%%%%EOF\n \n", - linear_params->LastResource + 3, pdev->ResourceUsage[linear_params->Info_id].NewObjectNumber, pdev->ResourceUsage[linear_params->Catalog_id].NewObjectNumber, fileID, fileID, 0); + gs_sprintf(LDict, "\ntrailer\n<OwnerPassword.size > 0 || !(!getenv("GS_GENERATE_UUIDS") || (strcasecmp(getenv("GS_GENERATE_UUIDS"), "0") != 0 && strcasecmp(getenv("GS_GENERATE_UUIDS"), "no") != 0))) /* ID is mandatory when encrypting */ + gs_sprintf(LDict, "/ID[%s%s]", fileID, fileID); + gs_sprintf(LDict, "/Prev %d>>\nstartxref\r\n0\n%%%%EOF\n \n", 0); - fwrite(LDict, strlen(LDict), 1, linear_params->Lin_File.file); + gp_fwrite(LDict, strlen(LDict), 1, linear_params->Lin_File.file); /* Write document catalog (Part 4) */ -@@ -2321,8 +2324,11 @@ +@@ -2346,8 +2349,11 @@ if (code != 0) return_error(gs_error_ioerror); @@ -34,10 +34,10 @@ diff -ur orig/gnu-ghostscript-9.14.0/devices/vector/gdevpdf.c gnu-ghostscript-9. + if (pdev->OwnerPassword.size > 0 || !(!getenv("GS_GENERATE_UUIDS") || (strcasecmp(getenv("GS_GENERATE_UUIDS"), "0") != 0 || strcasecmp(getenv("GS_GENERATE_UUIDS"), "no") != 0))) /* ID is mandatory when encrypting */ + gs_sprintf(LDict, "/ID[%s%s]", fileID, fileID); + gs_sprintf(LDict, "/Prev %"PRId64">>\nstartxref\r\n0\n%%%%EOF\n", mainxref); - fwrite(LDict, strlen(LDict), 1, linear_params->sfile); + gp_fwrite(LDict, strlen(LDict), 1, linear_params->sfile); - code = gp_fseek_64(linear_params->sfile, pdev->ResourceUsage[HintStreamObj].LinearisedOffset, SEEK_SET); -@@ -3016,10 +3022,12 @@ + code = gp_fseek(linear_params->sfile, pdev->ResourceUsage[HintStreamObj].LinearisedOffset, SEEK_SET); +@@ -3012,10 +3018,12 @@ stream_puts(s, "trailer\n"); pprintld3(s, "<< /Size %ld /Root %ld 0 R /Info %ld 0 R\n", pdev->next_id, Catalog_id, Info_id); -- cgit v1.2.3 From 5d229b496373179998f6a51da47629554c2d1e18 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 Nov 2019 23:47:59 +0100 Subject: gnu: jbig2dec: Update to 0.17. * gnu/packages/image.scm (jbig2dec): Update to 0.17. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b8640227f9..f9bfbb7427 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -628,15 +628,15 @@ arithmetic ops.") (define-public jbig2dec (package (name "jbig2dec") - (version "0.16") + (version "0.17") (source (origin (method url-fetch) (uri (string-append "https://github.com/ArtifexSoftware" "/ghostpdl-downloads/releases/download" - "/gs927/" name "-" version ".tar.gz")) + "/gs950/" name "-" version ".tar.gz")) (sha256 (base32 - "00h61y7bh3z6mqfzxyb318gyh0f8jwarg4hvlrm83rqps8avzxm4")) + "0wpvslmwazia3z8gyk343kbq6yj47pxr4x5yjvx332v309qssazp")) (patches (search-patches "jbig2dec-ignore-testtest.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 0b3df5c913af91bc196bb8cb41783126e55bf5a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 Nov 2019 17:44:25 +0100 Subject: gnu: glibc: Update to 2.30. * gnu/packages/patches/glibc-CVE-2019-19126.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/base.scm (glibc): Update to 2.30. [source](patches): Adjust for 2.30. (glibc-2.29): New public variable. --- gnu/local.mk | 1 + gnu/packages/base.scm | 28 ++++++++++++++++++++----- gnu/packages/patches/glibc-CVE-2019-19126.patch | 22 +++++++++++++++++++ 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/glibc-CVE-2019-19126.patch diff --git a/gnu/local.mk b/gnu/local.mk index fef7fd1e28..25dfef3849 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -906,6 +906,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ %D%/packages/patches/glibc-CVE-2019-9169.patch \ + %D%/packages/patches/glibc-CVE-2019-19126.patch \ %D%/packages/patches/glibc-allow-kernel-2.6.32.patch \ %D%/packages/patches/glibc-boot-2.16.0.patch \ %D%/packages/patches/glibc-boot-2.2.5.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a444213a84..caaa04258c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -567,13 +567,13 @@ the store.") ;; version 2.28, GNU/Hurd used a different glibc branch. (package (name "glibc") - (version "2.29") + (version "2.30") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "0jzh58728flfh939a8k9pi1zdyalfzlxmwra7k0rzji5gvavivpk")) + "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72")) (snippet ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is ;; required on LFS distros to avoid loading the distro's libc.so @@ -585,9 +585,7 @@ the store.") #t)) (modules '((guix build utils))) (patches (search-patches "glibc-ldd-x86_64.patch" - "glibc-CVE-2019-7309.patch" - "glibc-CVE-2019-9169.patch" - "glibc-2.29-git-updates.patch" + "glibc-CVE-2019-19126.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" @@ -819,6 +817,26 @@ with the Linux kernel.") ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) +(define-public glibc-2.29 + (package + (inherit glibc) + (version "2.29") + (source (origin + (inherit (package-source glibc)) + (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) + (sha256 + (base32 + "0jzh58728flfh939a8k9pi1zdyalfzlxmwra7k0rzji5gvavivpk")) + (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-CVE-2019-7309.patch" + "glibc-CVE-2019-9169.patch" + "glibc-2.29-git-updates.patch" + "glibc-hidden-visibility-ldconfig.patch" + "glibc-versioned-locpath.patch" + "glibc-allow-kernel-2.6.32.patch" + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-supported-locales.patch")))))) + (define-public glibc-2.28 (package (inherit glibc) diff --git a/gnu/packages/patches/glibc-CVE-2019-19126.patch b/gnu/packages/patches/glibc-CVE-2019-19126.patch new file mode 100644 index 0000000000..5b9ac58ab7 --- /dev/null +++ b/gnu/packages/patches/glibc-CVE-2019-19126.patch @@ -0,0 +1,22 @@ +Fix CVE-2019-19126: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19126 +https://sourceware.org/bugzilla/show_bug.cgi?id=25204 + +Taken from upstream: +https://sourceware.org/git/?p=glibc.git;a=commit;h=37c90e117310728a4ad1eb998c0bbe7d79c4a398 + +diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h +index 975cbe2..df2cdfd 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h ++++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h +@@ -31,7 +31,8 @@ + environment variable, LD_PREFER_MAP_32BIT_EXEC. */ + #define EXTRA_LD_ENVVARS \ + case 21: \ +- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \ ++ if (!__libc_enable_secure \ ++ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \ + GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \ + |= bit_arch_Prefer_MAP_32BIT_EXEC; \ + break; -- cgit v1.2.3 From ca0576d6998cf954b91e4696f0f2570372ebb6d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 Nov 2019 23:50:54 +0100 Subject: gnu: zstd: Update to 1.4.4. * gnu/packages/compression.scm (zstd): Update to 1.4.4. [arguments]: Adjust pkg-config substitution. --- gnu/packages/compression.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 89dcc34e21..905931acbd 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1394,18 +1394,18 @@ or junctions, and always follows hard links.") (define-public zstd (package (name "zstd") - (version "1.4.2") + (version "1.4.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/facebook/zstd/releases/download/" "v" version "/zstd-" version ".tar.gz")) (sha256 - (base32 "1ja3nrjynmiwwdjrf6crraizkbagp7y414bqqq2ady91nn1hjwqj")))) + (base32 "05ckxap00qvc0j51d3ci38150cxsw82w7s9zgd5fgzspnzmp1vsr")))) (build-system gnu-build-system) - (outputs '("out" ;1.1MiB executables and documentation - "lib" ;1MiB shared library and headers - "static")) ;1MiB static library + (outputs '("out" ;1.2MiB executables and documentation + "lib" ;1.2MiB shared library and headers + "static")) ;1.2MiB static library (arguments `(#:phases (modify-phases %standard-phases @@ -1425,12 +1425,10 @@ or junctions, and always follows hard links.") (delete-file ar)) (find-files shared-libs "\\.a$")) - ;; While here, remove prefix= from the pkg-config file because it - ;; is unused, and because it contains a needless reference to $out. - ;; XXX: It would be great if #:disallow-references worked between - ;; outputs. + ;; Make sure the pkg-config file refers to the right output. (substitute* (string-append shared-libs "/pkgconfig/libzstd.pc") - (("^prefix=.*") "")) + (("^prefix=.*") + (string-append "prefix=" lib "\n"))) #t)))) #:make-flags -- cgit v1.2.3 From abd5124417bda96ddd0a73a198465b357940a5d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 Nov 2019 23:52:43 +0100 Subject: gnu: libbsd: Update to 0.10.0. * gnu/packages/libbsd.scm (libbsd): Update to 0.10.0. --- gnu/packages/libbsd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libbsd.scm b/gnu/packages/libbsd.scm index a616de70bd..9d0dff10f1 100644 --- a/gnu/packages/libbsd.scm +++ b/gnu/packages/libbsd.scm @@ -25,14 +25,14 @@ (define-public libbsd (package (name "libbsd") - (version "0.9.1") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append "https://libbsd.freedesktop.org/releases/" "libbsd-" version ".tar.xz")) (sha256 (base32 - "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n")))) + "11x8q45jvjvf2dvgclds64mscyg10lva33qinf2hwgc84v3svf1l")))) (build-system gnu-build-system) (synopsis "Utility functions from BSD systems") (description "This library provides useful functions commonly found on BSD -- cgit v1.2.3 From 8aeac338a7084720a0143f54b83e39d18a2edcdc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 Nov 2019 23:54:23 +0100 Subject: gnu: jemalloc: Update to 5.2.1. * gnu/packages/jemalloc.scm (jemalloc): Update to 5.2.1. --- gnu/packages/jemalloc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm index aa8493fd1d..2eabf4403f 100644 --- a/gnu/packages/jemalloc.scm +++ b/gnu/packages/jemalloc.scm @@ -32,7 +32,7 @@ (define-public jemalloc (package (name "jemalloc") - (version "5.2.0") + (version "5.2.1") (source (origin (method url-fetch) (uri (string-append @@ -40,7 +40,7 @@ version "/jemalloc-" version ".tar.bz2")) (sha256 (base32 - "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl")))) + "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5f1000d5d4cc4dfc9a1fe220457c17ad011d9e33 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 Nov 2019 23:56:03 +0100 Subject: gnu: libffi: Update to 3.3. * gnu/packages/patches/libffi-3.2.1-complex-alpha.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/libffi.scm (libffi): Update to 3.3. [source](patches): Remove. * gnu/packages/python.scm (python-3.7)[arguments]: Remove workaround. --- gnu/local.mk | 1 - gnu/packages/libffi.scm | 15 +++--------- .../patches/libffi-3.2.1-complex-alpha.patch | 28 ---------------------- gnu/packages/python.scm | 7 +----- 4 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 gnu/packages/patches/libffi-3.2.1-complex-alpha.patch diff --git a/gnu/local.mk b/gnu/local.mk index 25dfef3849..f13d8f3645 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1066,7 +1066,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libgpg-error-gawk-compat.patch \ - %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ %D%/packages/patches/libjpeg-turbo-CVE-2019-2201.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index b61dbc8657..52654ddf3f 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -41,7 +41,7 @@ (define-public libffi (package (name "libffi") - (version "3.2.1") + (version "3.3") (source (origin (method url-fetch) (uri @@ -49,21 +49,12 @@ name "-" version ".tar.gz")) (sha256 (base32 - "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh")) - (patches (search-patches "libffi-3.2.1-complex-alpha.patch")))) + "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj")))) (build-system gnu-build-system) (arguments `(;; Prevent the build system from passing -march and -mtune to the ;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4". - #:configure-flags '("--enable-portable-binary" "--without-gcc-arch") - #:phases - (modify-phases %standard-phases - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (define out (assoc-ref outputs "out")) - (symlink (string-append out "/lib/libffi-3.2.1/include") - (string-append out "/include")) - #t))))) + #:configure-flags '("--enable-portable-binary" "--without-gcc-arch"))) (outputs '("out" "debug")) (synopsis "Foreign function call interface library") (description diff --git a/gnu/packages/patches/libffi-3.2.1-complex-alpha.patch b/gnu/packages/patches/libffi-3.2.1-complex-alpha.patch deleted file mode 100644 index ebbc0635a5..0000000000 --- a/gnu/packages/patches/libffi-3.2.1-complex-alpha.patch +++ /dev/null @@ -1,28 +0,0 @@ -The patch fixes build failure of form: - ../src/alpha/osf.S:298:2: error: #error "osf.S out of sync with ffi.h" -Upstream fixed the bug in a more invasive way -but didn't have releases since 3.2.1. - -The patch is taken from Gentoo: -https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch - ---- libffi-3.2.1/src/alpha/osf.S 2015-01-16 10:46:15.000000000 +0100 -+++ libffi-3.2.1/src/alpha/osf.S 2015-01-16 10:46:24.000000000 +0100 -@@ -279,6 +279,7 @@ - .gprel32 $load_64 # FFI_TYPE_SINT64 - .gprel32 $load_none # FFI_TYPE_STRUCT - .gprel32 $load_64 # FFI_TYPE_POINTER -+ .gprel32 $load_none # FFI_TYPE_COMPLEX - - /* Assert that the table above is in sync with ffi.h. */ - -@@ -294,7 +295,8 @@ - || FFI_TYPE_SINT64 != 12 \ - || FFI_TYPE_STRUCT != 13 \ - || FFI_TYPE_POINTER != 14 \ -- || FFI_TYPE_LAST != 14 -+ || FFI_TYPE_COMPLEX != 15 \ -+ || FFI_TYPE_LAST != 15 - #error "osf.S out of sync with ffi.h" - #endif - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 43b4044e72..ef1c8e4a09 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -377,12 +377,7 @@ data types.") " --exclude test_mmap" ;; test_socket may hang and eventually run out of memory ;; on some systems: . - " test_socket" - ;; XXX: test_ctypes fails on some platforms due to a problem in - ;; libffi 3.2.1: . - ,@(if (string-prefix? "aarch64" (%current-system)) - '(" test_ctypes") - '())))) + " test_socket"))) ((#:phases phases) `(modify-phases ,phases (add-before 'check 'set-TZDIR -- cgit v1.2.3 From d9cd568aea3b134ca92333c67baa5bdab3ba010f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 03:15:53 +0100 Subject: gnu: libtiff: Update to 4.1.0. * gnu/packages/image.scm (libtiff): Update to 4.1.0. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index f9bfbb7427..3a816f8308 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -543,7 +543,7 @@ extracting icontainer icon files.") (define-public libtiff (package (name "libtiff") - (version "4.0.10") + (version "4.1.0") (source (origin (method url-fetch) @@ -551,7 +551,7 @@ extracting icontainer icon files.") version ".tar.gz")) (sha256 (base32 - "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic")))) + "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.3 MiB of HTML documentation -- cgit v1.2.3 From 2874a33d712b92d172e6e70a1fbd2e0fe65bcdf4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 03:16:26 +0100 Subject: gnu: libtiff: Do not build static libraries. * gnu/packages/image.scm (libtiff)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/image.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3a816f8308..0a2ad5a99a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -560,7 +560,8 @@ extracting icontainer icon files.") `(#:configure-flags (list (string-append "--with-docdir=" (assoc-ref %outputs "doc") "/share/doc/" - ,name "-" ,version)))) + ,name "-" ,version) + "--disable-static"))) (inputs `(("zlib" ,zlib) ("libjpeg" ,libjpeg))) (synopsis "Library for handling TIFF files") -- cgit v1.2.3 From c218e03362ebddca17d1797c5d4c0b18d634bded Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 03:17:18 +0100 Subject: gnu: perl: Update to 5.30.1. * gnu/packages/perl.scm (perl): Update to 5.30.1. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 86bbeabf86..89254de339 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -67,14 +67,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.30.0") + (version "5.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5")) + "0r7r8a7pkgxp3w5lza559ahxczw6hzpwvhkpc4c99vpi3xbjagdz")) (patches (search-patches "perl-no-sys-dirs.patch" "perl-autosplit-default-time.patch" -- cgit v1.2.3 From f7511ff1109868d215f5668d8e07e539ef77bd7b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 03:33:56 +0100 Subject: gnu: readline: Add a version parameter to patch procedures. * gnu/packages/readline.scm (patch-url, readline-patch, patch-series): Add VERSION parameter. (%patch-series-7.0): Pass "7.0" to PATCH-SERIES. --- gnu/packages/readline.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 57d550d67f..1304bb8b2b 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -30,22 +30,24 @@ #:use-module (guix utils) #:use-module (ice-9 format)) -(define (patch-url seqno) - (format #f "mirror://gnu/readline/readline-7.0-patches/readline70-~3,'0d" seqno)) +(define (patch-url version seqno) + (format #f "mirror://gnu/readline/readline-~a-patches/readline~a-~3,'0d" + version (string-join (string-split version #\.) "") seqno)) -(define (readline-patch seqno sha256) +(define (readline-patch version seqno sha256) "Return the origin of Readline patch SEQNO, with expected hash SHA256" (origin (method url-fetch) - (uri (patch-url seqno)) + (uri (patch-url version seqno)) (sha256 sha256))) -(define-syntax-rule (patch-series (seqno hash) ...) - (list (readline-patch seqno (base32 hash)) +(define-syntax-rule (patch-series version (seqno hash) ...) + (list (readline-patch version seqno (base32 hash)) ...)) (define %patch-series-7.0 (patch-series + "7.0" (1 "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs") (2 "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7") (3 "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy") -- cgit v1.2.3 From d7316c774386a79559d557a5cec7f98e345561c6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 03:37:14 +0100 Subject: gnu: readline: Update to 8.0.1. * gnu/packages/readline.scm (%patch-series-8.0): New variable. (readline)[version]: Adjust accordingly. [source](patches): Add %PATCH-SERIES-8.0. --- gnu/packages/readline.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 1304bb8b2b..9f886f9b6e 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,11 @@ (list (readline-patch version seqno (base32 hash)) ...)) +(define %patch-series-8.0 + (patch-series + "8.0" + (1 "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq"))) + (define %patch-series-7.0 (patch-series "7.0" @@ -57,7 +63,8 @@ (define-public readline (package (name "readline") - (version "8.0") + (version (string-append "8.0." + (number->string (length %patch-series-8.0)))) (source (origin (method url-fetch) (uri (string-append "mirror://gnu/readline/readline-" @@ -65,7 +72,8 @@ (sha256 (base32 "0qg4924hf4hg0r0wbx2chswsr08734536fh5iagkd3a7f4czafg3")) - (patches (search-patches "readline-link-ncurses.patch")) + (patches (append %patch-series-8.0 + (search-patches "readline-link-ncurses.patch"))) (patch-flags '("-p0")))) (build-system gnu-build-system) (propagated-inputs `(("ncurses" ,ncurses))) -- cgit v1.2.3 From e8acfd1a9fcb5d947f023293852373758784d15f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 03:40:14 +0100 Subject: gnu: icu4c: Update to 65.1. * gnu/packages/icu4c.scm (%icu4c-patches): Remove variable. (icu4c): Update to 65.1. [source](uri): Change to new download location. [source](patches, patch-flags): Remove. --- gnu/packages/icu4c.scm | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index c70871f7e7..717ed277ee 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -33,44 +33,20 @@ #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) -;; These patches are taken from ICUs 'maint-64' branch and will be included in -;; 64.3. The latter patch is needed because many packages use "invalid" -;; locales which misbehave with ICU 64.2. See discussion at -;; . -(define %icu4c-patches - (list (origin - (method url-fetch) - (uri (string-append "https://github.com/unicode-org/icu/commit/" - "7788f04eb9be0d7ecade6af46cf7b9825447763d.patch")) - (file-name "icu4c-datetime-regression.patch") - (sha256 - (base32 - "0gs2sbdfpzwwdjqcqr0c16fw3g7wy3gb1gbgvzs9k1ciw0bhpv4w"))) - (origin - (method url-fetch) - (uri (string-append "https://github.com/unicode-org/icu/commit/" - "cfb20862909ff105d4f2c43923c97561bc5a5815.patch")) - (file-name "icu4c-locale-mapping.patch") - (sha256 - (base32 - "0s5psb60aisj6icziblvlp9dqcz56n3887i8ib0yidbjnnrw5b97"))))) - (define-public icu4c (package (name "icu4c") - (version "64.2") + (version "65.1") (source (origin (method url-fetch) (uri (string-append - "http://download.icu-project.org/files/icu4c/" - version + "https://github.com/unicode-org/icu/releases/download/release-" + (string-map (lambda (x) (if (char=? x #\.) #\- x)) version) "/icu4c-" (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) - (patches %icu4c-patches) - (patch-flags '("-p2")) (sha256 - (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) + (base32 "0j6r6qqnhfr5iqkx53k63ifkm93kv1kkb7h2mlgd1mnnndk79qsk")))) (build-system gnu-build-system) ;; When cross-compiling, this package needs a source directory of a ;; native-build of itself. -- cgit v1.2.3 From adfcb15ff1e662489cad390614fb7119065e7d39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 04:19:36 +0100 Subject: gnu: sqlite: Update to 3.30.1. * gnu/packages/sqlite.scm (sqlite): Update to 3.30.1. --- gnu/packages/sqlite.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 1a064197b8..d7eb132584 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,7 +46,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -62,7 +62,7 @@ numeric-version ".tar.gz"))) (sha256 (base32 - "1hxpi45crbqp6lacl7z611lna02k956m9bsy2bjzrbb2y23546yn")))) + "0q4f57a5995wz9c7dfiqy9zwl0kn0b900nxwinqa3llv13dm0nlc")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 72c7788fcf0d619fb5e99c7da0c087af8edbd6bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 04:20:04 +0100 Subject: gnu: Tcl/Tk: Update to 8.6.10. * gnu/packages/tcl.scm (tcl, tk): Update to 8.6.10. --- gnu/packages/tcl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 31f9ae848e..7531c1ca9d 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -43,14 +43,14 @@ (define-public tcl (package (name "tcl") - (version "8.6.9") + (version "8.6.10") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/tcl/Tcl/" version "/tcl" version "-src.tar.gz")) (sha256 (base32 - "0kjzj7mkzfnb7ksxanbibibfpciyvsh5ffdlhs0bmfc75kgd435d")))) + "1vc7imilx6kcb5319r7hnrp4jn5pqb41an3vr3azhgcfcgvdp5ji")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -145,7 +145,7 @@ X11 GUIs.") (define-public tk (package (name "tk") - (version "8.6.9.1") + (version "8.6.10") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/tcl/Tcl/" @@ -153,7 +153,7 @@ X11 GUIs.") version "-src.tar.gz")) (sha256 (base32 - "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg")) + "11p3ycqbr5116vpaxv6fl6md6gcav1ffspgr8wrlc2lxhn543pv3")) (patches (search-patches "tk-find-library.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 717867a6efba935b026d4178aeee232bdbee0102 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 04:41:12 +0100 Subject: gnu: findutils: Update to 4.7.0. * gnu/packages/patches/findutils-gnulib-libio.patch, gnu/packages/patches/findutils-makedev.patch, gnu/packages/patches/findutils-test-xargs.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/base.scm (findutils): Update to 4.7.0. [source](uri): Adjust for file name change. [source](snippet): Remove. [source](patches): Remove obsolete. [arguments]: Remove obsolete workaround. Add phase to patch tests. * gnu/packages/commencement.scm (findutils-boot0)[arguments]: Allow 32-bit time_t on 64-bit systems. --- gnu/local.mk | 3 - gnu/packages/base.scm | 38 +++----- gnu/packages/commencement.scm | 10 +- gnu/packages/patches/findutils-gnulib-libio.patch | 114 ---------------------- gnu/packages/patches/findutils-makedev.patch | 22 ----- gnu/packages/patches/findutils-test-xargs.patch | 22 ----- 6 files changed, 22 insertions(+), 187 deletions(-) delete mode 100644 gnu/packages/patches/findutils-gnulib-libio.patch delete mode 100644 gnu/packages/patches/findutils-makedev.patch delete mode 100644 gnu/packages/patches/findutils-test-xargs.patch diff --git a/gnu/local.mk b/gnu/local.mk index f13d8f3645..0c0f5651a9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -833,10 +833,7 @@ dist_patch_DATA = \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ %D%/packages/patches/file-CVE-2019-18218.patch \ - %D%/packages/patches/findutils-gnulib-libio.patch \ %D%/packages/patches/findutils-localstatedir.patch \ - %D%/packages/patches/findutils-makedev.patch \ - %D%/packages/patches/findutils-test-xargs.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index caaa04258c..a336f5e6d0 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -253,40 +253,28 @@ interactive means to merge two files.") (define-public findutils (package (name "findutils") - (version "4.6.0") + (version "4.7.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/findutils/findutils-" - version ".tar.gz")) + version ".tar.xz")) (sha256 (base32 - "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y")) - (patches (search-patches - "findutils-gnulib-libio.patch" - "findutils-localstatedir.patch" - "findutils-makedev.patch" - "findutils-test-xargs.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; The gnulib test-lock test is prone to writer starvation - ;; with our glibc@2.25, which prefers readers, so disable it. - ;; The gnulib commit b20e8afb0b2 should fix this once - ;; incorporated here. - (substitute* "tests/Makefile.in" - (("test-lock\\$\\(EXEEXT\\) ") "")) - #t)))) + "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5")) + (patches (search-patches "findutils-localstatedir.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list ;; Tell 'updatedb' to write to /var. - "--localstatedir=/var" - - ;; Work around cross-compilation failure. See - ;; . - ,@(if (%current-target-system) - '("gl_cv_func_wcwidth_works=yes") - '())))) + "--localstatedir=/var") + #:phases (modify-phases %standard-phases + (add-before 'check 'adjust-test-shebangs + (lambda _ + (substitute* '("tests/xargs/verbose-quote.sh" + "tests/find/exec-plus-last-file.sh") + (("#!/bin/sh") + (string-append "#!" (which "sh")))) + #t))))) (synopsis "Operating on files matching given criteria") (description "Findutils supplies the basic file directory searching utilities of the diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8bf7704598..90cd001ba2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1450,7 +1450,15 @@ exec " gcc "/bin/" program (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile - ,@(package-arguments findutils))))) + + ;; The build system assumes we have done a mistake when time_t is 32-bit + ;; on a 64-bit system. Ignore that for our bootstrap toolchain. + ,@(if (target-64bit?) + (substitute-keyword-arguments (package-arguments findutils) + ((#:configure-flags flags ''()) + `(cons "TIME_T_32_BIT_OK=yes" + ,flags))) + (package-arguments findutils)))))) (define file-boot0 (package diff --git a/gnu/packages/patches/findutils-gnulib-libio.patch b/gnu/packages/patches/findutils-gnulib-libio.patch deleted file mode 100644 index 79f9fd914d..0000000000 --- a/gnu/packages/patches/findutils-gnulib-libio.patch +++ /dev/null @@ -1,114 +0,0 @@ -Adjust to removal of libio interface in glibc 2.28. - -Based on this gnulib commit: -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e - -diff --git a/gl/lib/fflush.c b/gl/lib/fflush.c -index 5ae3e41..7a82470 100644 ---- a/gl/lib/fflush.c -+++ b/gl/lib/fflush.c -@@ -33,7 +33,7 @@ - #undef fflush - - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - -diff --git a/gl/lib/fpurge.c b/gl/lib/fpurge.c -index f313b22..ecdf82d 100644 ---- a/gl/lib/fpurge.c -+++ b/gl/lib/fpurge.c -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ -diff --git a/gl/lib/freadahead.c b/gl/lib/freadahead.c -index 094daab..3f8101e 100644 ---- a/gl/lib/freadahead.c -+++ b/gl/lib/freadahead.c -@@ -25,7 +25,7 @@ - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) -diff --git a/gl/lib/freading.c b/gl/lib/freading.c -index 0512b19..8c48fe4 100644 ---- a/gl/lib/freading.c -+++ b/gl/lib/freading.c -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); -diff --git a/gl/lib/fseeko.c b/gl/lib/fseeko.c -index 1c65d2a..9026408 100644 ---- a/gl/lib/fseeko.c -+++ b/gl/lib/fseeko.c -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -diff --git a/gl/lib/stdio-impl.h b/gl/lib/stdio-impl.h -index 502d891..ea38ee2 100644 ---- a/gl/lib/stdio-impl.h -+++ b/gl/lib/stdio-impl.h -@@ -18,6 +18,12 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - diff --git a/gnu/packages/patches/findutils-makedev.patch b/gnu/packages/patches/findutils-makedev.patch deleted file mode 100644 index 2f16c625d8..0000000000 --- a/gnu/packages/patches/findutils-makedev.patch +++ /dev/null @@ -1,22 +0,0 @@ -Include for "makedev". - -Taken from this gnulib commit: -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4da63c5881f60f71999a943612da9112232b9161 - -diff --git a/gl/lib/mountlist.c b/gl/lib/mountlist.c -index bb4e4ee21..cf4020e2a 100644 ---- a/gl/lib/mountlist.c -+++ b/gl/lib/mountlist.c -@@ -37,6 +37,12 @@ - # include - #endif - -+#if MAJOR_IN_MKDEV -+# include -+#elif MAJOR_IN_SYSMACROS -+# include -+#endif -+ - #if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ - # if HAVE_SYS_UCRED_H - # include /* needed on OSF V4.0 for definition of NGROUPS, diff --git a/gnu/packages/patches/findutils-test-xargs.patch b/gnu/packages/patches/findutils-test-xargs.patch deleted file mode 100644 index 10c7bed28d..0000000000 --- a/gnu/packages/patches/findutils-test-xargs.patch +++ /dev/null @@ -1,22 +0,0 @@ -This test relies on 'xargs' being available in $PATH, which is not -the case when we build the initial Findutils doing bootstrapping. -Reported at . - ---- findutils-4.6.0/find/testsuite/sv-34976-execdir-fd-leak.sh 2015-12-31 19:37:59.401526288 +0100 -+++ findutils-4.6.0/find/testsuite/sv-34976-execdir-fd-leak.sh 2015-12-31 19:38:36.061770693 +0100 -@@ -50,13 +50,14 @@ die() { - # Create test files, each 98 in the directories ".", "one" and "two". - make_test_data() { - d="$1" -+ xargs="`cd ../../xargs; pwd -P`/xargs" - ( - cd "$1" || exit 1 - mkdir one two || exit 1 - for i in ${three_to_hundred} ; do - printf "./%03d one/%03d two/%03d " $i $i $i - done \ -- | xargs touch || exit 1 -+ | "$xargs" touch || exit 1 - ) \ - || die "failed to set up the test in ${outdir}" - } -- cgit v1.2.3 From 3efc744f946d1756c1610169a4e7fc8698161aab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:08:59 +0100 Subject: gnu: libtasn1: Update to 4.15.0. * gnu/packages/tls.scm (libtasn1): Update to 4.15.0. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 7e1bf832ba..ee7c39baab 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -71,7 +71,7 @@ (define-public libtasn1 (package (name "libtasn1") - (version "4.14") + (version "4.15.0") (source (origin (method url-fetch) @@ -79,7 +79,7 @@ version ".tar.gz")) (sha256 (base32 - "025sqnlzji78ss2fi78dajc0v0h5fi02wp39hws41sn8qnjlnq4y")))) + "17kkh89zfnwszw657fj13y2gamzay33lsrfazgm4sc7mx2gm0xyx")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 355ab32eed66a011187a6444d18460f6814b2e27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:10:01 +0100 Subject: gnu: GnuTLS: Update to 3.6.11.1. * gnu/packages/tls.scm (gnutls): Update to 3.6.11.1. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ee7c39baab..0d764b63ee 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -163,7 +163,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.6.9") + (version "3.6.11.1") (source (origin (method url-fetch) (uri @@ -175,7 +175,7 @@ living in the same process.") (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "1jqz5s3lv8sa53348cfi9nr5pw5l55n8m40b8msdvv0pb2jzqca3")))) + "1y1wadpsrj5ai603xv5bgssl9v0pb1si2hg14zqdnmcsvgri5fpv")))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software. -- cgit v1.2.3 From 857d443494740a04a4c1a90f9be23d955f54a7a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:10:55 +0100 Subject: gnu: openldap: Update to 2.4.48. * gnu/packages/openldap.scm (openldap): Update to 2.4.48. --- gnu/packages/openldap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 8316a593e6..ec528787ca 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -59,7 +59,7 @@ (define-public openldap (package (name "openldap") - (version "2.4.47") + (version "2.4.48") (source (origin (method url-fetch) @@ -76,7 +76,7 @@ "openldap-release/openldap-" version ".tgz"))) (sha256 (base32 - "02sj0p1pq12hqq29b22m3f5zs2rykgvc0q3wlynxjcsjhrvmhk7m")))) + "0k87qra4kirb6xgja4q1jyw6piwb9v8b8g6gkxq4plawmgy3ylnr")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From a4de5cfd2f75f19d751a2f37d758b500bfd19a7e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:13:03 +0100 Subject: gnu: Remove cmake/fixed. * gnu/packages/cmake.scm (cmake/fixed): Remove variable. (cmake-minimal)[source](patches): Add "cmake-curl-certificates.patch". --- gnu/packages/cmake.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 5c9b9810c8..135863f6c2 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -75,7 +75,8 @@ "cmliblzma" ;; "cmlibuv" "cmzlib")) - #t))))) + #t))) + (patches (search-patches "cmake-curl-certificates.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -209,18 +210,6 @@ and workspaces that can be used in the compiler environment of your choice.") (outputs '("out" "doc")) (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) -(define-public cmake/fixed - ;; This is a variant of CMake that fixes X.509 certificate lookup: - ;; . - (package - (inherit cmake) - (version (string-append (package-version cmake) "-1")) - (source (origin - (inherit (package-source cmake)) - (patches - (append (search-patches "cmake-curl-certificates.patch") - (origin-patches (package-source cmake)))))))) - (define-public cmake-minimal-cross (package (inherit cmake-minimal) -- cgit v1.2.3 From 47c4c1fe236ee9318838492c95dabc65648eb0ed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:14:06 +0100 Subject: gnu: CMake: Update to 3.16.0. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.16.0. [arguments]: Adjust for renamed file. Disable test RunCMake.install. * gnu/packages/patches/cmake-curl-certificates.patch: Adjust context. --- gnu/packages/cmake.scm | 24 +++++----------------- gnu/packages/patches/cmake-curl-certificates.patch | 10 ++++----- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 135863f6c2..806a7396e9 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -51,7 +51,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.15.1") + (version "3.16.0") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -59,7 +59,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq")) + "0pwcgvk75577rdizpzjrk2n43a6l7rvfhmhn7sd6xarwqrb6b9bd")) (modules '((guix build utils))) (snippet '(begin @@ -101,6 +101,8 @@ (let ((skipped-tests (list "BundleUtilities" ; This test fails on Guix. "CTestTestSubdir" ; This test fails to build 2 of the 3 tests. + ;; This test requires 'ldconfig' which is not available in Guix. + "RunCMake.install" ;; These tests requires network access. "CTestCoverageCollectGCOV" "CTestTestUpload"))) @@ -125,7 +127,7 @@ ;; files. (substitute* '("Modules/CompilerId/Xcode-3.pbxproj.in" - "Modules/CPack.RuntimeScript.in" + "Modules/Internal/CPack/CPack.RuntimeScript.in" "Source/cmGlobalXCodeGenerator.cxx" "Source/cmLocalUnixMakefileGenerator3.cxx" "Source/cmExecProgramCommand.cxx" @@ -218,22 +220,6 @@ and workspaces that can be used in the compiler environment of your choice.") (search-paths (package-native-search-paths cmake-minimal)))) -(define-public cmake-3.15.5 - ;; CMake 3.15.5 fixes some issues, but declare another version to - ;; avoid triggering the rebuild of all CMake-based packages. - ;; See . - (package - (inherit cmake) - (version "3.15.5") - (source (origin - (inherit (package-source cmake)) - (uri (string-append "https://www.cmake.org/files/v" - (version-major+minor version) - "/cmake-" version ".tar.gz")) - (sha256 - (base32 - "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv")))))) - (define-public emacs-cmake-mode (package (inherit cmake) diff --git a/gnu/packages/patches/cmake-curl-certificates.patch b/gnu/packages/patches/cmake-curl-certificates.patch index 36252083f8..7fe2615271 100644 --- a/gnu/packages/patches/cmake-curl-certificates.patch +++ b/gnu/packages/patches/cmake-curl-certificates.patch @@ -6,19 +6,19 @@ as well as /etc/ssl/certs. --- cmake-3.13.1/Source/cmCurl.cxx 2019-09-10 17:27:36.926907260 +0200 +++ cmake-3.13.1/Source/cmCurl.cxx 2019-09-10 17:52:35.475903919 +0200 -@@ -4,11 +4,8 @@ - - #include "cmThirdParty.h" +@@ -2,11 +2,8 @@ + file Copyright.txt or https://cmake.org/licensing for details. */ + #include "cmCurl.h" -#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) && \ - !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH) # define CMAKE_FIND_CAFILE # include "cmSystemTools.h" -#endif + #include "cmStringAlgorithms.h" // curl versions before 7.21.5 did not provide this error code - #if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x071505 -@@ -29,6 +26,19 @@ std::string cmCurlSetCAInfo(::CURL* curl +@@ -30,6 +27,19 @@ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile); check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); } -- cgit v1.2.3 From 8b2c4eb5020eff458690f600351b56ed97465db1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:15:26 +0100 Subject: gnu: swig: Update to 4.0.1. * gnu/packages/patches/swig-guile-gc.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/swig.scm (swig): Update to 4.0.1. [source](patches): Remove. [arguments]: Remove 'set-env' phase. [inputs]: Change GUILE-2.0 to GUILE-2.2. --- gnu/local.mk | 1 - gnu/packages/patches/swig-guile-gc.patch | 76 -------------------------------- gnu/packages/swig.scm | 10 +---- 3 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 gnu/packages/patches/swig-guile-gc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0c0f5651a9..122e23f68a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1370,7 +1370,6 @@ dist_patch_DATA = \ %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ %D%/packages/patches/supertux-unbundle-squirrel.patch \ - %D%/packages/patches/swig-guile-gc.patch \ %D%/packages/patches/swish-e-search.patch \ %D%/packages/patches/swish-e-format-security.patch \ %D%/packages/patches/symmetrica-bruch.patch \ diff --git a/gnu/packages/patches/swig-guile-gc.patch b/gnu/packages/patches/swig-guile-gc.patch deleted file mode 100644 index 0e745a6247..0000000000 --- a/gnu/packages/patches/swig-guile-gc.patch +++ /dev/null @@ -1,76 +0,0 @@ -Fix garbage collection for Guile versions >= 2.0.12. This issue showed -up when running the tests on i686-linux. - -Taken from this upstream commit: -https://github.com/swig/swig/commit/38f2ab0c30e369e63bbd0a6152108488d0de68e1 - -diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg -index 274f197158..0d04cb7c62 100644 ---- a/Lib/guile/guile_scm_run.swg -+++ b/Lib/guile/guile_scm_run.swg -@@ -99,6 +99,7 @@ SWIG_Guile_scm2newstr(SCM str, size_t *len) { - static int swig_initialized = 0; - static scm_t_bits swig_tag = 0; - static scm_t_bits swig_collectable_tag = 0; -+static scm_t_bits swig_finalized_tag = 0; - static scm_t_bits swig_destroyed_tag = 0; - static scm_t_bits swig_member_function_tag = 0; - static SCM swig_make_func = SCM_EOL; -@@ -163,7 +164,19 @@ SWIG_Guile_PointerType(SCM object) - } - else scm_wrong_type_arg("SWIG-Guile-PointerType", 1, object); - } -- -+ -+SWIGINTERN int -+SWIG_Guile_IsValidSmob(SCM smob) -+{ -+ /* We do not accept smobs representing destroyed pointers, but we have to -+ allow finalized smobs because Guile >= 2.0.12 sets all smob instances -+ to the 'finalized' type before calling their 'free' function. This change -+ was introduced to Guile in commit 8dff3af087c6eaa83ae0d72aa8b22aef5c65d65d */ -+ return SCM_SMOB_PREDICATE(swig_tag, smob) -+ || SCM_SMOB_PREDICATE(swig_collectable_tag, smob) -+ || SCM_SMOB_PREDICATE(swig_finalized_tag, smob); -+} -+ - SWIGINTERN int - SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags) - { -@@ -179,8 +192,7 @@ SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags) - *result = SCM_POINTER_VALUE(s); - return SWIG_OK; - #endif /* if SCM_MAJOR_VERSION >= 2 */ -- } else if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { -- /* we do not accept smobs representing destroyed pointers */ -+ } else if (SWIG_Guile_IsValidSmob(smob)) { - from = (swig_type_info *) SCM_CELL_WORD_2(smob); - if (!from) return SWIG_ERROR; - if (type) { -@@ -239,7 +251,7 @@ SWIG_Guile_MarkPointerNoncollectable(SCM s) - { - SCM smob = SWIG_Guile_GetSmob(s); - if (!SCM_NULLP(smob)) { -- if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { -+ if (SWIG_Guile_IsValidSmob(smob)) { - SCM_SET_CELL_TYPE(smob, swig_tag); - } - else scm_wrong_type_arg(NULL, 0, s); -@@ -252,7 +264,7 @@ SWIG_Guile_MarkPointerDestroyed(SCM s) - { - SCM smob = SWIG_Guile_GetSmob(s); - if (!SCM_NULLP(smob)) { -- if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { -+ if (SWIG_Guile_IsValidSmob(smob)) { - SCM_SET_CELL_TYPE(smob, swig_destroyed_tag); - } - else scm_wrong_type_arg(NULL, 0, s); -@@ -419,6 +431,8 @@ SWIG_Guile_Init () - scm_set_smob_print(swig_collectable_tag, print_collectable_swig); - scm_set_smob_equalp(swig_collectable_tag, equalp_swig); - scm_set_smob_free(swig_collectable_tag, free_swig); -+ /* For Guile >= 2.0.12. See libguile/smob.c:clear_smobnum */ -+ swig_finalized_tag = swig_collectable_tag & ~0xff00; - } - if (ensure_smob_tag(swig_module, &swig_destroyed_tag, - "destroyed-swig-pointer", "destroyed-swig-pointer-tag")) { diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 655c1a19ab..df49428964 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -34,25 +34,19 @@ (define-public swig (package (name "swig") - (version "3.0.12") + (version "4.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.gz")) - (patches (search-patches "swig-guile-gc.patch")) (sha256 (base32 - "0kf99ygrjs5616gsqhz1l7bib3a12izmxi7g48bwblbymr3z9ybw")))) + "1ac7g0gd8ndwv3ybqn5vjgqxa7090bby4db164a7mn9ssp8b803s")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'set-env - ;; Required since Perl 5.26.0's removal of the current - ;; working directory from @INC. - ;; TODO Try removing this for later versions of SWIG. - (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t)) (add-before 'configure 'workaround-gcc-bug (lambda _ ;; XXX: Don't add the -isystem flag, or GCCs #include_next -- cgit v1.2.3 From 33c1c4c95fc8311606f1d513a06bc365607d4f6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:19:20 +0100 Subject: gnu: doxygen: Update to 1.8.16. * gnu/packages/documentation.scm (doxygen): Update to 1.8.16. [arguments]: Add phase 'remove-git-requirement'. * gnu/packages/patches/doxygen-test.patch: Adjust for upstream changes. --- gnu/packages/documentation.scm | 11 ++++++++-- gnu/packages/patches/doxygen-test.patch | 38 ++++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index eda8ca3368..c512a9803b 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -125,7 +125,7 @@ markup) can be customized and extended by the user.") (define-public doxygen (package (name "doxygen") - (version "1.8.15") + (version "1.8.16") (home-page "http://www.doxygen.nl/") (source (origin (method url-fetch) @@ -136,7 +136,7 @@ markup) can be customized and extended by the user.") ".src.tar.gz"))) (sha256 (base32 - "0p94b4yb6bk2dxzs5kyl82xxgq2qakgbx5yy3ssbbadncb20x75x")) + "10iwv8bcz5b5cd85gg8pgn0bmyg04n9hs36xn7ggjjnvynv1z67z")) (patches (search-patches "doxygen-test.patch")))) (build-system cmake-build-system) (native-inputs @@ -157,6 +157,13 @@ markup) can be customized and extended by the user.") '()) #:test-target "tests" #:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-git-requirement + (lambda _ + ;; TODO: Remove this for > 1.8.16. + (substitute* "cmake/git_watcher.cmake" + (("Git QUIET REQUIRED") + "Git QUIET")) + #t)) (add-before 'configure 'patch-sh (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/portable.cpp" diff --git a/gnu/packages/patches/doxygen-test.patch b/gnu/packages/patches/doxygen-test.patch index 8ccb9ec3c4..a2da54a3fa 100644 --- a/gnu/packages/patches/doxygen-test.patch +++ b/gnu/packages/patches/doxygen-test.patch @@ -5,19 +5,40 @@ test. diff -u -r doxygen-1.8.7.orig/testing/012/citelist.xml doxygen-1.8.7/testing/012/citelist.xml --- doxygen-1.8.7.orig/testing/012/citelist.xml 2014-04-24 23:43:34.000000000 +0200 +++ doxygen-1.8.7/testing/012/citelist.xml 2014-04-24 23:49:43.000000000 +0200 -@@ -6,17 +6,6 @@ +@@ -6,38 +6,6 @@ - - - -- [1] +- [1] +- +- +- P.Belotti. Disjunctive cuts for non-convex MINLP. In Lee and Leyffer [4], pages 117144. +- +- +- +- [2] +- +- +- T.Berthold, S.Heinz, and S.Vigerske. Extending a CIP framework to solve MIQCPs. In Lee and Leyffer [4], pages 427444. +- +- +- +- [3] - - - DonaldE. Knuth. Tex and Metafont, New Directions in Typesetting. American Mathematical Society and Digital Press, Stanford, 1979. - - +- +- [4] +- +- +- Jon Lee and Sven Leyffer, editors. Mixed Integer Nonlinear Programming, volume 154 of The IMA Volumes in Mathematics and its Applications. Springer, 2012. +- +- - - @@ -26,13 +47,14 @@ diff -u -r doxygen-1.8.7.orig/testing/012/citelist.xml doxygen-1.8.7/testing/012 diff -u -r doxygen-1.8.7.orig/testing/012/indexpage.xml doxygen-1.8.7/testing/012/indexpage.xml --- doxygen-1.8.7.orig/testing/012/indexpage.xml 2014-04-24 23:43:34.000000000 +0200 +++ doxygen-1.8.7/testing/012/indexpage.xml 2014-04-24 23:44:05.000000000 +0200 -@@ -4,7 +4,7 @@ - index - My Project +@@ -6,8 +6,8 @@ + + -- See [1] for more info. -+ See knuth79 for more info. +- See [3] for more info. +- Oter references with crosreference see [1] and [2] for more info. ++ See knuth79 for more info. ++ Oter references with crosreference see Be09 and BertholdHeinzVigerske2009 for more info. - -- cgit v1.2.3 From 63a572cbd390ff015646eaa669ec6687f5eef9f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:20:32 +0100 Subject: gnu: meson: Update to 0.52.1. * gnu/packages/build-tools.scm (meson): Update to 0.52.1. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index a82b867282..4e65978d99 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -168,7 +168,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.50.1") + (version "0.52.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -176,7 +176,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "1k2fw5qk4mqjcb4j5dhp8xfn0caqphb11yh8zkw7v9w01kb5d3zn")))) + "0df0iw94cx6jiqd0liw8ax1by3dqaw6fdqrxgr9sal4rwir789qc")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From 600037b3752f1c8f0da38a89c1c3561f23d7ce27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:21:36 +0100 Subject: gnu: libspiro: Update to 20190731. * gnu/packages/fontutils.scm (libspiro): Update to 20190731. [source](uri): Adjust file name. --- gnu/packages/fontutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 7a88ad9a12..2254b3509a 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -525,15 +525,15 @@ using the above tables.") (define-public libspiro (package (name "libspiro") - (version "0.5.20150702") + (version "20190731") (source (origin (method url-fetch) (uri (string-append "https://github.com/fontforge/libspiro/releases" - "/download/" version "/libspiro-dist-" version ".tar.gz")) + "/download/" version "/libspiro-" version ".tar.gz")) (sha256 (base32 - "153ckwj6h3wwlsgcppzqj8cymv1927hi8ar8fzpchq5q89cj2kai")))) + "0m63x97b7aciviijprvy85gm03p2jsgslxn323zl9zn7qz6d3ir4")))) (build-system gnu-build-system) (synopsis "Clothoid to bezier conversion library") (description -- cgit v1.2.3 From 066398768de6d0ed833970832bc5e5f88677416e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:22:12 +0100 Subject: gnu: libspiro: Do not build static libraries. * gnu/packages/fontutils.scm (libspiro)[arguments]: New field. --- gnu/packages/fontutils.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 2254b3509a..97d4cae872 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -535,6 +535,8 @@ using the above tables.") (base32 "0m63x97b7aciviijprvy85gm03p2jsgslxn323zl9zn7qz6d3ir4")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (synopsis "Clothoid to bezier conversion library") (description "Raph Levien's Spiro package as a library. A mechanism for drawing -- cgit v1.2.3 From badcb119c57fe1a6fc617d2f4a237c1192305584 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 2 Dec 2019 22:42:44 +0100 Subject: gnu: libxslt: Update to 1.1.34. * gnu/packages/xml.scm (libxslt): Update to 1.1.34. [arguments]: Add phase to disable fuzz tests. * gnu/packages/patches/libxslt-generated-ids.patch: Adjust for upstream changes. --- gnu/packages/patches/libxslt-generated-ids.patch | 6 +++--- gnu/packages/xml.scm | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/packages/patches/libxslt-generated-ids.patch b/gnu/packages/patches/libxslt-generated-ids.patch index 4273875c7c..1cd2363d6a 100644 --- a/gnu/packages/patches/libxslt-generated-ids.patch +++ b/gnu/packages/patches/libxslt-generated-ids.patch @@ -162,10 +162,10 @@ diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h index 95e8fe6..8eedae4 100644 --- a/libxslt/xsltInternals.h +++ b/libxslt/xsltInternals.h -@@ -1786,6 +1786,8 @@ struct _xsltTransformContext { - int funcLevel; /* Needed to catch recursive functions issues */ - int maxTemplateDepth; +@@ -1782,6 +1782,8 @@ struct _xsltTransformContext { int maxTemplateVars; + unsigned long opLimit; + unsigned long opCount; + + unsigned long nextid;/* for generating stable ids */ }; diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d1376a5bee..84066ff5d1 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -212,16 +212,26 @@ project (but it is usable outside of the Gnome platform).") (define-public libxslt (package (name "libxslt") - (version "1.1.33") + (version "1.1.34") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxslt/libxslt-" version ".tar.gz")) (sha256 (base32 - "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf")) + "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq")) (patches (search-patches "libxslt-generated-ids.patch")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'disable-fuzz-tests + (lambda _ + ;; Disable libFuzzer tests, because they require + ;; instrumentation builds of libxml2 and libxslt. + (substitute* "tests/Makefile" + (("exslt plugins fuzz") + "exslt plugins")) + #t))))) (home-page "http://xmlsoft.org/XSLT/index.html") (synopsis "C library for applying XSLT stylesheets to XML documents") (inputs `(("libgcrypt" ,libgcrypt) -- cgit v1.2.3 From 7a039449aa0e9d523df5e69d84c0ea257ef911dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:50:20 +0100 Subject: gnu: python-fonttools: Update to 4.2.0. * gnu/packages/python-xyz.scm (python-fonttools): Update to 4.2.0. (python2-fonttools): Stay on 3.38.0. --- gnu/packages/python-xyz.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9dd97a61bd..01bb565027 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6803,13 +6803,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.38.0") + (version "4.2.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "12ripk3s7skgxr1bs9r8n13r94ym3s8iir7ivfixls9fa4dabmlh")))) + "0psy6z52jn49wp93s3k7kj0jzji1cad3wnwgm6c26vphv5appk4v")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) @@ -6825,8 +6825,18 @@ also contains a tool called “TTX” which converts TrueType/OpenType fonts to from an XML-based format.") (license license:expat))) +;; Fonttools 4.x dropped support for Python 2, so stick with 3.x here. (define-public python2-fonttools - (package-with-python2 python-fonttools)) + (let ((base (package-with-python2 (strip-python2-variant python-fonttools)))) + (package/inherit + base + (version "3.38.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "fonttools" version ".zip")) + (sha256 + (base32 + "12ripk3s7skgxr1bs9r8n13r94ym3s8iir7ivfixls9fa4dabmlh"))))))) (define-public python-ly (package -- cgit v1.2.3 From 8057faf0943f605a071ea133f7660eccab6bff6a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:51:20 +0100 Subject: gnu: python2-fonttools: Update to 3.44.0. * gnu/packages/python-xyz.scm (python2-fonttools): Update to 3.44.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 01bb565027..a735aceff5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6830,13 +6830,13 @@ from an XML-based format.") (let ((base (package-with-python2 (strip-python2-variant python-fonttools)))) (package/inherit base - (version "3.38.0") + (version "3.44.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "12ripk3s7skgxr1bs9r8n13r94ym3s8iir7ivfixls9fa4dabmlh"))))))) + "0v6399g755f2hn1ry62i5b6gdinf2fpx2966v3bxh6bjw1accb5p"))))))) (define-public python-ly (package -- cgit v1.2.3 From c10247506a12882a55490dc69b1f5d3be49f5129 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:52:58 +0100 Subject: gnu: harfbuzz: Update to 2.6.4. * gnu/packages/gtk.scm (harfbuzz): Update to 2.6.4. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 777601ed97..80a7e399b8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -181,7 +181,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.5.3") + (version "2.6.4") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -189,7 +189,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.xz")) (sha256 (base32 - "0p45xk5bblsw8lfs7y7z80b4rvda9f2hlpr28flkrfmpjz3hvl7y")))) + "04iwq13w6zkdhljmsxrzgg4fyh04qnwfn57rgrl9kmijc7cvh4wl")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From c9bba9928aec988b0eaf505ae12042c1200811e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 13:49:29 +0100 Subject: gnu: libxml2: Update to 2.9.10. * gnu/packages/xml.scm (libxml2): Update to 2.9.10. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 84066ff5d1..cc21d315eb 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -117,14 +117,14 @@ hierarchical form with variable field lengths.") (define-public libxml2 (package (name "libxml2") - (version "2.9.9") + (version "2.9.10") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-" version ".tar.gz")) (sha256 (base32 - "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl")))) + "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma")))) (build-system gnu-build-system) (outputs '("out" "static")) (arguments -- cgit v1.2.3 From 326dc630941ca70c74b4e6e2b1a01f0d046890c2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 14:56:29 +0100 Subject: gexp: Unconditionally include (system base target) in 'compiled-modules'. * guix/gexp.scm (compiled-modules): Remove conditional. --- guix/gexp.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index a96592ac76..ffe4fc95c7 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1386,14 +1386,9 @@ TARGET, a GNU triplet." (ice-9 format) (srfi srfi-1) (srfi srfi-26) + (system base target) (system base compile)) - ;; TODO: Inline this on the next rebuild cycle. - (ungexp-splicing - (if target - (gexp ((use-modules (system base target)))) - (gexp ()))) - (define (regular? file) (not (member file '("." "..")))) -- cgit v1.2.3 From a0947e0d0765b1009637fc03d7abfd4bca627358 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:24:53 +0100 Subject: gnu: libxinerama: Do not build static libraries. * gnu/packages/xorg.scm (libxinerama)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 81e1512054..8b7aa12f9c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4588,6 +4588,8 @@ cannot be adequately worked around on the client side of the wire.") (base32 "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs -- cgit v1.2.3 From 0e48722212e37872e5a8211811fe7381b57a235e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:25:47 +0100 Subject: gnu: libxi: Do not build static libraries. * gnu/packages/xorg.scm (libxi)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8b7aa12f9c..e1e156fd7d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4955,6 +4955,8 @@ new API's in libXft, or the legacy API's in libX11.") (base32 "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("xorgproto" ,xorgproto) ("libx11" ,libx11) -- cgit v1.2.3 From bca176c26c843ba23d5288395345e38cf28e62e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:44:30 +0100 Subject: gnu: libdmx: Do not build static libraries. * gnu/packages/xorg.scm (libdmx)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e1e156fd7d..c01cbb2814 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1040,6 +1040,8 @@ of new capabilities and controls for text keyboards.") (base32 "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("xorgproto" ,xorgproto) ("libxext" ,libxext) -- cgit v1.2.3 From 1b4e191447d841cc90eececb02097a624e0b4d80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:45:00 +0100 Subject: gnu: libxshmfence: Do not build static libraries. * gnu/packages/xorg.scm (libxshmfence)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c01cbb2814..0fc36a4c52 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1068,6 +1068,8 @@ of new capabilities and controls for text keyboards.") (base32 "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("xorgproto" ,xorgproto))) (home-page "https://www.x.org/") -- cgit v1.2.3 From cefa4fe7a395a51096b49107a2e13872c011e05e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:45:32 +0100 Subject: gnu: libfontenc: Do not build static libraries. * gnu/packages/xorg.scm (libfontenc)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0fc36a4c52..5d3190c578 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1097,6 +1097,8 @@ synchronization between the X server and direct-rendering clients.") (base32 "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("zlib" ,zlib) ("xorgproto" ,xorgproto))) -- cgit v1.2.3 From 49a6fca11e58a3cc58c9dfe4ef6622fc78162cd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:45:54 +0100 Subject: gnu: libxcomposite: Do not build static libraries. * gnu/packages/xorg.scm (libxcomposite)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5d3190c578..d8930d4ce7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1285,6 +1285,8 @@ with the Cygwin XWin server when running X11 in a rootless mode.") (base32 "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs ;; xcomposite.pc refers to all these. `(("xorgproto" ,xorgproto) -- cgit v1.2.3 From dce53e6bd2f844a5efdf5c67aa4f1726585c3752 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:46:14 +0100 Subject: gnu: libxdmcp: Do not build static libraries. * gnu/packages/xorg.scm (libxdmcp)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d8930d4ce7..b692429a61 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1316,6 +1316,8 @@ with the Cygwin XWin server when running X11 in a rootless mode.") (base32 "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("libbsd" ,libbsd) ("xorgproto" ,xorgproto))) -- cgit v1.2.3 From 9fcc987d20e6b65f5351e265c029d7a996d24787 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:46:36 +0100 Subject: gnu: libxft: Do not build static libraries. * gnu/packages/xorg.scm (libxft)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b692429a61..06b2c7cb52 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1344,6 +1344,8 @@ with the Cygwin XWin server when running X11 in a rootless mode.") (base32 "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs ;; xft.pc refers to all these. `(("libxrender" ,libxrender) -- cgit v1.2.3 From c4fc9b13e9f3d6262e09b4f5fc34957dd6de34a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:47:00 +0100 Subject: gnu: libxkbfile: Do not build static libraries. * gnu/packages/xorg.scm (libxkbfile)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 06b2c7cb52..3a658bdbfb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1380,6 +1380,8 @@ configuration files.") (base32 "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("libx11" ,libx11))) (native-inputs -- cgit v1.2.3 From b2f626dab75a6184dbeef24031ea3315daf80ff0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:47:25 +0100 Subject: gnu: libxmu: Do not build static libraries. * gnu/packages/xorg.scm (libxmu)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3a658bdbfb..efeafbd074 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1407,6 +1407,8 @@ configuration files.") (base32 "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("libxt" ,libxt) ("xorgproto" ,xorgproto) -- cgit v1.2.3 From 7f5fa7d079699afc01ead9460b2b2392f0a12af1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:47:44 +0100 Subject: gnu: libxpm: Do not build static libraries. * gnu/packages/xorg.scm (libxpm)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index efeafbd074..aa2dee6d25 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1441,6 +1441,8 @@ treat it as part of their software base when porting.") (base32 "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("gettext" ,gettext-minimal) ("libxt" ,libxt) -- cgit v1.2.3 From 795bd8487f79921e8470cd57ab52b09bb157a3fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:48:10 +0100 Subject: gnu: libxres: Do not build static libraries. * gnu/packages/xorg.scm (libxres)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index aa2dee6d25..e169d880ea 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1471,6 +1471,8 @@ treat it as part of their software base when porting.") (base32 "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("xorgproto" ,xorgproto) ("libxext" ,libxext) -- cgit v1.2.3 From c14571a711b9c813808d6b70c47fc77cd650c78d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:48:36 +0100 Subject: gnu: libxscrnsaver: Do not build static libraries. * gnu/packages/xorg.scm (libxscrnsaver)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e169d880ea..69c9603a12 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1500,6 +1500,8 @@ treat it as part of their software base when porting.") (base32 "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("libxext" ,libxext) ("libx11" ,libx11))) -- cgit v1.2.3 From 56db9f6c605005c07c1861295cfedc6f2e6d0b57 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:49:02 +0100 Subject: gnu: libxxf86dga: Do not build static libraries. * gnu/packages/xorg.scm (libxxf86dga)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 69c9603a12..edc5716270 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1527,6 +1527,8 @@ treat it as part of their software base when porting.") (sha256 (base32 "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs -- cgit v1.2.3 From 101be25e7de2e291b0fcca3359713de0b6c7e4de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:49:29 +0100 Subject: gnu: libxext: Do not build static libraries. * gnu/packages/xorg.scm (libxext)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/xorg.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index edc5716270..d0524c7182 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4576,13 +4576,13 @@ cannot be adequately worked around on the client side of the wire.") (base32 "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar")))) (build-system gnu-build-system) - ;; Disable zero malloc check that fails when cross-compiling. (arguments `(#:configure-flags - (list - ,@(if (%current-target-system) - '("--disable-malloc0returnsnull") - '())))) + (list "--disable-static" + ;; Disable zero malloc check that fails when cross-compiling. + ,@(if (%current-target-system) + '("--disable-malloc0returnsnull") + '())))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs -- cgit v1.2.3 From 2f9b757677fa919f801319f5aa0da5c24fb70cbf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:50:16 +0100 Subject: gnu: libxrender: Do not build static libraries. * gnu/packages/xorg.scm (libxrender)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/xorg.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d0524c7182..a88e4460cd 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4670,13 +4670,13 @@ cannot be adequately worked around on the client side of the wire.") (base32 "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0")))) (build-system gnu-build-system) - ;; Disable zero malloc check that fails when cross-compiling. (arguments `(#:configure-flags - (list - ,@(if (%current-target-system) - '("--disable-malloc0returnsnull") - '())))) + (list "--disable-static" + ;; Disable zero malloc check that fails when cross-compiling. + ,@(if (%current-target-system) + '("--disable-malloc0returnsnull") + '())))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs -- cgit v1.2.3 From 2d4d56fc690f431bb9ed0bf41fde5c00f7283963 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:50:48 +0100 Subject: gnu: libxtst: Do not build static libraries. * gnu/packages/xorg.scm (libxtst)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a88e4460cd..89d5f8d61a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4703,6 +4703,8 @@ cannot be adequately worked around on the client side of the wire.") (base32 "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libxi" ,libxi) ("xorgproto" ,xorgproto))) -- cgit v1.2.3 From 6e6c9f39e4efe9c5cedc99696a9ede95ab1115d9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:51:17 +0100 Subject: gnu: libxv: Do not build static libraries. * gnu/packages/xorg.scm (libxv)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 89d5f8d61a..3922e12922 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4742,6 +4742,8 @@ protocol and arbitrary X extension protocol.") (base32 "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs -- cgit v1.2.3 From f6f51ab2389b6e9c44a1613ab126bb1baecda16c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:51:44 +0100 Subject: gnu: libice: Do not build static libraries. * gnu/packages/xorg.scm (libice)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3922e12922..50f82ed7da 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4856,6 +4856,8 @@ common definitions and porting layer.") (base32 "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs -- cgit v1.2.3 From 8e6b3856bbf397d75e2c64d1e35a7e31964288fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:52:05 +0100 Subject: gnu: libxau: Do not build static libraries. * gnu/packages/xorg.scm (libxau)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 50f82ed7da..23024816eb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4886,6 +4886,8 @@ common definitions and porting layer.") (base32 "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("xorgproto" ,xorgproto))) (native-inputs -- cgit v1.2.3 From e36506a4fe9a48c71a5c952b21abe36387cf022e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:52:26 +0100 Subject: gnu: libxfixes: Do not build static libraries. * gnu/packages/xorg.scm (libxfixes)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 23024816eb..fdb96c99c9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4914,6 +4914,8 @@ an X Window System display.") (base32 "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs -- cgit v1.2.3 From 41d9a0927e3aed78d4120b7603e6369665484800 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:52:50 +0100 Subject: gnu: libxfont: Do not build static libraries. * gnu/packages/xorg.scm (libxfont)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fdb96c99c9..ea07b47486 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4942,6 +4942,8 @@ an X Window System display.") (base32 "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("freetype" ,freetype) ("libfontenc" ,libfontenc) -- cgit v1.2.3 From 7711aa4024f7b52b53146851b3298882f4957f08 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:53:11 +0100 Subject: gnu: libxrandr: Do not build static libraries. * gnu/packages/xorg.scm (libxrandr)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ea07b47486..17b11c1473 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5020,6 +5020,8 @@ new API's in libXft, or the legacy API's in libX11.") (base32 "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs ;; In accordance with xrandr.pc. `(("libx11" ,libx11) -- cgit v1.2.3 From 97d323b4b7027dde14e451456ad01b35a2542f00 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:53:34 +0100 Subject: gnu: libxvmc: Do not build static libraries. * gnu/packages/xorg.scm (libxvmc)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 17b11c1473..41c3c20c4e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5051,6 +5051,8 @@ new API's in libXft, or the legacy API's in libX11.") (base32 "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libxv" ,libxv))) (inputs -- cgit v1.2.3 From 763f805d0457be883e1315e89a88bacac1b41e0e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:53:57 +0100 Subject: gnu: libxxf86vm: Do not build static libraries. * gnu/packages/xorg.scm (libxxf86vm)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 41c3c20c4e..b0295c899f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5081,6 +5081,8 @@ new API's in libXft, or the legacy API's in libX11.") (base32 "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libxext" ,libxext) ("xorgproto" ,xorgproto))) -- cgit v1.2.3 From 5498fcc438f92f86e1a597708e2d6a7c3d156a16 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:54:23 +0100 Subject: gnu: libxcb: Do not build static libraries. * gnu/packages/xorg.scm (libxcb)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/xorg.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b0295c899f..83732afbb6 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5124,7 +5124,8 @@ protocol.") `(("pkg-config" ,pkg-config) ("python" ,python-minimal-wrapper))) (arguments - `(#:configure-flags '("--enable-xkb"))) + `(#:configure-flags '("--enable-xkb" + "--disable-static"))) (home-page "https://xcb.freedesktop.org/") (synopsis "The X C Binding (XCB) library") (description -- cgit v1.2.3 From 526ca00af6577a11da068c810b11890c7d8d384d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:54:49 +0100 Subject: gnu: libx11: Do not build static libraries. * gnu/packages/xorg.scm (libx11)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 83732afbb6..d531363d18 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5333,6 +5333,8 @@ draggable titlebars and borders.") (list (string-append "--mandir=" (assoc-ref %outputs "doc") "/share/man") + "--disable-static" + ;; Disable zero malloc check that fails when cross-compiling. ,@(if (%current-target-system) '("--disable-malloc0returnsnull") -- cgit v1.2.3 From f1f88fc950b4324fff4ece9990f371cc565683a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:55:17 +0100 Subject: gnu: libxcursor: Do not build static libraries. * gnu/packages/xorg.scm (libxcursor)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d531363d18..8507b0e523 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5369,6 +5369,8 @@ draggable titlebars and borders.") (base32 "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libx11" ,libx11) ("libxrender" ,libxrender) -- cgit v1.2.3 From 71a25873f2021822575211ae4ca330c5ff840d1d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:55:40 +0100 Subject: gnu: libxt: Do not build static libraries. * gnu/packages/xorg.scm (libxt)[arguments]: New field. --- gnu/packages/xorg.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8507b0e523..be62a07071 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5413,7 +5413,8 @@ draggable titlebars and borders.") (arguments '(#:configure-flags (list (string-append "--mandir=" (assoc-ref %outputs "doc") - "/share/man")))) + "/share/man") + "--disable-static"))) (propagated-inputs `(("libx11" ,libx11) ("libice" ,libice) -- cgit v1.2.3 From 9a81d1492fe4124f8458020d5f7888b2a675a770 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:55:59 +0100 Subject: gnu: libxaw: Do not build static libraries. * gnu/packages/xorg.scm (libxaw)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index be62a07071..8158a7b0bb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5444,6 +5444,8 @@ draggable titlebars and borders.") (base32 "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libxext" ,libxext) ("libxmu" ,libxmu) -- cgit v1.2.3 From 4965ca7783cbfbe5018f61cd90f922b716b698f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:56:24 +0100 Subject: gnu: xcb-util: Do not build static libraries. * gnu/packages/xorg.scm (xcb-util)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8158a7b0bb..e764b9178d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5505,6 +5505,8 @@ keyboard focus, and user-specified key and pointer button bindings.") (base32 "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libxcb" ,libxcb))) (native-inputs -- cgit v1.2.3 From 5bf6d5597462118f2f369df48e1ad14dbf0f17a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:56:44 +0100 Subject: gnu: xcb-util-cursor: Do not build static libraries. * gnu/packages/xorg.scm (xcb-util-cursor)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e764b9178d..11497be08b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5543,6 +5543,8 @@ The XCB util module provides the following libraries: (base32 "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (native-inputs `(("m4" ,m4) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 790eea5e4240ad2601ae265652098d76ca3c1605 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:57:08 +0100 Subject: gnu: xcb-util-image: Do not build static libraries. * gnu/packages/xorg.scm (xcb-util-image)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 11497be08b..17b32cb33a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5627,6 +5627,8 @@ numbers.") (base32 "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libxcb" ,libxcb))) (inputs -- cgit v1.2.3 From 95c2ec0bb99ae9c219852e46ab332c7041bb8a40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:57:30 +0100 Subject: gnu: xcb-util-keysyms: Do not build static libraries. * gnu/packages/xorg.scm (xcb-util-keysyms)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 17b32cb33a..5889c7343f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5663,6 +5663,8 @@ The XCB util-image module provides the following library: (base32 "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libxcb" ,libxcb))) (native-inputs -- cgit v1.2.3 From dea60654eda221c0281faffc7548300482bd6747 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:57:53 +0100 Subject: gnu: xcb-util-renderutil: Do not build static libraries. * gnu/packages/xorg.scm (xcb-util-renderutil)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5889c7343f..5adb265b29 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5697,6 +5697,8 @@ The XCB util-keysyms module provides the following library: (base32 "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libxcb" ,libxcb))) (native-inputs -- cgit v1.2.3 From f45a826f7295a1b8c48e3151918fb7c1c368e348 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 04:58:19 +0100 Subject: gnu: xcb-util-wm: Do not build static libraries. * gnu/packages/xorg.scm (xcb-util-wm)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5adb265b29..1843283211 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5731,6 +5731,8 @@ The XCB util-renderutil module provides the following library: (base32 "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libxcb" ,libxcb))) (native-inputs -- cgit v1.2.3 From 92ab0841c09607c2e15f6b7ea0f3c2e679abd996 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 05:12:13 +0100 Subject: gnu: pixman: Do not build static libraries. * gnu/packages/xdisorg.scm (pixman)[arguments]: New field. --- gnu/packages/xdisorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b1759eabb2..f5a55e1289 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -406,6 +406,8 @@ following the mouse.") "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns")) (patches (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("libpng" ,libpng) ("zlib" ,zlib))) -- cgit v1.2.3 From defcbeae46366f7e5d98ef0f5d6185a571cd6405 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 05:15:08 +0100 Subject: gnu: gdbm: Do not build static libraries. * gnu/packages/dbm.scm (gdbm)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/dbm.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index 84c5817a79..ea812c9715 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -138,7 +138,8 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") (sha256 (base32 "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6")))) - (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) + (arguments `(#:configure-flags '("--enable-libgdbm-compat" + "--disable-static"))) (build-system gnu-build-system) (home-page "http://www.gnu.org.ua/software/gdbm") (synopsis -- cgit v1.2.3 From a114b262d5c5b0e93791a4f4f19ec4459990d40b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 05:18:03 +0100 Subject: gnu: cairo: Do not build static libraries. * gnu/packages/gtk.scm (cairo)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/gtk.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 80a7e399b8..ea2b087724 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -145,7 +145,8 @@ tools have full access to view and control running applications.") ("python" ,python-wrapper))) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html - #:configure-flags '("--enable-tee"))) ; needed for GNU Icecat + #:configure-flags '("--enable-tee" ;needed for GNU Icecat + "--disable-static"))) (synopsis "2D graphics library") (description "Cairo is a 2D graphics library with support for multiple output devices. -- cgit v1.2.3 From 9092e3e936c747932140e7a5389219ee8c4580f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 05:20:32 +0100 Subject: gnu: dbus: Do not build static libraries. * gnu/packages/glib.scm (dbus)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/glib.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ce646febd0..eb37b9e824 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -105,6 +105,9 @@ ;; Install the session bus socket under /tmp. "--with-session-socket-dir=/tmp" + ;; Build shared libraries only. + "--disable-static" + ;; Use /etc/dbus-1 for system-wide config. ;; Look for configuration file under ;; /etc/dbus-1. This is notably required by -- cgit v1.2.3 From 785fcb62fecde1c275fd5bd5da488ef345f456d9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 23:33:09 +0100 Subject: gnu: Remove python-libxml2 workaround. * gnu/packages/xml.scm (python-libxml2)[source]: New field. (python-libxml2/fixed): Remove variable. * gnu/packages/glib.scm (itstool/fixed): Remove variable. * gnu/packages/gnome.scm (gnumeric)[native-inputs]: Replace ITSTOOL/FIXED with ITSTOOL. (yelp-tools/fixed): Remove variable. * gnu/packages/mate.scm (mate-applets, mate-utils)[native-inputs]: Replace YELP-TOOLS/FIXED with YELP-TOOLS. --- gnu/packages/glib.scm | 10 ---------- gnu/packages/gnome.scm | 13 +------------ gnu/packages/mate.scm | 4 ++-- gnu/packages/xml.scm | 17 ++++------------- 4 files changed, 7 insertions(+), 37 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index eb37b9e824..ff5206e7fd 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -540,16 +540,6 @@ information in their documents, such as whether a particular element should be translated.") (license license:gpl3+))) -(define-public itstool/fixed - ;; This variant fixes a python-libxml2 crash when processing UTF-8 - ;; sequences: . Since the issue is quite rare, - ;; create this variant here to avoid a full rebuild. - (package/inherit - itstool - (inputs - `(("python-libxml2" ,python-libxml2/fixed) - ,@(alist-delete "python-libxml2" (package-inputs itstool)))))) - (define dbus-glib (package (name "dbus-glib") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cddfd75cc0..108004434c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2388,7 +2388,7 @@ Hints specification (EWMH).") `(("bison" ,bison) ("docbook-xml" ,docbook-xml) ("intltool" ,intltool) - ("itstool" ,itstool/fixed) ;see + ("itstool" ,itstool) ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (home-page "http://www.gnumeric.org") @@ -4893,17 +4893,6 @@ lifting is done by packages like yelp-xsl and itstool. This package just wraps things up in a developer-friendly way.") (license license:gpl2+))) -(define-public yelp-tools/fixed - ;; This variant fixes a python-libxml2 crash when processing UTF-8 - ;; sequences: . TODO: Remove this in - ;; the next rebuild cycle. - (hidden-package - (package/inherit - yelp-tools - (propagated-inputs - `(("itstool" ,itstool/fixed) - ,@(alist-delete "itstool" (package-propagated-inputs yelp-tools))))))) - (define-public libgee (package (name "libgee") diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index d55d1b4461..ba90ccec73 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -565,7 +565,7 @@ assorted menu related utility programs.") `(("pkg-config" ,pkg-config) ("intltool" ,intltool) ("libxslt" ,libxslt) - ("yelp-tools" ,yelp-tools/fixed) + ("yelp-tools" ,yelp-tools) ("scrollkeeper" ,scrollkeeper) ("gettext" ,gettext-minimal) ("docbook-xml" ,docbook-xml) @@ -1279,7 +1279,7 @@ can be used as backgrounds in the MATE Desktop environment.") ("pkg-config" ,pkg-config) ("scrollkeeper" ,scrollkeeper) ("xorgproto" ,xorgproto) - ("yelp-tools" ,yelp-tools/fixed))) + ("yelp-tools" ,yelp-tools))) (inputs `(("atk" ,atk) ("cairo" ,cairo) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index cc21d315eb..6d1aa6f76c 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -166,9 +166,12 @@ project (but it is usable outside of the Gnome platform).") (license license:x11))) (define-public python-libxml2 - ;; TODO: Merge with 'python-libxml2/fixed' on the next rebuild cycle. (package/inherit libxml2 (name "python-libxml2") + (source (origin + (inherit (package-source libxml2)) + (patches (cons (search-patch "python-libxml2-utf8.patch") + (origin-patches (package-source libxml2)))))) (build-system python-build-system) (outputs '("out")) (arguments @@ -194,18 +197,6 @@ project (but it is usable outside of the Gnome platform).") (inputs `(("libxml2" ,libxml2))) (synopsis "Python bindings for the libxml2 library"))) -(define-public python-libxml2/fixed - ;; This variant fixes a crash when processing UTF-8 sequences: - ;; - ;; TODO: Merge with 'python-libxml2' on the next rebuild cycle. - (package/inherit - python-libxml2 - (version (string-append (package-version python-libxml2) "-1")) - (source (origin - (inherit (package-source libxml2)) - (patches (cons (search-patch "python-libxml2-utf8.patch") - (origin-patches (package-source libxml2)))))))) - (define-public python2-libxml2 (package-with-python2 python-libxml2)) -- cgit v1.2.3 From 6d8a29aaeb4e49922d2788446575c4e86e29f5f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 23:33:42 +0100 Subject: gnu: libx11: Update to 1.6.9. * gnu/packages/xorg.scm (libx11): Update to 1.6.9. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 1843283211..cbf40459b9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5314,7 +5314,7 @@ draggable titlebars and borders.") (define-public libx11 (package (name "libx11") - (version "1.6.8") + (version "1.6.9") (source (origin (method url-fetch) @@ -5324,7 +5324,7 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj")))) + "1ldyn9c6pyx54sxzaw120n3q42rqi7b503aqmyjky6fn038fiiww")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML -- cgit v1.2.3 From 223f907cd509f09a0bd6f0116499a8461c05860f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 23:34:12 +0100 Subject: gnu: xorgproto: Update to 2019.2. * gnu/packages/xorg.scm (xorgproto): Update to 2019.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index cbf40459b9..2e992b4b2f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -212,14 +212,14 @@ which can be read by any architecture.") (define-public xorgproto (package (name "xorgproto") - (version "2019.1") + (version "2019.2") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/proto/" "xorgproto-" version ".tar.bz2")) (sha256 (base32 - "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6")))) + "13kvir8dz9dvzhvyfndpff1z7k8h14s7kkl7mbl427andhax1v26")))) (build-system gnu-build-system) (propagated-inputs ;; To get util-macros in (almost?) all package inputs. -- cgit v1.2.3 From 922ed1db45f100d55ad2d526d833eeecd539cc7b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 23:34:44 +0100 Subject: gnu: GLib: Ensure no references are kept to 'tzdata-for-tests'. * gnu/packages/glib.scm (glib)[arguments]: Add #:disallowed-references. --- gnu/packages/glib.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ff5206e7fd..369bd373ac 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -202,9 +202,7 @@ shared NFS home directories.") ("perl" ,perl) ; needed by GIO tests ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c (arguments - `(;; TODO: Uncomment on the next rebuild cycle. - ;; #:disallowed-references (,tzdata-for-tests) - + `(#:disallowed-references (,tzdata-for-tests) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-dbus-launch-path -- cgit v1.2.3 From c9d4e14ab4f8d28d72ea64e95272c6b1d63216cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Dec 2019 00:43:00 +0100 Subject: gnu: giflib: Update to 5.2.1. * gnu/packages/patches/giflib-make-reallocarray-private.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/image.scm (giflib): Update to 5.2.1. [source](uri): Adjust for new file name. [source](patches): Remove. [inputs]: Remove, as they were already unused. [arguments]: Add #:make-flags. Adjust substitution. Delete configure phase. --- gnu/local.mk | 1 - gnu/packages/image.scm | 22 ++-- .../patches/giflib-make-reallocarray-private.patch | 120 --------------------- 3 files changed, 11 insertions(+), 132 deletions(-) delete mode 100644 gnu/packages/patches/giflib-make-reallocarray-private.patch diff --git a/gnu/local.mk b/gnu/local.mk index 122e23f68a..1654fe729b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -889,7 +889,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ - %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0a2ad5a99a..9ab97fa163 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -782,31 +782,31 @@ error-resilience, a Java-viewer for j2k-images, ...") (define-public giflib (package (name "giflib") - (version "5.1.4") + (version "5.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/giflib/giflib-" - version ".tar.bz2")) + version ".tar.gz")) (sha256 (base32 - "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")) - (patches (search-patches - "giflib-make-reallocarray-private.patch")))) + "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii")))) (build-system gnu-build-system) (outputs '("bin" ; utility programs "out")) ; library - (inputs `(("libx11" ,libx11) - ("libice" ,libice) - ("libsm" ,libsm) - ("perl" ,perl))) (arguments - `(#:phases + '(#:make-flags (list "CC=gcc" + (string-append "PREFIX=" + (assoc-ref %outputs "out")) + (string-append "BINDIR=" + (assoc-ref %outputs "bin") "/bin")) + #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-html-doc-gen (lambda _ - (substitute* "doc/Makefile.in" + (substitute* "doc/Makefile" (("^all: allhtml manpages") "")) #t)) + (delete 'configure) (add-after 'install 'install-manpages (lambda* (#:key outputs #:allow-other-keys) (let* ((bin (assoc-ref outputs "bin")) diff --git a/gnu/packages/patches/giflib-make-reallocarray-private.patch b/gnu/packages/patches/giflib-make-reallocarray-private.patch deleted file mode 100644 index 69228c5be8..0000000000 --- a/gnu/packages/patches/giflib-make-reallocarray-private.patch +++ /dev/null @@ -1,120 +0,0 @@ -Move the declaration from gif_lib.h to gif_lib_private.h to solve -conflicts when some .c-file #includes both stdlib.h and gif_lib.h. -See also https://sourceforge.net/p/giflib/bugs/110/ - -diff -ur giflib-5.1.4.orig/lib/dgif_lib.c giflib-5.1.4/lib/dgif_lib.c ---- giflib-5.1.4.orig/lib/dgif_lib.c 2018-02-28 20:31:02.294682673 +0100 -+++ giflib-5.1.4/lib/dgif_lib.c 2018-02-28 22:38:11.659126414 +0100 -@@ -396,7 +396,7 @@ - - if (GifFile->SavedImages) { - SavedImage* new_saved_images = -- (SavedImage *)reallocarray(GifFile->SavedImages, -+ (SavedImage *)giflib_private_reallocarray(GifFile->SavedImages, - (GifFile->ImageCount + 1), sizeof(SavedImage)); - if (new_saved_images == NULL) { - GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM; -@@ -1108,7 +1108,7 @@ - if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) { - return GIF_ERROR; - } -- sp->RasterBits = (unsigned char *)reallocarray(NULL, ImageSize, -+ sp->RasterBits = (unsigned char *)giflib_private_reallocarray(NULL, ImageSize, - sizeof(GifPixelType)); - - if (sp->RasterBits == NULL) { -diff -ur giflib-5.1.4.orig/lib/gifalloc.c giflib-5.1.4/lib/gifalloc.c ---- giflib-5.1.4.orig/lib/gifalloc.c 2018-02-28 20:31:02.294682673 +0100 -+++ giflib-5.1.4/lib/gifalloc.c 2018-02-28 22:38:11.657126423 +0100 -@@ -8,7 +8,7 @@ - #include - #include - --#include "gif_lib.h" -+#include "gif_lib_private.h" - - #define MAX(x, y) (((x) > (y)) ? (x) : (y)) - -@@ -188,7 +188,7 @@ - - /* perhaps we can shrink the map? */ - if (RoundUpTo < ColorUnion->ColorCount) { -- GifColorType *new_map = (GifColorType *)reallocarray(Map, -+ GifColorType *new_map = (GifColorType *)giflib_private_reallocarray(Map, - RoundUpTo, sizeof(GifColorType)); - if( new_map == NULL ) { - GifFreeMapObject(ColorUnion); -@@ -232,7 +232,7 @@ - if (*ExtensionBlocks == NULL) - *ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock)); - else { -- ExtensionBlock* ep_new = (ExtensionBlock *)reallocarray -+ ExtensionBlock* ep_new = (ExtensionBlock *)giflib_private_reallocarray - (*ExtensionBlocks, (*ExtensionBlockCount + 1), - sizeof(ExtensionBlock)); - if( ep_new == NULL ) -@@ -325,7 +325,7 @@ - if (GifFile->SavedImages == NULL) - GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage)); - else -- GifFile->SavedImages = (SavedImage *)reallocarray(GifFile->SavedImages, -+ GifFile->SavedImages = (SavedImage *)giflib_private_reallocarray(GifFile->SavedImages, - (GifFile->ImageCount + 1), sizeof(SavedImage)); - - if (GifFile->SavedImages == NULL) -@@ -355,7 +355,7 @@ - } - - /* next, the raster */ -- sp->RasterBits = (unsigned char *)reallocarray(NULL, -+ sp->RasterBits = (unsigned char *)giflib_private_reallocarray(NULL, - (CopyFrom->ImageDesc.Height * - CopyFrom->ImageDesc.Width), - sizeof(GifPixelType)); -@@ -369,7 +369,7 @@ - - /* finally, the extension blocks */ - if (sp->ExtensionBlocks != NULL) { -- sp->ExtensionBlocks = (ExtensionBlock *)reallocarray(NULL, -+ sp->ExtensionBlocks = (ExtensionBlock *)giflib_private_reallocarray(NULL, - CopyFrom->ExtensionBlockCount, - sizeof(ExtensionBlock)); - if (sp->ExtensionBlocks == NULL) { -diff -ur giflib-5.1.4.orig/lib/gif_lib.h giflib-5.1.4/lib/gif_lib.h ---- giflib-5.1.4.orig/lib/gif_lib.h 2018-02-28 20:31:02.294682673 +0100 -+++ giflib-5.1.4/lib/gif_lib.h 2018-02-28 20:31:43.135716712 +0100 -@@ -244,9 +244,6 @@ - GifPixelType ColorTransIn2[]); - extern int GifBitSize(int n); - --extern void * --reallocarray(void *optr, size_t nmemb, size_t size); -- - /****************************************************************************** - Support for the in-core structures allocation (slurp mode). - ******************************************************************************/ -diff -ur giflib-5.1.4.orig/lib/gif_lib_private.h giflib-5.1.4/lib/gif_lib_private.h ---- giflib-5.1.4.orig/lib/gif_lib_private.h 2018-02-28 20:31:02.294682673 +0100 -+++ giflib-5.1.4/lib/gif_lib_private.h 2018-02-28 22:38:11.657126423 +0100 -@@ -54,6 +54,9 @@ - bool gif89; - } GifFilePrivateType; - -+extern void * -+giflib_private_reallocarray(void *optr, size_t nmemb, size_t size); -+ - #endif /* _GIF_LIB_PRIVATE_H */ - - /* end */ -diff -ur giflib-5.1.4.orig/lib/openbsd-reallocarray.c giflib-5.1.4/lib/openbsd-reallocarray.c ---- giflib-5.1.4.orig/lib/openbsd-reallocarray.c 2018-02-28 20:31:02.295682659 +0100 -+++ giflib-5.1.4/lib/openbsd-reallocarray.c 2018-02-28 22:38:11.656126428 +0100 -@@ -27,7 +27,7 @@ - #define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) - - void * --reallocarray(void *optr, size_t nmemb, size_t size) -+giflib_private_reallocarray(void *optr, size_t nmemb, size_t size) - { - if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && - nmemb > 0 && SIZE_MAX / nmemb < size) { -- cgit v1.2.3 From a80cfbdcb96b71285aac01584aca4f9af3c6b3d1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Dec 2019 00:45:32 +0100 Subject: gnu: libuv: Update to 1.34.0. * gnu/packages/libevent.scm (libuv): Update to 1.34.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 465ed95eb2..b59efecbe1 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -99,14 +99,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.30.1") + (version "1.34.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "12s7ifwgbfxblhv46inqa8c2lsnl8cgmvd37y4a4248xhkx1d0s6")))) + "0j416x38cp6gh5isn3fwv331aw6bpfmrk8xgm07rq5py47kyqg52")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From d098aa3e67b934f61758430c4740cd86d1ff234d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Nov 2019 04:37:57 +0100 Subject: gnu: tcsh: Update to 6.22.02. * gnu/packages/patches/tcsh-fix-autotest.patch: Adjust for 6.22.02. * gnu/packages/patches/tcsh-fix-out-of-bounds-read.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/shells.scm (tcsh): Update to 6.22.02. [source](patches): Remove obsolete patch. --- gnu/local.mk | 1 - gnu/packages/patches/tcsh-fix-autotest.patch | 45 ++-------------------- .../patches/tcsh-fix-out-of-bounds-read.patch | 31 --------------- gnu/packages/shells.scm | 7 ++-- 4 files changed, 6 insertions(+), 78 deletions(-) delete mode 100644 gnu/packages/patches/tcsh-fix-out-of-bounds-read.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1654fe729b..4592e4c38a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1383,7 +1383,6 @@ dist_patch_DATA = \ %D%/packages/patches/tcc-boot-0.9.27.patch \ %D%/packages/patches/tclxml-3.2-install.patch \ %D%/packages/patches/tcsh-fix-autotest.patch \ - %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ diff --git a/gnu/packages/patches/tcsh-fix-autotest.patch b/gnu/packages/patches/tcsh-fix-autotest.patch index 78444a1b2a..200867cb9b 100644 --- a/gnu/packages/patches/tcsh-fix-autotest.patch +++ b/gnu/packages/patches/tcsh-fix-autotest.patch @@ -63,38 +63,14 @@ AT_DATA([comment2.csh], [[echo testing...@%:@\ -@@ -567,10 +567,10 @@ run=3 -# Adapt to changes in sed 4.3: -# https://github.com/tcsh-org/tcsh/commit/2ad4fc1705893207598ed5cd21713ddf3f17bba0 - ]]) - AT_DATA([uniformity_test.csh], - [[ --set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'` -+set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'` - echo -n "$SERVICE_NAME_LOG" > ./output1 - --cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2 -+cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2 - - diff -uprN ./output1 ./output2 >& /dev/null - -@@ -587,7 +587,7 @@ AT_DATA([quoting_result_test.csh], - echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP\)(HOST=db\)(PORT=1521\)\)(CONNECT_DATA=(SERVER=DEDICATED\)(SERVICE_NAME=bns03\)\)\)" > ./expected_result - - set string = "jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=db)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=bns03)))" --set SERVICE_NAME_LOG = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'` -+set SERVICE_NAME_LOG = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'` - - echo "$SERVICE_NAME_LOG" > ./actual_result - --- tests/subst.at +++ tests/subst.at -@@ -54,7 +54,7 @@ AT_CHECK([echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'], +@@ -54,7 +54,7 @@ AT_CHECK([export HOME=$(getent passwd $(id -un) | awk -F: '{ print $(NF - 1) }') , [1 ]) --AT_CHECK([echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | uniq dnl -+AT_CHECK([echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | grep -v "/homeless-shelter" | uniq dnl +-AT_CHECK([export HOME=$(getent passwd $(id -un) | awk -F: '{ print $(NF - 1) }'); echo "echo ~$(id -un)/foo; echo \"\$HOME/foo\"" | tcsh -f | uniq dnl ++AT_CHECK([export HOME=$(getent passwd $(id -un) | awk -F: '{ print $(NF - 1) }'); echo "echo ~$(id -un)//foo; echo \"\$HOME/foo\"" | tcsh -f | uniq dnl | wc -l | tr -d ' \t'], , [1 ]) @@ -110,21 +86,6 @@ ]]) chmod a+x args.sh AT_CHECK([tcsh -f listflags.csh], , -@@ -704,9 +705,9 @@ AT_CHECK([tcsh -f mail.csh], , -# This test fails by trying to change to the build user's home -# directory, which does not exist. - AT_CLEANUP - - --AT_SETUP([$ cdtohome]) --AT_CHECK([tcsh -f -c 'cd'], 0) --AT_CLEANUP -+#AT_SETUP([$ cdtohome]) -+#AT_CHECK([tcsh -f -c 'cd'], 0) -+#AT_CLEANUP - AT_SETUP([$ noimplicithome]) - AT_CHECK([tcsh -f -c 'unset cdtohome; cd'], 1, , [cd: Too few arguments. - ]) @@ -728,55 +729,57 @@ TCSH_UNTESTED([$ oid]) AT_SETUP([$ owd]) diff --git a/gnu/packages/patches/tcsh-fix-out-of-bounds-read.patch b/gnu/packages/patches/tcsh-fix-out-of-bounds-read.patch deleted file mode 100644 index 48c294f78e..0000000000 --- a/gnu/packages/patches/tcsh-fix-out-of-bounds-read.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix out-of-bounds read in c_substitute(): - -http://seclists.org/oss-sec/2016/q4/612 - -Patch copied from upstream source repository: - -https://github.com/tcsh-org/tcsh/commit/6a542dc4fb2ba26518a47e9b3a9bcd6a91b94596 - -From 6a542dc4fb2ba26518a47e9b3a9bcd6a91b94596 Mon Sep 17 00:00:00 2001 -From: christos -Date: Fri, 2 Dec 2016 16:59:28 +0000 -Subject: [PATCH] Fix out of bounds read (Brooks Davis) (reproduce by starting - tcsh and hitting tab at the prompt) - ---- - ed.chared.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ed.chared.c b/ed.chared.c -index 1277e53..310393e 100644 ---- ed.chared.c -+++ ed.chared.c -@@ -750,7 +750,7 @@ c_substitute(void) - /* - * If we found a history character, go expand it. - */ -- if (HIST != '\0' && *p == HIST) -+ if (p >= InputBuf && HIST != '\0' && *p == HIST) - nr_exp = c_excl(p); - else - nr_exp = 0; diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 1fd138fb4c..ef7f911682 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -334,7 +334,7 @@ written by Paul Haahr and Byron Rakitzis.") (define-public tcsh (package (name "tcsh") - (version "6.20.00") + (version "6.22.02") (source (origin (method url-fetch) ;; Old tarballs are moved to old/. @@ -344,9 +344,8 @@ written by Paul Haahr and Byron Rakitzis.") "old/tcsh-" version ".tar.gz"))) (sha256 (base32 - "17ggxkkn5skl0v1x0j6hbv5l0sgnidfzwv16992sqkdm983fg7dq")) - (patches (search-patches "tcsh-fix-autotest.patch" - "tcsh-fix-out-of-bounds-read.patch")) + "0nw8prz1n0lmr82wnpyhrzmki630afn7p9cfgr3vl00vr9c72a7d")) + (patches (search-patches "tcsh-fix-autotest.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 3a3c9bae7999352e396bd30941913092b470b1f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Dec 2019 01:10:49 +0100 Subject: gnu: sqlite: Move static library to separate output. * gnu/packages/sqlite.scm (sqlite)[outputs]: New field. [arguments]: Add #:phases. --- gnu/packages/sqlite.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index d7eb132584..195146aca2 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -65,6 +65,7 @@ "0q4f57a5995wz9c7dfiqy9zwl0kn0b900nxwinqa3llv13dm0nlc")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) + (outputs '("out" "static")) (arguments `(#:configure-flags ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_FTS3, @@ -75,7 +76,24 @@ "-DSQLITE_ENABLE_FTS3 " "-DSQLITE_ENABLE_UNLOCK_NOTIFY " "-DSQLITE_ENABLE_DBSTAT_VTAB " - "-DSQLITE_ENABLE_COLUMN_METADATA")))) + ;; Column metadata is required by GNU Jami and Qt, et.al. + "-DSQLITE_ENABLE_COLUMN_METADATA")) + #:phases (modify-phases %standard-phases + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static")) + (source (string-append out "/lib/libsqlite3.a"))) + (mkdir-p (string-append static "/lib")) + (link source (string-append static "/lib/libsqlite3.a")) + (delete-file source) + + ;; Remove reference to the static library from the .la file + ;; so that Libtool looks for it in the usual places. + (substitute* (string-append out "/lib/libsqlite3.la") + (("^old_library=.*") + "old_library=''\n")) + #t)))))) (home-page "https://www.sqlite.org/") (synopsis "The SQLite database management system") (description -- cgit v1.2.3 From 9e837ea0f35bb232eebfc8603264459ba4ffa52f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Dec 2019 01:21:27 +0100 Subject: gnu: SELinux: Update to 3.0. * gnu/packages/selinux.scm (libsepol): Update to 3.0. [arguments]: Don't set DESTDIR. Change PYSITEDIR to PYTHONLIBDIR. Drop phase 'remove-Werror'. (libselinux)[arguments]: Add substitution to use the correct Python directory. (libsemanage)[arguments]: Change PYSITEDIR to PYTHONLIBDIR. Add phase 'adjust-semanage-conf-location'. [inputs]: Remove USTR. (policycoreutils)[arguments]: Remove obsolete substitution. --- gnu/packages/selinux.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 1c45cb8c7e..49362d129b 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +40,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages swig) - #:use-module (gnu packages textutils) #:use-module (gnu packages xml)) ;; Update the SELinux packages together! @@ -47,8 +47,8 @@ (define-public libsepol (package (name "libsepol") - (version "2.7") - (source (let ((release "20170804")) + (version "3.0") + (source (let ((release "20191204")) (origin (method git-fetch) (uri (git-reference @@ -57,7 +57,7 @@ (file-name (string-append "selinux-" release "-checkout")) (sha256 (base32 - "1l1nn8bx08v4cxkw5kb0wgr61rfqj5ra9dh1dy5jslillj93vivq"))))) + "05rpzm72cgprd0ccr6lvx9hm8j8b5nkqi4avshlsyg7s3sdlcxjs"))))) (build-system gnu-build-system) (arguments `(#:tests? #f ; tests require checkpolicy, which requires libsepol @@ -65,7 +65,7 @@ #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "PREFIX=" out) - (string-append "DESTDIR=" out) + (string-append "SHLIBDIR=" out "/lib") (string-append "MAN3DIR=" out "/share/man/man3") (string-append "MAN5DIR=" out "/share/man/man5") (string-append "MAN8DIR=" out "/share/man/man8") @@ -139,7 +139,7 @@ module into a binary representation.") (string-append "LIBSEPOLA=" (assoc-ref %build-inputs "libsepol") "/lib/libsepol.a") - (string-append "PYSITEDIR=" + (string-append "PYTHONLIBDIR=" (assoc-ref %outputs "python") "/lib/python" ,(version-major+minor (package-version python)) @@ -150,19 +150,17 @@ module into a binary representation.") (delete 'portability) (replace 'enter-dir (lambda _ (chdir ,name) #t)) - (add-after 'enter-dir 'remove-Werror - (lambda _ - ;; GCC complains about the fact that the output does not (yet) - ;; have an "include" directory, even though it is referenced. - (substitute* '("src/Makefile" - "utils/Makefile") - (("-Werror ") "")) - #t)) (add-after 'build 'pywrap (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "pywrap" make-flags))) (add-after 'install 'install-pywrap - (lambda* (#:key make-flags #:allow-other-keys) + (lambda* (#:key make-flags outputs #:allow-other-keys) + ;; The build system uses "python setup.py install" to install + ;; Python bindings. Instruct it to use the correct output. + (substitute* "src/Makefile" + (("--prefix=\\$\\(PREFIX\\)") + (string-append "--prefix=" (assoc-ref outputs "python")))) + (apply invoke "make" "install-pywrap" make-flags))))))) ;; These libraries are in "Requires.private" in libselinux.pc. (propagated-inputs @@ -191,7 +189,7 @@ the core SELinux management utilities.") (substitute-keyword-arguments (package-arguments libsepol) ((#:make-flags flags) `(cons* "PYTHON=python3" - (string-append "PYSITEDIR=" + (string-append "PYTHONLIBDIR=" (assoc-ref %outputs "out") "/lib/python" ,(version-major+minor (package-version python)) @@ -202,6 +200,12 @@ the core SELinux management utilities.") (delete 'portability) (replace 'enter-dir (lambda _ (chdir ,name) #t)) + (add-before 'install 'adjust-semanage-conf-location + (lambda _ + (substitute* "src/Makefile" + (("DEFAULT_SEMANAGE_CONF_LOCATION=/etc") + "DEFAULT_SEMANAGE_CONF_LOCATION=$(PREFIX)/etc")) + #t)) (add-after 'build 'pywrap (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "pywrap" make-flags))) @@ -212,7 +216,6 @@ the core SELinux management utilities.") `(("libsepol" ,libsepol) ("libselinux" ,libselinux) ("audit" ,audit) - ("ustr" ,ustr) ;; For pywrap phase ("python" ,python-wrapper))) (native-inputs @@ -393,11 +396,6 @@ tools, and libraries designed to facilitate SELinux policy analysis.") (lambda _ (chdir ,name) #t)) (add-after 'enter-dir 'ignore-/usr-tests (lambda* (#:key inputs #:allow-other-keys) - ;; The Makefile decides to build restorecond only if it finds the - ;; inotify header somewhere under /usr. - (substitute* "Makefile" - (("ifeq.*") "") - (("endif.*") "")) ;; Rewrite lookup paths for header files. (substitute* '("newrole/Makefile" "setfiles/Makefile" -- cgit v1.2.3 From 703cd3865698dcce04b6edebdcdc6d68c62d9225 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Dec 2019 17:14:05 +0100 Subject: gnu: node: Update to 10.17.0. * gnu/packages/node.scm (node): Update to 10.17.0. --- gnu/packages/node.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 83427d935f..753d2cc06a 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -45,14 +45,14 @@ (define-public node (package (name "node") - (version "10.16.0") + (version "10.17.0") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.xz")) (sha256 (base32 - "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq")) + "13n5cvb340ba7vwm8il7bjrmpz89h6cibhk9rc3kq9ymdgbnf9j1")) (modules '((guix build utils))) (snippet `(begin -- cgit v1.2.3 From 8c42cee19657a3e74c0b9c3f685cb53d1e1762b1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Dec 2019 17:14:59 +0100 Subject: gnu: graphviz: Update to 2.42.3. * gnu/packages/graphviz.scm (graphviz): Update to 2.42.3. [source](uri): Adjust for new download location. --- gnu/packages/graphviz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index f9667e873b..0d3b1e8339 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -55,15 +55,15 @@ (define-public graphviz (package (name "graphviz") - (version "2.40.1") + (version "2.42.3") (source (origin (method url-fetch) (uri (string-append - "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-" - version ".tar.gz")) + "https://www2.graphviz.org/Packages/stable/portable_source/" + "graphviz-" version ".tar.gz")) (sha256 (base32 - "08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna")))) + "1pbswjbx3fjdlsxcm7cmlsl5bvaa3d6gcnr0cr8x3c8pag13zbwg")))) (build-system gnu-build-system) (arguments ;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input. -- cgit v1.2.3 From d45720d8b456e82380601d77e25bd05c6e0dc36a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Dec 2019 03:44:48 +0200 Subject: gnu: swig: Build with guile-2.2. This is a follow-up to 8b2c4eb5020eff458690f600351b56ed97465db1. * gnu/packages/swig.scm (swig)[native-inputs]: Replace guile-2.0 with guile-2.2. --- gnu/packages/swig.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index df49428964..3de6343da8 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -57,7 +57,7 @@ (native-inputs `(("boost" ,boost) ("pcre" ,pcre "bin") ;for 'pcre-config' ;; The following are for tests and examples: - ("guile" ,guile-2.0) + ("guile" ,guile-2.2) ("perl" ,perl))) ;;("python" ,python-wrapper) (inputs `(("pcre" ,pcre))) -- cgit v1.2.3 From 2c267e630086caaa141957ddd9cdf14205b2759c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Dec 2019 04:14:40 +0200 Subject: gnu: nss: Ungraft. * gnu/packages/nss.scm (nss)[replacement]: Remove field. [source]: Add patch. (nss/fixed): Remove variable. --- gnu/packages/nss.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 4f421f6e9d..6ed197b578 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -71,7 +71,6 @@ in the Mozilla clients.") (package (name "nss") (version "3.46.1") - (replacement nss/fixed) (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -84,7 +83,8 @@ in the Mozilla clients.") (base32 "0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv")) ;; Create nss.pc and nss-config. - (patches (search-patches "nss-pkgconfig.patch" + (patches (search-patches "nss-CVE-2019-11745.patch" + "nss-pkgconfig.patch" "nss-freebl-stubs.patch" "nss-increase-test-timeout.patch")))) (build-system gnu-build-system) @@ -184,11 +184,3 @@ applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.") (license license:mpl2.0))) - -(define nss/fixed - (package - (inherit nss) - (source (origin - (inherit (package-source nss)) - (patches (append (search-patches "nss-CVE-2019-11745.patch") - (origin-patches (package-source nss)))))))) -- cgit v1.2.3 From fd248cb815d571043c3a0c52a01c9b3e368a069e Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 9 Dec 2019 14:46:47 -0600 Subject: gnu: ruby: Configure for dynamic linking. * gnu/packages/ruby.scm (ruby)[arguments]: Use #:configure-flags to properly enable dynamic linking instead of using libruby-static.a. Fixes #38500: Reported-by: Vicente Eduardo --- gnu/packages/ruby.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e1d69f9655..d30ee415c4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 Collin J. Doering ;;; Copyright © 2019 Diego N. Barbato +;;; Copyright © 2019 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,6 +96,7 @@ (build-system gnu-build-system) (arguments `(#:test-target "test" + #:configure-flags '("--enable-shared") ; dynamic linking #:phases (modify-phases %standard-phases (add-before 'configure 'replace-bin-sh-and-remove-libffi -- cgit v1.2.3 From 6d01ff96a38aea7535299246f8a32d014ded28d1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 14 Dec 2019 17:34:28 +0100 Subject: gnu: Add u-boot-pine64-lts. * gnu/packages/bootloaders.scm (u-boot-pine64-lts): New variable. --- gnu/packages/bootloaders.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 156e4c4cdd..55b4abbda5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 nee +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -677,6 +678,9 @@ it fits within common partitioning schemes.") (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) +(define-public u-boot-pine64-lts + (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu")) + (define-public u-boot-pinebook (make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu")) -- cgit v1.2.3 From de5394f7456900146e217864aa2d58127a1dbc33 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 14 Dec 2019 17:35:02 +0100 Subject: gnu: bootloaders: Fix make-u-boot-sunxi64-package cross-compilation. * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package)[arguments]: Search in native-inputs to fix cross-compilation. --- gnu/packages/bootloaders.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 55b4abbda5..91d567288f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -662,9 +662,11 @@ it fits within common partitioning schemes.") ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((bl31 (string-append (assoc-ref inputs "firmware") - "/bl31.bin"))) + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((bl31 + (string-append + (assoc-ref (or native-inputs inputs) "firmware") + "/bl31.bin"))) (setenv "BL31" bl31) ;; This is necessary when we're using the bundled dtc. ;(setenv "PATH" (string-append (getenv "PATH") ":" -- cgit v1.2.3 From 2f014c85f742148971801cfc4f29ae7f5e734c99 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 14 Dec 2019 17:37:23 +0100 Subject: gnu: Add u-boot-pine64-lts-bootloader. * gnu/bootloader/u-boot.scm (u-boot-pine64-lts-bootloader): New variable. --- gnu/bootloader/u-boot.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index e21526eb7e..3e892c5475 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 David Craven -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +33,7 @@ u-boot-nintendo-nes-classic-edition-bootloader u-boot-novena-bootloader u-boot-pine64-plus-bootloader + u-boot-pine64-lts-bootloader u-boot-pinebook-bootloader u-boot-puma-rk3399-bootloader u-boot-rock64-rk3328-bootloader @@ -206,6 +207,11 @@ (inherit u-boot-allwinner64-bootloader) (package u-boot-pine64-plus))) +(define u-boot-pine64-lts-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-pine64-lts))) + (define u-boot-pinebook-bootloader (bootloader (inherit u-boot-allwinner64-bootloader) -- cgit v1.2.3 From 7b90379db8adae9b23da4d5b7c7d3ec61d0e59a1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 14 Dec 2019 17:46:27 +0100 Subject: gnu: info-reader: Fix cross-compilation. * gnu/packages/texinfo.scm (info-reader)[arguments]: Add keep-only-info-reader phase to inherited texinfo package phases, so that fix-cross-configure phase is preserved. --- gnu/packages/texinfo.scm | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index ef3dfba09e..c755790448 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2019 Pierre-Moana Levesque +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -159,32 +160,32 @@ is on expressing the content semantically, avoiding physical markup commands.") (inherit texinfo) (name "info-reader") (arguments - `(#:disallowed-references ,(assoc-ref (package-inputs texinfo) - "perl") + `(,@(substitute-keyword-arguments (package-arguments texinfo) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'keep-only-info-reader + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove everything but 'bin/info' and associated + ;; files. + (define (files) + (scandir "." (lambda (file) + (not (member file '("." "..")))))) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion out + (for-each delete-file-recursively + (fold delete (files) '("bin" "share")))) + (with-directory-excursion (string-append out "/bin") + (for-each delete-file (delete "info" (files)))) + (with-directory-excursion (string-append out "/share") + (for-each delete-file-recursively + (fold delete (files) + '("info" "locale")))) + #t)))))) + #:disallowed-references ,(assoc-ref (package-inputs texinfo) + "perl") #:modules ((ice-9 ftw) (srfi srfi-1) - ,@%gnu-build-system-modules) - - #:phases (modify-phases %standard-phases - (add-after 'install 'keep-only-info-reader - (lambda* (#:key outputs #:allow-other-keys) - ;; Remove everything but 'bin/info' and associated - ;; files. - (define (files) - (scandir "." (lambda (file) - (not (member file '("." "..")))))) - - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion out - (for-each delete-file-recursively - (fold delete (files) '("bin" "share")))) - (with-directory-excursion (string-append out "/bin") - (for-each delete-file (delete "info" (files)))) - (with-directory-excursion (string-append out "/share") - (for-each delete-file-recursively - (fold delete (files) - '("info" "locale")))) - #t)))))) + ,@%gnu-build-system-modules))) (synopsis "Standalone Info documentation reader"))) (define-public texi2html -- cgit v1.2.3 From e8cbebb4769328f6ad49a4b5868f9c935e7e5372 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 14 Dec 2019 19:47:57 +0100 Subject: gnu: gtk+-2: Split binaries. * gnu/packages/gtk.scm (gtk+-2): Add "bin" output. * guix/profiles.scm (gtk-im-modules): Use "bin" output for generating gtk+-2 immodules cache file. --- gnu/packages/gtk.scm | 24 ++++++++++++++---------- guix/profiles.scm | 4 +++- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ea2b087724..67b129c2a1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -672,7 +672,7 @@ is part of the GNOME accessibility project.") "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" "gtk2-theme-paths.patch")))) (build-system gnu-build-system) - (outputs '("out" "doc")) + (outputs '("out" "bin" "doc")) (propagated-inputs `(("atk" ,atk) ("gdk-pixbuf" ,gdk-pixbuf+svg) @@ -699,14 +699,19 @@ is part of the GNOME accessibility project.") (assoc-ref %outputs "doc") "/share/gtk-doc/html")) #:phases - (alist-cons-before - 'configure 'disable-tests - (lambda _ - ;; FIXME: re-enable tests requiring an X server - (substitute* "gtk/Makefile.in" - (("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits .")) - #t) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'disable-tests + (lambda _ + ;; FIXME: re-enable tests requiring an X server + (substitute* "gtk/Makefile.in" + (("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits .")) + #t)) + (add-after 'install 'remove-cache + (lambda* (#:key outputs #:allow-other-keys) + (for-each + delete-file + (find-files (assoc-ref outputs "out") "immodules.cache")) + #t))))) (native-search-paths (list (search-path-specification (variable "GUIX_GTK2_PATH") @@ -734,7 +739,6 @@ application suites.") "10xyyhlfb0yk4hglngxh2zsv9xrxkqv343df8h01dvagc6jyp10k")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) - (outputs '("out" "bin" "doc")) (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) ("atk" ,atk) diff --git a/guix/profiles.scm b/guix/profiles.scm index 616605151e..539fe04267 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1106,6 +1106,8 @@ for both major versions of GTK+." ;; Don't run the hook when there's nothing to do. (let* ((pkg-gtk+ (module-ref ; lazy reference (resolve-interface '(gnu packages gtk)) 'gtk+)) + (pkg-gtk+2 (module-ref ; lazy reference + (resolve-interface '(gnu packages gtk)) 'gtk+-2)) (gexp #~(begin #$(if gtk+ (build @@ -1119,7 +1121,7 @@ for both major versions of GTK+." (build gtk+-2 "2.10.0" #~(string-append - #$gtk+-2 "/bin/gtk-query-immodules-2.0")) + #$pkggtk+-2:bin "/bin/gtk-query-immodules-2.0")) #t)))) (if (or gtk+ gtk+-2) (gexp->derivation "gtk-im-modules" gexp -- cgit v1.2.3 From 50b61ec22306181c419a3bd4c35b3c001c604994 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 12 Dec 2019 12:09:13 +0100 Subject: gnu: llvm: split scripts to a separate output. This reduces the closure size by almost 80 MiB. * gnu/packages/llvm.scm (llvm-8): Add "opt-viewer" output. --- gnu/packages/llvm.scm | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 082e6e96ca..e09b7f016e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -88,6 +88,7 @@ as \"x86_64-linux\"." (base32 "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8")))) (build-system cmake-build-system) + (outputs '("out" "opt-viewer")) (native-inputs `(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2 ("perl" ,perl))) @@ -105,16 +106,27 @@ as \"x86_64-linux\"." ;; Don't use '-g' during the build, to save space. #:build-type "Release" - #:phases (modify-phases %standard-phases - (add-before 'build 'shared-lib-workaround - ;; Even with CMAKE_SKIP_BUILD_RPATH=FALSE, llvm-tblgen - ;; doesn't seem to get the correct rpath to be able to run - ;; from the build directory. Set LD_LIBRARY_PATH as a - ;; workaround. - (lambda _ - (setenv "LD_LIBRARY_PATH" - (string-append (getcwd) "/lib")) - #t))))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'shared-lib-workaround + ;; Even with CMAKE_SKIP_BUILD_RPATH=FALSE, llvm-tblgen + ;; doesn't seem to get the correct rpath to be able to run + ;; from the build directory. Set LD_LIBRARY_PATH as a + ;; workaround. + (lambda _ + (setenv "LD_LIBRARY_PATH" + (string-append (getcwd) "/lib")) + #t)) + (add-after 'install 'install-opt-viewer + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (opt-viewer-out (assoc-ref outputs "opt-viewer")) + (opt-viewer-share-dir (string-append opt-viewer-out "/share")) + (opt-viewer-dir (string-append opt-viewer-share-dir "/opt-viewer"))) + (mkdir-p opt-viewer-share-dir) + (rename-file (string-append out "/share/opt-viewer") + opt-viewer-dir)) + #t))))) (home-page "https://www.llvm.org") (synopsis "Optimizing compiler infrastructure") (description -- cgit v1.2.3 From 28292d8c5c600632786f58a9cbcd0358b52838ae Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Dec 2019 19:19:41 +0200 Subject: guix: Fix typo. This is a follow-up to e8cbebb4769328f6ad49a4b5868f9c935e7e5372. * guix/profiles.scm (gtk-im-modules): Corectly refer to gtk+-2 package. --- guix/profiles.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 539fe04267..987bab4e7f 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1121,7 +1121,7 @@ for both major versions of GTK+." (build gtk+-2 "2.10.0" #~(string-append - #$pkggtk+-2:bin "/bin/gtk-query-immodules-2.0")) + #$pkg-gtk+2:bin "/bin/gtk-query-immodules-2.0")) #t)))) (if (or gtk+ gtk+-2) (gexp->derivation "gtk-im-modules" gexp -- cgit v1.2.3 From 0c25097e8bbf6f25c53106d7e5ba9ba3c5146b1b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Dec 2019 10:30:36 +0200 Subject: gnu: bison: Update to 3.5. * gnu/packages/bison.scm (bison): Update to 3.5. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index e65ef34c94..eae8673edc 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -31,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.4.2") + (version "3.5") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "185zd8rl9diy5sl3zmizml05kcvcin05ppbax1lxqdcpd4s5bl17")))) + "0hd6lgkxb9i46alcwn87jygs53q4vkq7k0jzb84ikbdln4is1r2m")))) (build-system gnu-build-system) (arguments '(;; Building in parallel on many-core systems may cause an error such as -- cgit v1.2.3 From 2e4c2a3ae9297e86f3665cbb89e6cb8113360f3a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 16 Dec 2019 12:39:18 +0100 Subject: gnu: iw: Fix cross-compilation. * gnu/packages/linux.scm (iw)[arguments]: Set PKG_CONFIG and CC variables correctly for cross-compilation. --- gnu/packages/linux.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fb9be39a31..a81905df7f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2098,8 +2098,18 @@ configuration and monitoring interfaces.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libnl" ,libnl))) (arguments - `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "CC=gcc") + `(#:make-flags + (let* ((target ,(%current-target-system)) + (gcc (if target (string-append target "-gcc") "gcc")) + (pkg-config (if target + (string-append target "-pkg-config") + "pkg-config"))) + (list + (string-append "CC=" gcc) + (string-append "PKG_CONFIG=" + (assoc-ref %build-inputs "pkg-config") + "/bin/" pkg-config) + (string-append "PREFIX=" (assoc-ref %outputs "out")))) #:phases (modify-phases %standard-phases (delete 'configure)))) (home-page "https://wireless.wiki.kernel.org/") (synopsis "Tool for configuring wireless devices") -- cgit v1.2.3 From 60825fdd18d56bec0aefd1760bd663f70e7ff1cc Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 16 Dec 2019 13:39:05 +0100 Subject: gnu: libxslt: Fix cross-compilation. This package native build was relying on xz as an implicit input. In fact libxslt is linking against liblzma, and xz is thus an input. * gnu/packages/xml.scm (libxslt)[inputs]: Add xz. --- gnu/packages/xml.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 86c8eb815f..5ccbc695ea 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -228,7 +228,8 @@ project (but it is usable outside of the Gnome platform).") (inputs `(("libgcrypt" ,libgcrypt) ("libxml2" ,libxml2) ("python" ,python-minimal-wrapper) - ("zlib" ,zlib))) + ("zlib" ,zlib) + ("xz" ,xz))) (native-inputs `(("pkg-config" ,pkg-config))) (description -- cgit v1.2.3 From 6eae90898a8c1bcd23d156b086e7ab03930356f1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 16 Dec 2019 14:30:11 +0100 Subject: gnu: pciutils: Fix cross-compilation. * gnu/packages/pciutils.scm (pciutils)[arguments]: Set CROSS_COMPILE, HOST and STRIP variables correctly in Makefile to fix cross-compilation. --- gnu/packages/pciutils.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index f8b79cf907..18d7c1e56c 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2017 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages compression) #:use-module (gnu packages pkg-config) @@ -42,12 +44,26 @@ "1wwkpglvvr1sdj2gxz9khq507y02c4px48njy25divzdhv4jwifv")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) ;; There's no 'configure' script, just a raw makefile. (substitute* "Makefile" + ,@(if (%current-target-system) + `((("^CROSS_COMPILE=.*$") + (string-append "CROSS_COMPILE=" + ,(%current-target-system) "-" + "\n")) + (("^HOST=.*$") + (string-append "HOST=" + ,(gnu-triplet->nix-system + (%current-target-system)) "\n")) + ;; Disable 'install' strip option, that would fail when + ;; we are cross-compiling. + (("^STRIP=.*$") + "STRIP=\n")) + '()) (("^PREFIX=.*$") (string-append "PREFIX := " (assoc-ref outputs "out") "\n")) -- cgit v1.2.3 From 8166b6afe5e28d64d3ffd426a8153a980e2692b0 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 16 Dec 2019 16:41:01 +0100 Subject: gnu: psmisc: Fix cross-compilation. * gnu/packages/linux.scm (psmisc)[arguments]: Pass ac_cv_func_malloc_0_nonnull=yes and ac_cv_func_realloc_0_nonnull=yes options that are required when cross-compiling. --- gnu/packages/linux.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a81905df7f..998fd20ad8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1078,6 +1078,13 @@ at login. Local and dynamic reconfiguration are its key features.") (sha256 (base32 "16i7qzjmm6g0lzha8yzpfrlcxnvkgh95hkq9gdjd4zmzb8d0wxa1")))) (build-system gnu-build-system) + (arguments + `(,@(if (%current-target-system) + '(#:configure-flags + (list + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes")) + '()))) (inputs `(("ncurses" ,ncurses))) (home-page "https://gitlab.com/psmisc/psmisc") (synopsis "Small utilities that use the proc file system") -- cgit v1.2.3 From 8a0e29d8b9da4a277c8f9613be85df16de9e8898 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 19 Dec 2019 09:51:56 +0100 Subject: gnu: tcl: Fix cross-compilation. * gnu/packages/patches/tcl-fix-cross-compilation.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/tcl.scm (tcl): Apply it. --- gnu/local.mk | 1 + .../patches/tcl-fix-cross-compilation.patch | 39 ++++++++++++++++++++++ gnu/packages/tcl.scm | 4 ++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/tcl-fix-cross-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0224b7101b..3d672ea213 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1383,6 +1383,7 @@ dist_patch_DATA = \ %D%/packages/patches/tar-skip-unreliable-tests.patch \ %D%/packages/patches/tcc-boot-0.9.27.patch \ %D%/packages/patches/tclxml-3.2-install.patch \ + %D%/packages/patches/tcl-fix-cross-compilation.patch \ %D%/packages/patches/tcsh-fix-autotest.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ diff --git a/gnu/packages/patches/tcl-fix-cross-compilation.patch b/gnu/packages/patches/tcl-fix-cross-compilation.patch new file mode 100644 index 0000000000..00c36b8f27 --- /dev/null +++ b/gnu/packages/patches/tcl-fix-cross-compilation.patch @@ -0,0 +1,39 @@ +From f7fa48c4c75a1e748dc5071e709c0b62ff739eaa Mon Sep 17 00:00:00 2001 +From: "jan.nijtmans" +Date: Mon, 9 Dec 2019 10:02:20 +0000 +Subject: [PATCH] Fix [abd4abedd2]: Failed to build tk 8.6.10 with cross + compile + +Patch taken from upstream to fix cross-compilation. To be removed on next Tcl release. + +--- + compat/strtol.c | 2 +- + compat/strtoul.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/compat/strtol.c b/compat/strtol.c +index b7f69196ce2..811006a64c3 100644 +--- a/compat/strtol.c ++++ b/compat/strtol.c +@@ -53,7 +53,7 @@ strtol( + */ + + p = string; +- while (TclIsSpaceProc(*p)) { ++ while (isspace(UCHAR(*p))) { + p += 1; + } + +diff --git a/compat/strtoul.c b/compat/strtoul.c +index e37eb05f823..15587f1da1a 100644 +--- a/compat/strtoul.c ++++ b/compat/strtoul.c +@@ -74,7 +74,7 @@ strtoul( + */ + + p = string; +- while (TclIsSpaceProc(*p)) { ++ while (isspace(UCHAR(*p))) { + p += 1; + } + if (*p == '-') { diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 7531c1ca9d..c88d0338cb 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Julien Lepiller +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,7 +51,8 @@ version "/tcl" version "-src.tar.gz")) (sha256 (base32 - "1vc7imilx6kcb5319r7hnrp4jn5pqb41an3vr3azhgcfcgvdp5ji")))) + "1vc7imilx6kcb5319r7hnrp4jn5pqb41an3vr3azhgcfcgvdp5ji")) + (patches (search-patches "tcl-fix-cross-compilation.patch")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 45e7599ce87c184e934a23df73e7738c1ce17666 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 19 Dec 2019 15:00:22 +0100 Subject: gnu: isc-dhcp: Fix cross-compilation. * gnu/packages/admin.scm (isc-dhcp)[arguments]: Add a configure flag to specify randomdev path, which is needed when cross-compiling. Also add a fix-bind-cross-compilation phase. --- gnu/packages/admin.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c2be85e81e..33d378310e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -776,6 +777,7 @@ connection alive.") (build-system gnu-build-system) (arguments `(#:parallel-build? #f + #:configure-flags '("--with-randomdev=/dev/random") #:phases (modify-phases %standard-phases (add-after 'unpack 'replace-bundled-bind @@ -807,6 +809,12 @@ connection alive.") (("^RELEASEVER=.*") (format #f "RELEASEVER=~a\n" ,bind-release-version))) #t)) + (add-before 'configure 'fix-bind-cross-compilation + (lambda _ + (substitute* "configure" + (("--host=\\$host") + "--host=$host_alias")) + #t)) (add-after 'configure 'post-configure (lambda* (#:key outputs #:allow-other-keys) ;; Point to the right client script, which will be -- cgit v1.2.3 From 80a61b38b84f881ff2bf735754c07ab8e38c763b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 19 Dec 2019 15:28:56 +0100 Subject: gnu: wireless-tools: Fix cross-compilation. * gnu/packages/linux.scm (wireless-tools)[arguments]: Replace 'configure phase to substitute CC, AR and RANLIB Makefile variables to suitable values when cross-compiling. --- gnu/packages/linux.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 998fd20ad8..3cec941db2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2870,8 +2870,20 @@ mapper. Kernel components are part of Linux-libre.") (string-append "INSTALL_MAN=" %output "/share/man") (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") "BUILD_STATIC=") - #:phases (modify-phases %standard-phases - (delete 'configure)) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key target #:allow-other-keys) + (when ,(%current-target-system) + ;; Cross-compilation: use the cross tools. + (substitute* (find-files "." "Makefile") + (("CC = .*$") + (string-append "CC = " target "-gcc\n")) + (("AR = .*$") + (string-append "AR = " target "-ar\n")) + (("RANLIB = .*$") + (string-append "RANLIB = " target "-ranlib\n")))) + #t))) #:tests? #f)) (synopsis "Tools for manipulating Linux Wireless Extensions") (description "Wireless Tools are used to manipulate the now-deprecated -- cgit v1.2.3 From 3cd1444df70a0d2ff69a90441d86b4920ce18002 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 14 Dec 2019 17:52:53 +0100 Subject: gexp: Add system and target support to gexp->file. * guix/gexp.scm (gexp->file): Add system and target arguments and pass them to gexp->derivation and load-path-expression calls, (scheme-file-compiler): adapt accordingly to pass system and target arguments. --- guix/gexp.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index ffe4fc95c7..ef09c030ee 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Jan Nieuwenhuizen +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -456,7 +457,10 @@ This is the declarative counterpart of 'gexp->file'." ;; Compile FILE by returning a derivation that builds the file. (match file (($ name gexp splice?) - (gexp->file name gexp #:splice? splice?)))) + (gexp->file name gexp + #:splice? splice? + #:system system + #:target target)))) ;; Appending SUFFIX to BASE's output file name. (define-record-type @@ -1598,7 +1602,9 @@ imported modules in its search path. Look up EXP's modules in MODULE-PATH." (define* (gexp->file name exp #:key (set-load-path? #t) (module-path %load-path) - (splice? #f)) + (splice? #f) + (system (%current-system)) + target) "Return a derivation that builds a file NAME containing EXP. When SPLICE? is true, EXP is considered to be a list of expressions that will be spliced in the resulting file. @@ -1621,10 +1627,14 @@ Lookup EXP's modules in MODULE-PATH." exp (gexp ((ungexp exp))))))))) #:local-build? #t - #:substitutable? #f) + #:substitutable? #f + #:system system + #:target target) (mlet %store-monad ((set-load-path (load-path-expression modules module-path - #:extensions extensions))) + #:extensions extensions + #:system system + #:target target))) (gexp->derivation name (gexp (call-with-output-file (ungexp output) @@ -1637,7 +1647,9 @@ Lookup EXP's modules in MODULE-PATH." (gexp ((ungexp exp))))))))) #:module-path module-path #:local-build? #t - #:substitutable? #f)))) + #:substitutable? #f + #:system system + #:target target)))) (define* (text-file* name #:rest text) "Return as a monadic value a derivation that builds a text file containing -- cgit v1.2.3 From 7681436bfd9c3b6d9b8d18a1c81102d14378cbe8 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 24 Dec 2019 14:15:43 +0100 Subject: gnu: poppler: Update to 0.83.0. * gnu/packages/pdf.scm (poppler): Update to 0.83.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index ebe0168ff2..b5ce6e4c2c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -90,14 +90,14 @@ (define-public poppler (package (name "poppler") - (version "0.79.0") + (version "0.83.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr")))) + "16vr1g5qsqwyxfnyikqw37i04x9zpp45far2x90c7qbijw6nap38")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From adf218e2e8d855ca9c8477658478658939ed2107 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 26 Dec 2019 17:55:43 +0100 Subject: gnu: libxt: Fix cross-compilation. * gnu/packages/xorg.scm (libxt)[arguments]: Pass --disable-malloc0returnsnull configure flag when cross-compiling. --- gnu/packages/xorg.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 801e5e459b..b3792122ac 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5411,10 +5411,15 @@ draggable titlebars and borders.") (outputs '("out" "doc")) ;2 MiB of man pages + XML (arguments - '(#:configure-flags (list (string-append "--mandir=" - (assoc-ref %outputs "doc") - "/share/man") - "--disable-static"))) + `(#:configure-flags + (list (string-append "--mandir=" + (assoc-ref %outputs "doc") + "/share/man") + "--disable-static" + ;; Disable zero malloc check that fails when cross-compiling. + ,@(if (%current-target-system) + '("--disable-malloc0returnsnull") + '())))) (propagated-inputs `(("libx11" ,libx11) ("libice" ,libice) -- cgit v1.2.3 From 3d8c77836b73ae8284c673eabdae7f0880d70a8d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 26 Dec 2019 18:09:32 +0100 Subject: gnu: openssh: Fix cross-compilation. * gnu/packages/ssh.scm (openssh): Pass --disable-strip argument when cross-compiling. --- gnu/packages/ssh.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index de33effc89..7abf710757 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,7 +166,15 @@ a server that supports the SSH-2 protocol.") "--with-libedit" ;; Enable PAM support in sshd. - "--with-pam") + "--with-pam" + + ;; "make install" runs "install -s" by default, + ;; which doesn't work for cross-compiled binaries + ;; because it invokes 'strip' instead of + ;; 'TRIPLET-strip'. Work around this. + ,,@(if (%current-target-system) + '("--disable-strip") + '())) #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 91be09de61c277d0f1b26cefcefcd0a7fae2e00d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 24 Dec 2019 15:04:57 +0100 Subject: profiles: Fix profile-derivation cross-compilation. * guix/store.scm (current-target-system): New exported monadic procedure. * guix/profiles.scm (profile-derivation): Set target at bind time using the above procedure. --- guix/profiles.scm | 4 ++++ guix/store.scm | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/guix/profiles.scm b/guix/profiles.scm index 987bab4e7f..d20f06e7b3 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Huang Ying ;;; Copyright © 2017 Maxim Cournoyer ;;; Copyright © 2019 Kyle Meyer +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -1459,6 +1460,9 @@ are cross-built for TARGET." (mlet* %store-monad ((system (if system (return system) (current-system))) + (target (if target + (return target) + (current-target-system))) (ok? (if allow-collisions? (return #t) (check-for-collisions manifest system diff --git a/guix/store.scm b/guix/store.scm index cf25d347fc..f99fa581a8 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Jan Nieuwenhuizen +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -159,6 +160,7 @@ %guile-for-build current-system set-current-system + current-target-system text-file interned-file interned-file-tree @@ -1816,6 +1818,11 @@ the store." (lambda (state) (values (%current-system system) state))) +(define-inlinable (current-target-system) + ;; Consult the %CURRENT-TARGET-SYSTEM fluid at bind time. + (lambda (state) + (values (%current-target-system) state))) + (define %guile-for-build ;; The derivation of the Guile to be used within the build environment, ;; when using 'gexp->derivation' and co. -- cgit v1.2.3 From 0715e520ead9b3188da41b31a691ab2e3c28fe31 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 31 Dec 2019 13:14:52 +0100 Subject: gnu: python-lxml: Update to 4.4.2. * gnu/packages/python-xyz.scm (python-lxml): Update to 4.4.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 574c596e5f..a369720202 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5754,14 +5754,14 @@ the GObject Introspection bindings to libnotify for non-GTK applications.") (define-public python-lxml (package (name "python-lxml") - (version "4.4.1") + (version "4.4.2") (source (origin (method url-fetch) (uri (pypi-uri "lxml" version)) (sha256 (base32 - "14jnpfcpgqr9sx8ppd286jzcbk0b36hbqsvd8jkvffipzw5v8768")))) + "01nvb5j8vs9nk4z5s3250b1m22b4d08kffa36if3g1mdygdrvxpg")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From ba0e14061aab502999c29b71412b8dd7e6b00bac Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 3 Jan 2020 16:00:44 +0100 Subject: gnu: mingetty: Fix cross-compilation. * gnu/packages/admin.scm (mingetty)[arguments]: When cross-compiling, set CC to the appropriate value in configure phase. --- gnu/packages/admin.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1725f2a563..81f9f3b70e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Guillaume Le Vaillant -;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -520,13 +520,17 @@ login, passwd, su, groupadd, and useradd.") `(#:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs outputs target #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man8 (string-append out "/share/man/man8")) (sbin (string-append out "/sbin")) (shadow (assoc-ref inputs "shadow")) (login (string-append shadow "/bin/login"))) (substitute* "Makefile" + ,@(if (%current-target-system) + '((("CC=.*$") + (string-append "CC=" target "-gcc\n"))) + '()) (("^SBINDIR.*") (string-append "SBINDIR = " out "/sbin\n")) -- cgit v1.2.3 From 0d58d1acaac6d5ed9f9b480c454a57a0f3fd9645 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 18:52:25 +0100 Subject: Revert "gnu: poppler: Update to 0.83.0." This reverts commit 7681436bfd9c3b6d9b8d18a1c81102d14378cbe8. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index b5ce6e4c2c..ebe0168ff2 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -90,14 +90,14 @@ (define-public poppler (package (name "poppler") - (version "0.83.0") + (version "0.79.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "16vr1g5qsqwyxfnyikqw37i04x9zpp45far2x90c7qbijw6nap38")))) + "1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From f09948fd442c22f0b1873ff40b64827a0bbe8a2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 6 Dec 2019 18:22:42 +0100 Subject: gnu: libfaketime: Fix failing test. * gnu/packages/check.scm (libfaketime)[arguments]: Set environment variable before building. --- gnu/packages/check.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index f61e96422b..7f548636a7 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2298,6 +2298,12 @@ portable to just about any platform.") (let ((out (assoc-ref outputs "out"))) (setenv "CC" "gcc") (setenv "PREFIX" out) + + ;; XXX: Without this flag, the CLOCK_REALTIME test hangs + ;; indefinitely. See README.packagers for more information. + ;; Try removing this for future versions of libfaketime. + (setenv "FAKETIME_COMPILE_CFLAGS" "-DFORCE_MONOTONIC_FIX") + #t))) (add-before 'check 'pre-check (lambda _ -- cgit v1.2.3 From 84f1e12b8b84acca1b3be7d41daacce28feb391d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 20:58:19 +0100 Subject: gnu: python-pyopenssl: Fix test failure. * gnu/packages/python-crypto.scm (python-pyopenssl)[native-inputs]: Add LIBFAKETIME. [arguments]: Use it to run tests with a fixed date. --- gnu/packages/python-crypto.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 63d3be17c2..b9e32109ae 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari -;;; Copyright © 2016, 2017 Marius Bakke +;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2015 Cyril Roelandt @@ -448,7 +448,10 @@ message digests and key derivation functions.") (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) - (invoke "py.test" "-v" "-k" + ;; PyOpenSSL runs tests against a certificate with a fixed + ;; expiry time. To ensure successful builds in the future, + ;; set the time to roughly the release date. + (invoke "faketime" "2019-01-01" "py.test" "-v" "-k" (string-append ;; This test tries to look up certificates from ;; the compiled-in default path in OpenSSL, which @@ -463,7 +466,8 @@ message digests and key derivation functions.") (inputs `(("openssl" ,openssl))) (native-inputs - `(("python-flaky" ,python-flaky) + `(("libfaketime" ,libfaketime) + ("python-flaky" ,python-flaky) ("python-pretend" ,python-pretend) ("python-pytest" ,python-pytest))) (home-page "https://github.com/pyca/pyopenssl") -- cgit v1.2.3 From eb5f3ea1003f76545b197b1e779e2967ec379475 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 6 Dec 2019 18:19:23 +0100 Subject: gnu: WebkitGTK: Fix build failure with ICU 65. * gnu/packages/patches/webkitgtk-icu-65.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/webkit.scm (webkitgtk)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/patches/webkitgtk-icu-65.patch | 47 +++++++++++++++++++++++++++++ gnu/packages/webkit.scm | 1 + 3 files changed, 49 insertions(+) create mode 100644 gnu/packages/patches/webkitgtk-icu-65.patch diff --git a/gnu/local.mk b/gnu/local.mk index efbd9067bf..7cb5cad2ee 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1464,6 +1464,7 @@ dist_patch_DATA = \ %D%/packages/patches/wavpack-CVE-2018-7253.patch \ %D%/packages/patches/wavpack-CVE-2018-7254.patch \ %D%/packages/patches/weasyprint-library-paths.patch \ + %D%/packages/patches/webkitgtk-icu-65.patch \ %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ diff --git a/gnu/packages/patches/webkitgtk-icu-65.patch b/gnu/packages/patches/webkitgtk-icu-65.patch new file mode 100644 index 0000000000..66819c566b --- /dev/null +++ b/gnu/packages/patches/webkitgtk-icu-65.patch @@ -0,0 +1,47 @@ +Fix build with ICU 65. + +Taken from upstream: +https://bugs.webkit.org/show_bug.cgi?id=202600 +https://trac.webkit.org/r250747 + +diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp +index 18e7f13cd615..c584f1a0cb7e 100644 +--- a/Source/WTF/wtf/URLHelpers.cpp ++++ b/Source/WTF/wtf/URLHelpers.cpp +@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt + Optional previousCodePoint; + while (i < length) { + UChar32 c; +- U16_NEXT(buffer, i, length, c) ++ U16_NEXT(buffer, i, length, c); + UErrorCode error = U_ZERO_ERROR; + UScriptCode script = uscript_getScript(c, &error); + if (error != U_ZERO_ERROR) { +diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp +index 2443e24c9bc4..1fbb3a716006 100644 +--- a/Source/WebCore/dom/Document.cpp ++++ b/Source/WebCore/dom/Document.cpp +@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -5019,7 +5019,7 @@ ExceptionOr> Document::parseQualifiedName(cons + + for (unsigned i = 0; i < length; ) { + UChar32 c; +- U16_NEXT(qualifiedName, i, length, c) ++ U16_NEXT(qualifiedName, i, length, c); + if (c == ':') { + if (sawColon) + return Exception { InvalidCharacterError }; diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index b0b0d79a05..5101ceb2ea 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -126,6 +126,7 @@ engine that uses Wayland for graphics output.") (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) + (patches (search-patches "webkitgtk-icu-65.patch")) (sha256 (base32 "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b")))) -- cgit v1.2.3 From 46c3a08b2ee8d5abae9f8fb42ff68dbf211dd261 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 6 Dec 2019 18:20:51 +0100 Subject: gnu: dconf: Fix build failure with Meson 0.52. * gnu/packages/patches/dconf-meson-0.52.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (dconf)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 1 + gnu/packages/patches/dconf-meson-0.52.patch | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/dconf-meson-0.52.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7cb5cad2ee..234d283ee6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -798,6 +798,7 @@ dist_patch_DATA = \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ + %D%/packages/patches/dconf-meson-0.52.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dd9ac29f4e..37873e42bc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2851,6 +2851,7 @@ and RDP protocols.") "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "dconf-meson-0.52.patch")) (sha256 (base32 "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38")))) diff --git a/gnu/packages/patches/dconf-meson-0.52.patch b/gnu/packages/patches/dconf-meson-0.52.patch new file mode 100644 index 0000000000..c636edc108 --- /dev/null +++ b/gnu/packages/patches/dconf-meson-0.52.patch @@ -0,0 +1,19 @@ +Fix build failure with Meson 0.52. + +Taken from upstream: +https://gitlab.gnome.org/GNOME/dconf/commit/7ad890fb7a2ec90a777a756a1fa20a615ec7245e +https://gitlab.gnome.org/GNOME/dconf/merge_requests/54 + +diff --git a/client/meson.build b/client/meson.build +index f3b7122cb05bfa7bb481c487e3cd052aa1ad58e5..de6387e2cac2aba12b83f2614c277bada434fd16 100644 +--- a/client/meson.build ++++ b/client/meson.build +@@ -28,7 +28,7 @@ libdconf_client = static_library( + + libdconf_client_dep = declare_dependency( + dependencies: gio_dep, +- link_whole: libdconf_client, ++ link_with: libdconf_client, + ) + + libdconf = shared_library( -- cgit v1.2.3 From 12818a0656817e95a80aace01089042c0b0e7e22 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 6 Dec 2019 18:21:48 +0100 Subject: gnu: network-manager: Fix build with glibc 2.30. * gnu/packages/patches/network-manager-gettid.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (network-manager)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 3 ++- gnu/packages/patches/network-manager-gettid.patch | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/network-manager-gettid.patch diff --git a/gnu/local.mk b/gnu/local.mk index 234d283ee6..2b17423483 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1197,6 +1197,7 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ + %D%/packages/patches/network-manager-gettid.patch \ %D%/packages/patches/nfs-utils-missing-headers.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/nm-plugin-path.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 37873e42bc..464f2ad818 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5822,7 +5822,8 @@ users.") (uri (string-append "mirror://gnome/sources/NetworkManager/" (version-major+minor version) "/" "NetworkManager-" version ".tar.xz")) - (patches (search-patches "nm-plugin-path.patch")) + (patches (search-patches "nm-plugin-path.patch" + "network-manager-gettid.patch")) (sha256 (base32 "0pnh1wr2p1fqa5pr945fr3lngfc5ccfrmgddqsg55lxnjpv0ggd3")) diff --git a/gnu/packages/patches/network-manager-gettid.patch b/gnu/packages/patches/network-manager-gettid.patch new file mode 100644 index 0000000000..d50b5f8102 --- /dev/null +++ b/gnu/packages/patches/network-manager-gettid.patch @@ -0,0 +1,20 @@ +glibc 2.30 added gettid() which conflicts with the implementation in +NetworkManager. Remove for 1.17.1 and later versions. + +Adapted from upstream: +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/10276322bde8f015e48ac06f6a7509f514eb46f0 + +--- a/src/systemd/sd-adapt/nm-sd-adapt.h ++++ b/src/systemd/sd-adapt/nm-sd-adapt.h +@@ -181,9 +181,10 @@ + #endif + } + +-static inline pid_t gettid(void) { ++static inline pid_t _nm_gettid(void) { + return (pid_t) syscall(SYS_gettid); + } ++#define gettid() _nm_gettid () + + /* we build with C11 and thus provides char32_t,char16_t. */ + #define HAVE_CHAR32_T 1 -- cgit v1.2.3 From cc41e2b09f3a07c7b2baa59f79380c7812d47c69 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 6 Dec 2019 08:18:33 +0100 Subject: gnu: libsm: Do not build static library. * gnu/packages/xorg.scm (libsm)[arguments]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b3792122ac..a02a8eb9ef 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1226,6 +1226,8 @@ hit when running single-threaded.") (base32 "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (propagated-inputs `(("libice" ,libice))) ; SMlib.h includes ICElib.h (inputs -- cgit v1.2.3 From 25a2f2efa16860dce461c469aae11a4d0993e816 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 6 Dec 2019 19:10:35 +0100 Subject: gnu: sbcl-cffi: Update to 0.20.1. * gnu/packages/lisp-xyz.scm (sbcl-cffi-bootstrap): Update to 0.20.1. [arguments]: Update substitution for libffi 3.3. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3589640653..cfdef02cea 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2210,7 +2210,7 @@ non-consing thread safe queues and fibonacci priority queues.") (define sbcl-cffi-bootstrap (package (name "sbcl-cffi-bootstrap") - (version "0.19.0") + (version "0.20.1") (source (origin (method git-fetch) @@ -2219,7 +2219,7 @@ non-consing thread safe queues and fibonacci priority queues.") (commit (string-append "v" version)))) (file-name (git-file-name "cffi-bootstrap" version)) (sha256 - (base32 "09sfgc6r7ihmbkwfpvkq5fxc7h45cabpvgbvs47i5cvnmv3k72xy")))) + (base32 "1bzgdwd5yzkv9hwnxg6lqyh5z1vjgjyrl12c72afj7hxziadccm8")))) (build-system asdf-build-system/sbcl) (inputs `(("libffi" ,libffi) @@ -2234,7 +2234,7 @@ non-consing thread safe queues and fibonacci priority queues.") (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "libffi/libffi.lisp" - (("libffi.so.6" all) (string-append + (("libffi.so.7" all) (string-append (assoc-ref inputs "libffi") "/lib/" all))) (substitute* "toolchain/c-toolchain.lisp" -- cgit v1.2.3 From c6af97b70a46efc59e4bf22f4566ffa502306f3e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 6 Dec 2019 19:13:27 +0100 Subject: gnu: libfreehand: Fix build with ICU 65. * gnu/packages/libreoffice.scm (libfreehand)[arguments]: New field. --- gnu/packages/libreoffice.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 038031b800..3283f1b402 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -482,6 +482,17 @@ library primarily intended for language guessing.") (sha256 (base32 "1b1lvqh68rwij1yvmxy02hsmh7i74ma5767mk8mg5nx6chajshhf")))) (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'build 'adjust-for-ICU-65 + (lambda _ + ;; Fix build with ICU 65 and later. Taken from this + ;; upstream commit, remove for libfreehand > 0.1.2: + ;; https://gerrit.libreoffice.org/#/c/80224/ + (substitute* "src/lib/libfreehand_utils.cpp" + (("U16_NEXT.*" all) + (string-append all ";\n"))) + #t))))) (native-inputs `(("cppunit" ,cppunit) ("doxygen" ,doxygen) -- cgit v1.2.3 From a1badf864f53b16ab8a52e387a65bf06530c2311 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 15:39:23 +0100 Subject: gnu: lcms: Do not build static library. * gnu/packages/ghostscript.scm (lcms)[arguments]: New field. --- gnu/packages/ghostscript.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 72a38fddf5..2b3a359bd6 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -58,6 +58,8 @@ (sha256 (base32 "083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) (inputs `(("libjpeg" ,libjpeg) ("libtiff" ,libtiff) ("zlib" ,zlib))) -- cgit v1.2.3 From 2fc865d301de71ab66bcb29f9aac22479a512dfe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 15:58:05 +0100 Subject: gnu: gd: Do not build static library. * gnu/packages/gd.scm (gd)[arguments]: Add #:configure-flags. --- gnu/packages/gd.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 5b3f8509f8..6afccb7b0c 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -63,6 +63,7 @@ ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding ;; issues on aarch64 and other architectures. `(#:make-flags '("CFLAGS=-ffp-contract=off") + #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases ;; This test is known to fail on i686-linux: -- cgit v1.2.3 From bd0af90a4e543626f4802f81267f544096e35417 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 16:21:14 +0100 Subject: gnu: libXpm: Gettext is a native input. * gnu/packages/xorg.scm (libxpm)[inputs]: Move GETTEXT-MINIMAL ... [native-inputs]: ... here. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a02a8eb9ef..8f4d2c33ef 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1446,12 +1446,12 @@ treat it as part of their software base when porting.") (arguments '(#:configure-flags '("--disable-static"))) (inputs - `(("gettext" ,gettext-minimal) - ("libxt" ,libxt) + `(("libxt" ,libxt) ("xorgproto" ,xorgproto) ("libxext" ,libxext))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg XPM library") (description "XPM (X Pixmap) image file format library.") -- cgit v1.2.3 From 6a66709d385c607b928d0d5a425331d36fea40ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 16:21:57 +0100 Subject: gnu: libXpm: Update to 3.5.13. * gnu/packages/xorg.scm (libxpm): Update to 3.5.13. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8f4d2c33ef..a7ec5851e2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1431,7 +1431,7 @@ treat it as part of their software base when porting.") (define-public libxpm (package (name "libxpm") - (version "3.5.12") + (version "3.5.13") (source (origin (method url-fetch) @@ -1441,7 +1441,7 @@ treat it as part of their software base when porting.") ".tar.bz2")) (sha256 (base32 - "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx")))) + "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 9039f0b7b61f56f70e8beb41ec02bcb96f12aacb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 16:26:23 +0100 Subject: gnu: CMake: Update to 3.16.2. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.16.2. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 806a7396e9..556e98afc1 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -51,7 +51,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.16.0") + (version "3.16.2") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -59,7 +59,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "0pwcgvk75577rdizpzjrk2n43a6l7rvfhmhn7sd6xarwqrb6b9bd")) + "1ag65ignli58kpmji6gjhj8xw4w1qdr910i99hsvx8hcqrp7h2cc")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 343139dabbe858c9e34544ba21fab34fbc6df20d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 16:29:13 +0100 Subject: gnu: cURL: Update to 7.68.0. * gnu/packages/curl.scm (curl): Update to 7.68.0. --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index a05c8e2c79..ee1cca449b 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,14 +50,14 @@ (define-public curl (package (name "curl") - (version "7.67.0") + (version "7.68.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "0v2k1v28ams5fa9gkybmnpnlkfqa2im5diywa8wqqcvr0crfglpm")))) + "0nh3j90w6b97wqcgxjfq55qhkz9s38955fbhwzv2fsi7483j895p")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages -- cgit v1.2.3 From b9f71df3773c8cbe799cec1362aa5fb8314f7e13 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 16:47:37 +0100 Subject: gnu: fribidi: Update to 1.0.8. * gnu/packages/patches/fribidi-CVE-2019-18397.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/fribidi.scm (fribidi): Update to 1.0.8. --- gnu/local.mk | 1 - gnu/packages/fribidi.scm | 5 ++--- gnu/packages/patches/fribidi-CVE-2019-18397.patch | 26 ----------------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 gnu/packages/patches/fribidi-CVE-2019-18397.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2b17423483..63f84ab459 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -859,7 +859,6 @@ dist_patch_DATA = \ %D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ - %D%/packages/patches/fribidi-CVE-2019-18397.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/gawk-shell.patch \ diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index b6cabdc4b0..8fa0e6d980 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -28,7 +28,7 @@ (define-public fribidi (package (name "fribidi") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) @@ -37,8 +37,7 @@ "/download/v" version "/fribidi-" version ".tar.bz2")) (sha256 - (base32 "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das")) - (patches (search-patches "fribidi-CVE-2019-18397.patch")))) + (base32 "0v0ybhck9vz4yayihydknmikslh3xfxygzywnh9rcamdhs6vdiwl")))) (build-system gnu-build-system) (synopsis "Implementation of the Unicode bidirectional algorithm") (description diff --git a/gnu/packages/patches/fribidi-CVE-2019-18397.patch b/gnu/packages/patches/fribidi-CVE-2019-18397.patch deleted file mode 100644 index aff1a669b2..0000000000 --- a/gnu/packages/patches/fribidi-CVE-2019-18397.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch - -From 034c6e9a1d296286305f4cfd1e0072b879f52568 Mon Sep 17 00:00:00 2001 -From: Dov Grobgeld -Date: Thu, 24 Oct 2019 09:37:29 +0300 -Subject: [PATCH] Truncate isolate_level to FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL - ---- - lib/fribidi-bidi.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c -index 6c84392..d384878 100644 ---- a/lib/fribidi-bidi.c -+++ b/lib/fribidi-bidi.c -@@ -747,7 +747,9 @@ fribidi_get_par_embedding_levels_ex ( - } - - RL_LEVEL (pp) = level; -- RL_ISOLATE_LEVEL (pp) = isolate_level++; -+ RL_ISOLATE_LEVEL (pp) = isolate_level; -+ if (isolate_level < FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL-1) -+ isolate_level++; - base_level_per_iso_level[isolate_level] = new_level; - - if (!FRIBIDI_IS_NEUTRAL (override)) -- cgit v1.2.3 From 972a3e0b1e40eeb58350fa322122890bd776f3d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 16:50:10 +0100 Subject: gnu: mit-krb5: Update to 1.17.1. * gnu/packages/kerberos.scm (mit-krb5): Update to 1.17.1. --- gnu/packages/kerberos.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index bf344ce8ce..7435566c06 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -50,7 +50,7 @@ (define-public mit-krb5 (package (name "mit-krb5") - (version "1.17") + (version "1.17.1") (source (origin (method url-fetch) (uri (list @@ -62,7 +62,7 @@ "/krb5-" version ".tar.gz"))) (sha256 (base32 - "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs")))) + "10dimzcdzk9s79291qb4s3kwmbpb8bvppa6k6873wxxa5vndf1ip")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From ef2782d7b4f82e5744e956a64492c883d6455132 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 16:52:34 +0100 Subject: gnu: libarchive: Update to 3.4.1. * gnu/packages/backup.scm (libarchive): Update to 3.4.1. [source](uri): Change to ".xz" tarball. --- gnu/packages/backup.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index e663cdc4cb..434b9a9c58 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -200,18 +200,18 @@ backups (called chunks) to allow easy burning to CD/DVD.") (define-public libarchive (package (name "libarchive") - (version "3.4.0") + (version "3.4.1") (source (origin (method url-fetch) (uri (list (string-append "https://libarchive.org/downloads/libarchive-" - version ".tar.gz") + version ".tar.xz") (string-append "https://github.com/libarchive/libarchive" "/releases/download/v" version "/libarchive-" - version ".tar.gz"))) + version ".tar.xz"))) (sha256 (base32 - "0pl25mmz1b1cnwf35kxmygyy9g7z7hslxbx329a9yx8csh7dahw6")))) + "1xs2c3fsss1g2a6yzip98j9bl93pxd3gqwr4ivh2fc6c10py115v")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) -- cgit v1.2.3 From ceaf180526a81c025554717feb9d63080e550d19 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 16:55:04 +0100 Subject: gnu: libjpeg-turbo: Update to 2.0.4. * gnu/packages/patches/libjpeg-turbo-CVE-2019-2201.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/image.scm (libjpeg-turbo): Update to 2.0.4. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/image.scm | 5 ++-- .../patches/libjpeg-turbo-CVE-2019-2201.patch | 31 ---------------------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/libjpeg-turbo-CVE-2019-2201.patch diff --git a/gnu/local.mk b/gnu/local.mk index 63f84ab459..60b3b652f1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1086,7 +1086,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libgpg-error-gawk-compat.patch \ - %D%/packages/patches/libjpeg-turbo-CVE-2019-2201.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/libotr-test-auth-fix.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c433429656..c70a60584b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1487,15 +1487,14 @@ is hereby granted.")))) (define-public libjpeg-turbo (package (name "libjpeg-turbo") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libjpeg-turbo/" version "/libjpeg-turbo-" version ".tar.gz")) - (patches (search-patches "libjpeg-turbo-CVE-2019-2201.patch")) (sha256 (base32 - "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2")))) + "01ill8bgjyk582wipx7sh7gj2nidylpbzvwhx0wkcm6mxx3qbp9k")))) (build-system cmake-build-system) (native-inputs `(("nasm" ,nasm))) diff --git a/gnu/packages/patches/libjpeg-turbo-CVE-2019-2201.patch b/gnu/packages/patches/libjpeg-turbo-CVE-2019-2201.patch deleted file mode 100644 index 35f2bf5963..0000000000 --- a/gnu/packages/patches/libjpeg-turbo-CVE-2019-2201.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix integer overflow which can potentially lead to RCE. - -https://www.openwall.com/lists/oss-security/2019/11/11/1 -https://nvd.nist.gov/vuln/detail/CVE-2019-2201 - -The problem was partially fixed in 2.0.3. This patch is a follow-up. -https://github.com/libjpeg-turbo/libjpeg-turbo/issues/388 -https://github.com/libjpeg-turbo/libjpeg-turbo/commit/c30b1e72dac76343ef9029833d1561de07d29bad - -diff --git a/tjbench.c b/tjbench.c -index a7d397318..13a5bde62 100644 ---- a/tjbench.c -+++ b/tjbench.c -@@ -171,7 +171,7 @@ static int decomp(unsigned char *srcBuf, unsigned char **jpegBuf, - } - /* Set the destination buffer to gray so we know whether the decompressor - attempted to write to it */ -- memset(dstBuf, 127, pitch * scaledh); -+ memset(dstBuf, 127, (size_t)pitch * scaledh); - - if (doYUV) { - int width = doTile ? tilew : scaledw; -@@ -193,7 +193,7 @@ static int decomp(unsigned char *srcBuf, unsigned char **jpegBuf, - double start = getTime(); - - for (row = 0, dstPtr = dstBuf; row < ntilesh; -- row++, dstPtr += pitch * tileh) { -+ row++, dstPtr += (size_t)pitch * tileh) { - for (col = 0, dstPtr2 = dstPtr; col < ntilesw; - col++, tile++, dstPtr2 += ps * tilew) { - int width = doTile ? min(tilew, w - col * tilew) : scaledw; -- cgit v1.2.3 From 5184cbe5500abb48ce6a5be04655e0d357d04042 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 16:56:55 +0100 Subject: gnu: meson: Update to 0.53.0. * gnu/packages/build-tools.scm (meson): Update to 0.53.0. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index cffe59f309..006b0c48f2 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -168,7 +168,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.52.1") + (version "0.53.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -176,7 +176,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "0df0iw94cx6jiqd0liw8ax1by3dqaw6fdqrxgr9sal4rwir789qc")))) + "1xnkm4q9gk71nsdmrrmq7rv7lffgcif86awhpyg6rymn7acpaph3")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From e468843db38017849ea026f865827cc127dfaad7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 17:00:49 +0100 Subject: gnu: RHash: Do not use unstable source tarball. * gnu/packages/crypto.scm (rhash)[source]: Change to GIT-FETCH. --- gnu/packages/crypto.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index db39166d45..b63e322a9f 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -702,13 +702,14 @@ BLAKE.") (version "1.3.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/rhash/RHash/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rhash/RHash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0k60ywyhwqwqxa2q2l85vwgf884hcgy31nxir3dqgz7ymib6llxy")))) + "0i00wl63hn80g0s9gdi772gchbghwgkvn4nbb5227y2wwy30yyi2")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 23c883ef832d45387bb2a11451411a76be0c034f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 17:01:40 +0100 Subject: gnu: RHash: Update to 1.3.9. * gnu/packages/crypto.scm (rhash): Update to 1.3.9. [arguments]: Add phase 'patch-/bin/sh'. --- gnu/packages/crypto.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index b63e322a9f..91fbe6a8e4 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -699,7 +699,7 @@ BLAKE.") (define-public rhash (package (name "rhash") - (version "1.3.8") + (version "1.3.9") (source (origin (method git-fetch) @@ -709,7 +709,7 @@ BLAKE.") (file-name (git-file-name name version)) (sha256 (base32 - "0i00wl63hn80g0s9gdi772gchbghwgkvn4nbb5227y2wwy30yyi2")))) + "06i49x1l21h2q7pfnf4crbmjyg8b9ad0qs10ywyyn5sjpi0c21wq")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -724,6 +724,11 @@ BLAKE.") (lambda* (#:key outputs #:allow-other-keys) (invoke "./configure" (string-append "--prefix=" (assoc-ref outputs "out"))))) + (add-before 'check 'patch-/bin/sh + (lambda _ + (substitute* "Makefile" + (("/bin/sh") (which "sh"))) + #t)) (add-after 'install 'install-library-extras (lambda* (#:key make-flags #:allow-other-keys) (apply invoke -- cgit v1.2.3 From b34c1258515e75bcc73be7911fd7d237db1dd14b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 17:10:47 +0100 Subject: gnu: doxygen: Update to 1.8.17. * gnu/packages/documentation.scm (doxygen): Update to 1.8.17. [source](patches): Add doxygen-1.8.17-runtests.patch. [arguments]: Remove obsolete phase. * gnu/packages/patches/doxygen-test.patch: Adjust for upstream changes. * gnu/packages/patches/doxygen-1.8.17-runtests.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 + gnu/packages/documentation.scm | 14 ++--- gnu/packages/patches/doxygen-1.8.17-runtests.patch | 73 ++++++++++++++++++++++ gnu/packages/patches/doxygen-test.patch | 4 +- 4 files changed, 80 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/doxygen-1.8.17-runtests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 60b3b652f1..e2b605e0b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -814,6 +814,7 @@ dist_patch_DATA = \ %D%/packages/patches/docker-use-fewer-modprobes.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/doxygen-test.patch \ + %D%/packages/patches/doxygen-1.8.17-runtests.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index c512a9803b..c4a8c0242d 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -125,7 +125,7 @@ markup) can be customized and extended by the user.") (define-public doxygen (package (name "doxygen") - (version "1.8.16") + (version "1.8.17") (home-page "http://www.doxygen.nl/") (source (origin (method url-fetch) @@ -136,8 +136,9 @@ markup) can be customized and extended by the user.") ".src.tar.gz"))) (sha256 (base32 - "10iwv8bcz5b5cd85gg8pgn0bmyg04n9hs36xn7ggjjnvynv1z67z")) - (patches (search-patches "doxygen-test.patch")))) + "16dmv0gm1x8rvbm82fmjvi213q8fxqxinm75pcf595flya59ific")) + (patches (search-patches "doxygen-test.patch" + "doxygen-1.8.17-runtests.patch")))) (build-system cmake-build-system) (native-inputs `(("bison" ,bison) @@ -157,13 +158,6 @@ markup) can be customized and extended by the user.") '()) #:test-target "tests" #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-git-requirement - (lambda _ - ;; TODO: Remove this for > 1.8.16. - (substitute* "cmake/git_watcher.cmake" - (("Git QUIET REQUIRED") - "Git QUIET")) - #t)) (add-before 'configure 'patch-sh (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/portable.cpp" diff --git a/gnu/packages/patches/doxygen-1.8.17-runtests.patch b/gnu/packages/patches/doxygen-1.8.17-runtests.patch new file mode 100644 index 0000000000..0340c72448 --- /dev/null +++ b/gnu/packages/patches/doxygen-1.8.17-runtests.patch @@ -0,0 +1,73 @@ +1.8.17 was released with a broken test runner. + +https://github.com/doxygen/doxygen/issues/7464 + +Taken from upstream: +https://github.com/doxygen/doxygen/commit/cd9dee013dc749a10bbe019c350e0e62b6635795 + +diff --git a/testing/runtests.py b/testing/runtests.py +index a4118b865..10fe50214 100755 +--- a/testing/runtests.py ++++ b/testing/runtests.py +@@ -3,6 +3,7 @@ + from __future__ import print_function + import argparse, glob, itertools, re, shutil, os, sys + import subprocess ++import shlex + + config_reg = re.compile('.*\/\/\s*(?P\S+):\s*(?P.*)$') + +@@ -28,10 +29,10 @@ def xpopen(cmd, cmd1="",encoding='utf-8-sig', getStderr=False): + return os.popen(cmd).read() # Python 2 without encoding + else: + if (getStderr): +- proc = subprocess.run(cmd1,encoding=encoding,capture_output=True) # Python 3 with encoding +- return proc.stderr ++ proc = subprocess.Popen(shlex.split(cmd1),stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding ++ return proc.stderr.read() + else: +- proc = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding ++ proc = subprocess.Popen(shlex.split(cmd),stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding + return proc.stdout.read() + + class Tester: +@@ -137,7 +138,7 @@ def prepare_test(self): + print('GENERATE_DOCBOOK=NO', file=f) + if (self.args.xhtml): + print('GENERATE_HTML=YES', file=f) +- # HTML_OUTPUT can also be set locally ++ # HTML_OUTPUT can also have been set locally + print('HTML_OUTPUT=%s/html' % self.test_out, file=f) + print('HTML_FILE_EXTENSION=.xhtml', file=f) + if (self.args.pdf): +@@ -184,7 +185,7 @@ def update_test(self,testmgr): + print('Non-existing file %s after \'check:\' statement' % check_file) + return + # convert output to canonical form +- data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read() ++ data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)) + if data: + # strip version + data = re.sub(r'xsd" version="[0-9.-]+"','xsd" version=""',data).rstrip('\n') +@@ -326,7 +327,7 @@ def perform_test(self,testmgr): + tests.append(glob.glob('%s/*.xml' % (docbook_output))) + tests.append(glob.glob('%s/*/*/*.xml' % (docbook_output))) + tests = ' '.join(list(itertools.chain.from_iterable(tests))).replace(self.args.outputdir +'/','').replace('\\','/') +- exe_string = '%s --nonet --postvalid %s' % (self.args.xmllint,tests) ++ exe_string = '%s --noout --nonet --postvalid %s' % (self.args.xmllint,tests) + exe_string1 = exe_string + exe_string += ' %s' % (redirx) + exe_string += ' %s more "%s/temp"' % (separ,docbook_output) +@@ -346,7 +347,11 @@ def perform_test(self,testmgr): + redirx=' 2> %s/temp >nul:'%html_output + else: + redirx='2>%s/temp >/dev/null'%html_output +- exe_string = '%s --path dtd --nonet --postvalid %s/*xhtml' % (self.args.xmllint,html_output) ++ check_file = [] ++ check_file.append(glob.glob('%s/*.xhtml' % (html_output))) ++ check_file.append(glob.glob('%s/*/*/*.xhtml' % (html_output))) ++ check_file = ' '.join(list(itertools.chain.from_iterable(check_file))).replace(self.args.outputdir +'/','').replace('\\','/') ++ exe_string = '%s --noout --path dtd --nonet --postvalid %s' % (self.args.xmllint,check_file) + exe_string1 = exe_string + exe_string += ' %s' % (redirx) + exe_string += ' %s more "%s/temp"' % (separ,html_output) diff --git a/gnu/packages/patches/doxygen-test.patch b/gnu/packages/patches/doxygen-test.patch index a2da54a3fa..1c0d4eb946 100644 --- a/gnu/packages/patches/doxygen-test.patch +++ b/gnu/packages/patches/doxygen-test.patch @@ -52,9 +52,9 @@ diff -u -r doxygen-1.8.7.orig/testing/012/indexpage.xml doxygen-1.8.7/testing/01 - See [3] for more info. -- Oter references with crosreference see [1] and [2] for more info. +- Other references with cross references see [1] and [2] for more info. + See knuth79 for more info. -+ Oter references with crosreference see Be09 and BertholdHeinzVigerske2009 for more info. ++ Other references with cross references see Be09 and BertholdHeinzVigerske2009 for more info. -- cgit v1.2.3 From f62df4cbf275964ebba1b88ae584caf3f629efd8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 18:34:12 +0100 Subject: gnu: libpaper: Do not build the static library. * gnu/packages/ghostscript.scm (libpaper)[arguments]: Add #:configure-flags. --- gnu/packages/ghostscript.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 2b3a359bd6..c63fc2f9f9 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -90,7 +90,8 @@ Consortium standard (ICC), approved as ISO 15076-1.") (native-inputs `(("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'. (arguments - `(#:phases + `(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-configure (lambda* (#:key inputs native-inputs #:allow-other-keys) -- cgit v1.2.3 From 9d2c24d22780f6db8b2190905dcff6c8d498df56 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 18:41:39 +0100 Subject: gnu: teckit: Do not build the static library. * gnu/packages/fontutils.scm (teckit)[arguments]: New field. --- gnu/packages/fontutils.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 97d4cae872..b5c8d27c7e 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -403,6 +403,8 @@ X11-system or any other graphical user interface.") (sha256 (base32 "0gbxyip4wdibirdg2pvzayzyy927vxyd6dfyfiflx8zg88qzn8v8")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("zlib" ,zlib) ("expat" ,expat))) -- cgit v1.2.3 From 02fef9619bd96086aa9255ffb0944d4cda617c84 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 19:03:12 +0100 Subject: gnu: Boost: Update to 1.72.0. * gnu/packages/patches/boost-dumpversion.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/boost.scm (boost): Update to 1.72.0. [source](uri): Remove defunct mirror. [source](patches): Remove. [arguments]: Adjust /bin/sh substitutions. Remove obsolete workaround. --- gnu/local.mk | 1 - gnu/packages/boost.scm | 25 ++++++++----------------- gnu/packages/patches/boost-dumpversion.patch | 24 ------------------------ 3 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 gnu/packages/patches/boost-dumpversion.patch diff --git a/gnu/local.mk b/gnu/local.mk index e2b605e0b8..2a60a8d4c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -750,7 +750,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ - %D%/packages/patches/boost-dumpversion.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 3665dccb56..1f896d3811 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,21 +47,17 @@ (define-public boost (package (name "boost") - (version "1.70.0") + (version "1.72.0") (source (origin (method url-fetch) (uri (let ((version-with-underscores (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version))) - (list (string-append "mirror://sourceforge/boost/boost/" version - "/boost_" version-with-underscores ".tar.bz2") - (string-append "https://dl.bintray.com/boostorg/release/" - version "/source/boost_" - version-with-underscores ".tar.bz2")))) - (patches - (search-patches "boost-dumpversion.patch")) + (string-append "https://dl.bintray.com/boostorg/release/" + version "/source/boost_" + version-with-underscores ".tar.bz2"))) (sha256 (base32 - "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")))) + "08h7cv61fd0lzb4z50xanfqn0pdgvizjrpd1kcdgj725pisb5jar")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) ("zlib" ,zlib))) @@ -75,11 +72,6 @@ #:make-flags (list "threading=multi" "link=shared" - ;; XXX: Disable installation of Boosts modular CMake config scripts - ;; which conflicts in 1.70.0 with the ones provided by CMake. - ;; See . - "--no-cmake-config" - ;; Set the RUNPATH to $libdir so that the libs find each other. (string-append "linkflags=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib") @@ -109,9 +101,8 @@ (out (assoc-ref outputs "out"))) (substitute* '("libs/config/configure" "libs/spirit/classic/phoenix/test/runtest.sh" - "tools/build/src/engine/execunix.c" - "tools/build/src/engine/Jambase" - "tools/build/src/engine/jambase.c") + "tools/build/src/engine/execunix.cpp" + "tools/build/src/engine/Jambase") (("/bin/sh") (which "sh"))) (setenv "SHELL" (which "sh")) diff --git a/gnu/packages/patches/boost-dumpversion.patch b/gnu/packages/patches/boost-dumpversion.patch deleted file mode 100644 index 7df779cfe6..0000000000 --- a/gnu/packages/patches/boost-dumpversion.patch +++ /dev/null @@ -1,24 +0,0 @@ -This issue is described here: https://github.com/openwrt/packages/pull/8685 -and has not been solved as of 1.70.0 release. - ---- a/tools/build/src/tools/common.jam -+++ b/tools/build/src/tools/common.jam -@@ -973,18 +973,6 @@ - } - } - -- # From GCC 5, versioning changes and minor becomes patch -- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ] -- { -- version = $(version[1]) ; -- } -- -- # Ditto, from Clang 4 -- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ] -- { -- version = $(version[1]) ; -- } -- - # On intel, version is not added, because it does not matter and it is the - # version of vc used as backend that matters. Ideally, we should encode the - # backend version but that would break compatibility with V1. -- cgit v1.2.3 From 2ac164a8107dbb07ba1ed29986859d3e936f795a Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sun, 8 Dec 2019 22:18:35 +0100 Subject: gnu: Boost: Use Python 3 by default. * gnu/packages/boost.scm (boost)[inputs]: Change PYTHON-2 to PYTHON-WRAPPER. [arguments]: Add #:modules and #:imported-modules. Adjust phases 'configure' and 'provide-libboost_python.so' to be agnostic of Python version. * gnu/packages/boost.scm (boost-with-python3): Rename to ... * gnu/packages/boost.scm (boost-with-python2): ... this. [arguments]: Remove. [native-inputs]: Inherit from BOOST, but replace the "python" input with PYTHON-2. Co-authored-by: Marius Bakke --- gnu/packages/boost.scm | 100 +++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 58 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 1f896d3811..c00db88654 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019 Mathieu Othacehe -;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2019, 2020 Giacomo Leidi ;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -42,7 +42,8 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages perl) #:use-module (gnu packages python) - #:use-module (gnu packages shells)) + #:use-module (gnu packages shells) + #:use-module (srfi srfi-1)) (define-public boost (package @@ -65,10 +66,14 @@ `(("perl" ,perl) ,@(if (%current-target-system) '() - `(("python" ,python-2))) + `(("python" ,python-wrapper))) ("tcsh" ,tcsh))) (arguments - `(#:tests? #f + `(#:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) + #:modules (((guix build python-build-system) #:select (python-version)) + ,@%gnu-build-system-modules) + #:tests? #f #:make-flags (list "threading=multi" "link=shared" @@ -98,6 +103,7 @@ (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let ((icu (assoc-ref inputs "icu4c")) + (python (assoc-ref inputs "python")) (out (assoc-ref outputs "out"))) (substitute* '("libs/config/configure" "libs/spirit/classic/phoenix/test/runtest.sh" @@ -116,11 +122,23 @@ ,(%current-target-system))))) '()) + (when (which "python3") + (substitute* "tools/build/src/tools/python.jam" + (("include/python\\$\\(version\\)") + "include/python$(version)m"))) + (invoke "./bootstrap.sh" (string-append "--prefix=" out) ;; Auto-detection looks for ICU only in traditional ;; install locations. (string-append "--with-icu=" icu) + ;; Ditto for Python. + ,@(if (%current-target-system) + '() + `((string-append "--with-python-root=" python) + (string-append "--with-python=" python "/bin/python") + (string-append "--with-python-version=" + (python-version python)))) "--with-toolset=gcc")))) (replace 'build (lambda* (#:key make-flags #:allow-other-keys) @@ -133,16 +151,23 @@ ,@(if (%current-target-system) '() '((add-after 'install 'provide-libboost_python - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Boost can build support for both Python 2 and - ;; Python 3 since version 1.67.0, and suffixes each - ;; library with the Python version. Many consumers - ;; only check for libboost_python however, so we - ;; provide it here as suggested in - ;; . + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python-version (python-version + (assoc-ref inputs "python"))) + (libboost_pythonNN.so + (string-append "libboost_python" + (string-join (string-split + python-version #\.) + "") + ".so"))) (with-directory-excursion (string-append out "/lib") - (symlink "libboost_python27.so" "libboost_python.so")) + (symlink libboost_pythonNN.so "libboost_python.so") + ;; Some packages only look for the major version. + (symlink libboost_pythonNN.so + (string-append "libboost_python" + (string-take python-version 1) + ".so"))) #t)))))))) (home-page "https://www.boost.org") @@ -153,54 +178,13 @@ across a broad spectrum of applications.") (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt" "Some components have other similar licences.")))) -;; TODO: Merge with 'Boost' in the next rebuild cycle. -(define-public boost-with-python3 +(define-public boost-with-python2 (package (inherit boost) - (name "boost-python3") + (name "boost-python2") (native-inputs - `(("perl" ,perl) - ("python" ,python) - ("tcsh" ,tcsh))) - (arguments (substitute-keyword-arguments (package-arguments boost) - ((#:phases phases) - `(modify-phases ,phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((icu (assoc-ref inputs "icu4c")) - (python (assoc-ref inputs "python")) - (out (assoc-ref outputs "out"))) - (substitute* '("libs/config/configure" - "libs/spirit/classic/phoenix/test/runtest.sh" - "tools/build/src/engine/execunix.c" - "tools/build/src/engine/Jambase" - "tools/build/src/engine/jambase.c") - (("/bin/sh") (which "sh"))) - - (setenv "SHELL" (which "sh")) - (setenv "CONFIG_SHELL" (which "sh")) - - (substitute* "tools/build/src/tools/python.jam" - (("include/python\\$\\(version\\)") - "include/python$(version)m")) - - (invoke "./bootstrap.sh" - (string-append "--prefix=" out) - ;; Auto-detection looks for dependencies only - ;; in traditional install locations. - (string-append "--with-icu=" icu) - (string-append "--with-python=" python "/bin/python3") - (string-append "--with-python-root=" python) - "--with-python-version=3.7" - "--with-toolset=gcc")))) - (replace 'provide-libboost_python - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion (string-append out "/lib") - (symlink "libboost_python37.so" "libboost_python.so") - ;; Some packages also look for libboost_python3.so - (symlink "libboost_python37.so" "libboost_python3.so")) - #t))))))))) + `(("python" ,python-2) + ,@(alist-delete "python" (package-native-inputs boost)))))) (define-public boost-static (package -- cgit v1.2.3 From a82e6faa8b993d1f3b47a8bd22c4509f7cae7ec1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 21:35:21 +0100 Subject: gnu: vigra: Build with Python 3. * gnu/packages/patches/vigra-python-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/image.scm (vigra)[source](patches): New field. [inputs]: Change PYTHON-2 and PYTHON2-NUMPY to PYTHON and PYTHON-NUMPY. [native-inputs]: Change from PYTHON2-NOSE to PYTHON. [arguments]: Adjust #:configure-flags accordingly. --- gnu/local.mk | 1 + gnu/packages/image.scm | 14 +++++++++----- gnu/packages/patches/vigra-python-compat.patch | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/vigra-python-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2a60a8d4c7..802884a74f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1450,6 +1450,7 @@ dist_patch_DATA = \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ %D%/packages/patches/vboot-utils-skip-test-workbuf.patch \ + %D%/packages/patches/vigra-python-compat.patch \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c70a60584b..298bff3450 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2018, 2019 Marius Bakke +;;; Copyright © 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Rutger Helling @@ -76,6 +76,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system meson) @@ -1007,6 +1008,7 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") (uri (string-append "https://github.com/ukoethe/vigra/releases/download/" "Version-" (string-join (string-split version #\.) "-") "/vigra-" version "-src.tar.gz")) + (patches (search-patches "vigra-python-compat.patch")) (sha256 (base32 "1bqs8vx5i1bzamvv563i24gx2xxdidqyxh9iaj46mbznhc84wmm5")))) (build-system cmake-build-system) @@ -1021,12 +1023,12 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") ("libpng" ,libpng) ("libtiff" ,libtiff) ("openexr" ,openexr) - ("python" ,python-2) ; print syntax - ("python2-numpy" ,python2-numpy) + ("python" ,python) + ("python-numpy" ,python-numpy) ("zlib" ,zlib))) (native-inputs `(("doxygen" ,doxygen) - ("python2-nose" ,python2-nose) + ("python-nose" ,python-nose) ("sphinx" ,python-sphinx))) (arguments `(#:test-target "check" @@ -1046,7 +1048,9 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") (list "-Wno-dev" ; suppress developer mode with lots of warnings (string-append "-DVIGRANUMPY_INSTALL_DIR=" (assoc-ref %outputs "out") - "/lib/python2.7/site-packages") + "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages") ;; OpenEXR is not enabled by default. "-DWITH_OPENEXR=1" ;; Fix rounding error on 32-bit machines diff --git a/gnu/packages/patches/vigra-python-compat.patch b/gnu/packages/patches/vigra-python-compat.patch new file mode 100644 index 0000000000..63c6abb326 --- /dev/null +++ b/gnu/packages/patches/vigra-python-compat.patch @@ -0,0 +1,18 @@ +Fix build with Boost + Python 3.7. + +Taken from upstream: +https://github.com/ukoethe/vigra/commit/a6fa62663c6a6b752ed0707e95f643e25867a0f9 + +diff --git a/vigranumpy/src/core/vigranumpycore.cxx b/vigranumpy/src/core/vigranumpycore.cxx +index ec38d3636..c81c6ae52 100644 +--- a/vigranumpy/src/core/vigranumpycore.cxx ++++ b/vigranumpy/src/core/vigranumpycore.cxx +@@ -61,7 +61,7 @@ UInt32 pychecksum(python::str const & s) + return checksum(data, size); + #else + Py_ssize_t size = 0; +- char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size); ++ const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size); + return checksum(data, size); + #endif + } -- cgit v1.2.3 From 9d3b6a5d65505018186d778c4812c3c90aab3527 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 22:27:48 +0100 Subject: Revert "gnu: network-manager: Fix build with glibc 2.30." This commit was obsolete by the time it was pushed, whoops! This reverts commit 12818a0656817e95a80aace01089042c0b0e7e22. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 3 +-- gnu/packages/patches/network-manager-gettid.patch | 20 -------------------- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 gnu/packages/patches/network-manager-gettid.patch diff --git a/gnu/local.mk b/gnu/local.mk index 802884a74f..7462445c98 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1195,7 +1195,6 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ - %D%/packages/patches/network-manager-gettid.patch \ %D%/packages/patches/nfs-utils-missing-headers.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/nm-plugin-path.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 464f2ad818..37873e42bc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5822,8 +5822,7 @@ users.") (uri (string-append "mirror://gnome/sources/NetworkManager/" (version-major+minor version) "/" "NetworkManager-" version ".tar.xz")) - (patches (search-patches "nm-plugin-path.patch" - "network-manager-gettid.patch")) + (patches (search-patches "nm-plugin-path.patch")) (sha256 (base32 "0pnh1wr2p1fqa5pr945fr3lngfc5ccfrmgddqsg55lxnjpv0ggd3")) diff --git a/gnu/packages/patches/network-manager-gettid.patch b/gnu/packages/patches/network-manager-gettid.patch deleted file mode 100644 index d50b5f8102..0000000000 --- a/gnu/packages/patches/network-manager-gettid.patch +++ /dev/null @@ -1,20 +0,0 @@ -glibc 2.30 added gettid() which conflicts with the implementation in -NetworkManager. Remove for 1.17.1 and later versions. - -Adapted from upstream: -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/10276322bde8f015e48ac06f6a7509f514eb46f0 - ---- a/src/systemd/sd-adapt/nm-sd-adapt.h -+++ b/src/systemd/sd-adapt/nm-sd-adapt.h -@@ -181,9 +181,10 @@ - #endif - } - --static inline pid_t gettid(void) { -+static inline pid_t _nm_gettid(void) { - return (pid_t) syscall(SYS_gettid); - } -+#define gettid() _nm_gettid () - - /* we build with C11 and thus provides char32_t,char16_t. */ - #define HAVE_CHAR32_T 1 -- cgit v1.2.3 From 691068f08d23464865162656f0a87223dda93c00 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Jan 2020 14:36:01 +0100 Subject: gnu: vigra: Fix 'vigra-config' executable. This fixes a regression introduced in a82e6faa8b993d1f3b47a8bd22c4509f7cae7ec1 where 'vigra-config' would lack a usable shebang because no 'python' executable was available. * gnu/packages/image.scm (vigra)[inputs]: Change from PYTHON to PYTHON-WRAPPER. --- gnu/packages/image.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 298bff3450..06fe4cb2aa 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1023,7 +1023,7 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") ("libpng" ,libpng) ("libtiff" ,libtiff) ("openexr" ,openexr) - ("python" ,python) + ("python" ,python-wrapper) ("python-numpy" ,python-numpy) ("zlib" ,zlib))) (native-inputs -- cgit v1.2.3 From 5cde458bd519f0765716afca84627052eee16489 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Jan 2020 15:25:49 +0100 Subject: gnu: boost: Add upstream patch. * gnu/packages/boost.scm (version-with-underscores, boost-patch): New procedures. (boost)[source](uri): Remove LET binding for VERSION-WITH-UNDERSCORES. [source](patches): New field. --- gnu/packages/boost.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index c00db88654..e44087dcb5 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -45,17 +45,32 @@ #:use-module (gnu packages shells) #:use-module (srfi srfi-1)) +(define (version-with-underscores version) + (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)) + +(define (boost-patch name version hash) + (origin + (method url-fetch) + (uri (string-append "https://www.boost.org/patches/" + (version-with-underscores version) "/" name)) + (file-name (string-append "boost-" name)) + (sha256 (base32 hash)))) + (define-public boost (package (name "boost") (version "1.72.0") (source (origin (method url-fetch) - (uri (let ((version-with-underscores - (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version))) - (string-append "https://dl.bintray.com/boostorg/release/" - version "/source/boost_" - version-with-underscores ".tar.bz2"))) + (uri (string-append "https://dl.bintray.com/boostorg/release/" + version "/source/boost_" + (version-with-underscores version) ".tar.bz2")) + (patches + (list (boost-patch + ;; 1.72.0 was released with a faulty coroutine submodule: + ;; . + "0001-revert-cease-dependence-on-range.patch" version + "1zcqxzh56m1s635wqwk15j3zcs2gmjvjy2f0hid7i78s4pgm0yfs"))) (sha256 (base32 "08h7cv61fd0lzb4z50xanfqn0pdgvizjrpd1kcdgj725pisb5jar")))) -- cgit v1.2.3 From 8419a7ed44ee86e1b93b9dd1779c9ab192f98175 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Jan 2020 18:42:59 +0100 Subject: gnu: dblatex: Update to 0.3.11. * gnu/packages/docbook.scm (dblatex): Update to 0.3.11. --- gnu/packages/docbook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index d114e24ee7..dcb58af44e 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -183,7 +183,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (define-public dblatex (package (name "dblatex") - (version "0.3.10") + (version "0.3.11") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/dblatex/dblatex/" @@ -191,7 +191,7 @@ by no means limited to these applications.) This package provides XML DTDs.") version ".tar.bz2")) (sha256 (base32 - "1yicd861rqz78i2khl35j7nvc0ccv4jx4hzqrbhll17082vrdmkg")))) + "0rp1bc2lgisigscq1i7zxfd2qdaxxxld6khbcxss4pq7fpi9fzkv")))) (build-system python-build-system) ;; TODO: Add xfig/transfig for fig2dev utility (inputs -- cgit v1.2.3 From 869b63cb93c68a2825bfe25b652d5481555f9b12 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 00:55:06 +0100 Subject: gnu: pango: Update to 1.44.7. * gnu/packages/patches/pango-skip-libthai-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gtk.scm (pango): Update to 1.44.7. [source](patches): New field. [build-system]: Switch to MESON-BUILD-SYSTEM. [arguments]: Disable tests that require the Cantarell font. [inputs]: Move LIBXFT ... [propagated-inputs]: ... here. (pango-1.42): New public variable. * gnu/packages/gnome.scm (librsvg)[inputs]: Change from PANGO to PANGO-1.42. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 4 ++- gnu/packages/gtk.scm | 41 ++++++++++++++++++---- gnu/packages/patches/pango-skip-libthai-test.patch | 23 ++++++++++++ 4 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/pango-skip-libthai-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7462445c98..62561c7261 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1242,6 +1242,7 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-CVE-2017-17969.patch \ %D%/packages/patches/p7zip-remove-unused-code.patch \ %D%/packages/patches/pam-mount-luks2-support.patch \ + %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/pcre2-fix-jit_match-crash.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 37873e42bc..d492739df5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1543,7 +1543,9 @@ dealing with different structured file formats.") ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (inputs - `(("pango" ,pango) + `(;; XXX: 1.44 causes some test failures, so we stick with 1.42 for + ;; this ancient version of librsvg. + ("pango" ,pango-1.42) ("libcroco" ,libcroco) ("bzip2" ,bzip2) ("libgsf" ,libgsf) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 67b129c2a1..0ab5c36ca1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Pierre Neidhardt @@ -222,16 +222,28 @@ affine transformation (scale, rotation, shear, etc.).") (define-public pango (package (name "pango") - (version "1.42.4") + (version "1.44.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx")))) - (build-system gnu-build-system) + "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6")))) + (build-system meson-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-cantarell-tests + (lambda _ + (substitute* "tests/meson.build" + ;; XXX FIXME: These tests require "font-cantarell", but + ;; adding it here would introduce a circular dependency. + (("\\[ 'test-harfbuzz'.*") "") + (("\\[ 'test-itemize'.*") "") + (("\\[ 'test-layout'.*") "")) + #t))))) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. `(("cairo" ,cairo) @@ -239,13 +251,13 @@ affine transformation (scale, rotation, shear, etc.).") ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glib" ,glib) - ("harfbuzz" ,harfbuzz))) - (inputs - `(("zlib" ,zlib) + ("harfbuzz" ,harfbuzz) ;; Some packages, such as Openbox, expect Pango to be built with the ;; optional libxft support. ("libxft" ,libxft))) + (inputs + `(("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ; glib-mkenums, etc. @@ -258,6 +270,21 @@ used throughout the world.") (license license:lgpl2.0+) (home-page "https://developer.gnome.org/pango/"))) +(define-public pango-1.42 + (package/inherit + pango + (version "1.42.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + "pango-" version ".tar.xz")) + (sha256 + (base32 + "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx")))) + (build-system gnu-build-system) + (arguments '()))) + (define-public pangox-compat (package (name "pangox-compat") diff --git a/gnu/packages/patches/pango-skip-libthai-test.patch b/gnu/packages/patches/pango-skip-libthai-test.patch new file mode 100644 index 0000000000..98732b5391 --- /dev/null +++ b/gnu/packages/patches/pango-skip-libthai-test.patch @@ -0,0 +1,23 @@ +Skip Thai character test when libthai is unavailable. + +Taken from upstream bug tracker: +https://gitlab.gnome.org/GNOME/pango/merge_requests/161 +https://gitlab.gnome.org/GNOME/pango/commit/b73284747ac937e31dc9191f84ed6e24284c88ee + +diff --git a/tests/test-break.c b/tests/test-break.c +index 8549b678bba69360d07dce3af21d915412f20d51..47fa3009165e19a331aa04a0df4351ae2323933b 100644 +--- a/tests/test-break.c ++++ b/tests/test-break.c +@@ -305,6 +305,12 @@ main (int argc, char *argv[]) + if (!strstr (name, "break")) + continue; + ++#ifndef HAVE_LIBTHAI ++ /* four.break involves Thai, so only test it when we have libthai */ ++ if (strstr (name, "four.break")) ++ continue; ++#endif ++ + path = g_strdup_printf ("/break/%s", name); + g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "breaks", name, NULL), + test_break, g_free); -- cgit v1.2.3 From 233c1be0a30846f6646b1f4edc6257037d0835fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Jan 2020 22:05:28 +0100 Subject: Revert "gnu: wayland: Update to 1.18.0." This commit only changed the version, not the checksum; and the version does not exist. This reverts commit 373007882def43f43d8da9678f6ab81047e32230. --- gnu/packages/freedesktop.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 2096cdb49f..a26cbea542 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -555,7 +555,7 @@ Python.") (define-public wayland (package (name "wayland") - (version "1.18.0") + (version "1.17.0") (source (origin (method url-fetch) (uri (string-append "https://wayland.freedesktop.org/releases/" -- cgit v1.2.3 From 3963fc70a52e9ebdd0639870a60ec786c59aaca3 Mon Sep 17 00:00:00 2001 From: Riku Viitanen Date: Thu, 26 Dec 2019 20:00:01 +0200 Subject: gnu: python-fonttools: Update to 4.2.2. * gnu/packages/python-xyz.scm (python-fonttools): Update to 4.2.2. --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 75ab361616..daa57888bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -68,6 +68,7 @@ ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019 Mădălin Ionel Patrașcu +;;; Copyright © 2020 Riku Viitanen ;;; ;;; This file is part of GNU Guix. ;;; @@ -6800,13 +6801,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "4.2.0") + (version "4.2.2") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "0psy6z52jn49wp93s3k7kj0jzji1cad3wnwgm6c26vphv5appk4v")))) + "012qqspnwdl4vy8qgzzpfglkk5dgzxiw0fak2jq74ngygvz3vfv6")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.2.3 From 3cc8e029a08f33f6fd8d033e46f56efe499de563 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Jan 2020 23:36:36 +0100 Subject: gnu: Add ruby-hydra. * gnu/packages/ruby.scm (ruby-hydra): New public variable. --- gnu/packages/ruby.scm | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 57d7fa91f3..969fc95a00 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2019 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 ng0 -;;; Copyright © 2017, 2019 Marius Bakke +;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Clément Lassieur @@ -1953,6 +1953,40 @@ two hashes.") (home-page "https://github.com/liufengyun/hashdiff") (license license:expat))) +(define-public ruby-hydra + ;; No releases yet. + (let ((commit "5abfa378743756ae4d9306cc134bcc482f5c9525") + (revision "0")) + (package + (name "ruby-hydra") + (version (git-version "0.0" revision commit)) + (home-page "https://github.com/hyphenation/hydra") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1cik398l2765y3d9sdhjzki3303hkry58ac6jlkiy7iy62nm529f")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (replace 'check + (lambda _ + (invoke "rspec")))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-byebug" ,ruby-byebug))) + (synopsis "Ruby hyphenation patterns") + (description + "ruby-hydra is a Ruby library for working with hyphenation patterns.") + (license license:expat)))) + (define-public ruby-shindo (package (name "ruby-shindo") -- cgit v1.2.3 From 1e5663e2e63e1e1dab116d3e84a7e5852922ed31 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 9 Jan 2020 18:36:50 +0100 Subject: gnu: poppler: Update to 0.84.0. * gnu/packages/pdf.scm (poppler): Update to 0.84.0. * gnu/packages/inkscape.scm (inkscape)[arguments]: Add phase 'adjust-for-new-poppler'. --- gnu/packages/inkscape.scm | 15 ++++++++++++++- gnu/packages/pdf.scm | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 1ad23a92d4..0bd8b9496b 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2014, 2016 Mark H Weaver ;;; Copyright © 2016, 2018 Ricardo Wurmus -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2020 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -88,6 +88,19 @@ (substitute* "share/icons/application/CMakeLists.txt" (("gtk-update-icon-cache") "true")) #t)) + (add-after 'unpack 'adjust-for-new-poppler + (lambda _ + (substitute* (find-files "src/extension/internal/pdfinput") + ;; Needed for Poppler 0.82. + (("Unicode \\*u") "Unicode const *u") + ;; Needed for Poppler 0.83. + (("\\(GfxPath") "(const GfxPath") + (("GfxSubpath") "const GfxSubpath") + (("new GlobalParams\\(\\)") + "std::unique_ptr(new GlobalParams())") + (("new GlobalParams\\(poppler_datadir\\)") + "std::unique_ptr(new GlobalParams(poppler_datadir))")) + #t)) (add-before 'configure 'dont-use-system-includes (lambda _ ;; Don't add redundant -isystem includes which confuses GCC7. diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 368b2ce69e..32a45ed4d5 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -90,14 +90,14 @@ (define-public poppler (package (name "poppler") - (version "0.79.0") + (version "0.84.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr")))) + "0ccp2gx05cz5y04k5pgbyi4ikyq60nafa7x2yx4aaf1vfkd318f7")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From cebe07775bb3e16d41f75b2161a56da84937c7bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 9 Jan 2020 22:36:40 +0100 Subject: build-system/texlive: Update to texlive-2019.3, revision 51265. * guix/build-system/texlive.scm (%texlive-tag): Change to "2019.3". (%texlive-revision): Change to 51265. --- guix/build-system/texlive.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index ad99d1e2d0..8bbca0ccb7 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -42,8 +42,8 @@ ;; These variables specify the SVN tag and the matching SVN revision. They ;; are taken from https://www.tug.org/svn/texlive/tags/ -(define %texlive-tag "texlive-2018.2") -(define %texlive-revision 49435) +(define %texlive-tag "texlive-2019.3") +(define %texlive-revision 51265) (define (texlive-origin name version locations hash) "Return an object for a TeX Live package consisting of multiple -- cgit v1.2.3 From 1f2ef813fccd38a81c186d2e664c05038fc674e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 9 Jan 2020 22:37:10 +0100 Subject: gnu: texlive-bin: Update to 20190410. * gnu/packages/patches/texlive-bin-CVE-2018-17407.patch, gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch: Delete files. * gnu/packages/patches/texlive-bin-poppler-0.83.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/tex.scm (texlive-extra-src): Update to 20190419. (texlive-bin): Likewise. [source](patches): Update Arch patches for Poppler 0.84 compatibility. [arguments]: Remove phase 'use-code-for-even-newer-poppler'; add phase 'patch-dvisgm-build-files'. --- gnu/local.mk | 3 +- .../patches/texlive-bin-CVE-2018-17407.patch | 249 ----------------- .../texlive-bin-luatex-poppler-compat.patch | 293 --------------------- .../patches/texlive-bin-poppler-0.83.patch | 52 ++++ gnu/packages/tex.scm | 44 ++-- 5 files changed, 72 insertions(+), 569 deletions(-) delete mode 100644 gnu/packages/patches/texlive-bin-CVE-2018-17407.patch delete mode 100644 gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch create mode 100644 gnu/packages/patches/texlive-bin-poppler-0.83.patch diff --git a/gnu/local.mk b/gnu/local.mk index 09f46b065e..fd3d434d0c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1405,8 +1405,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ - %D%/packages/patches/texlive-bin-CVE-2018-17407.patch \ - %D%/packages/patches/texlive-bin-luatex-poppler-compat.patch \ + %D%/packages/patches/texlive-bin-poppler-0.83.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/texlive-bin-CVE-2018-17407.patch b/gnu/packages/patches/texlive-bin-CVE-2018-17407.patch deleted file mode 100644 index 63646d420c..0000000000 --- a/gnu/packages/patches/texlive-bin-CVE-2018-17407.patch +++ /dev/null @@ -1,249 +0,0 @@ -This patch adds support for newer versions of Poppler and some upstream -TexLive fixes, including one for CVE-2018-17407. - -It is taken from Linux From Scratch: -. - -Submitted By: Ken Moffat -Date: 2018-12-26 -Initial Package Version: 20180414 -Upstream Status: Applied -Origin: Upstream -Description: Two fixes, cherry-picked from svn plus a CVE fix. -I have removed the partial fixes for various system versions of poppler. - -r47469 Fix segfault in dvipdfm-x (XeTeX) on 1/2/4-bit transparent indexed PNGs. - -r47477 Fix a ptex regression for discontinuous kinsoku table. - -Also, via fedora (I got lost in svn) a critical fix for CVE-2018-17407 - -"A buffer overflow in the handling of Type 1 fonts allows arbitrary code -execution when a malicious font is loaded by one of the vulnerable tools: -pdflatex, pdftex, dvips, or luatex." - -diff -Naur a/texk/dvipdfm-x/pngimage.c b/texk/dvipdfm-x/pngimage.c ---- a/texk/dvipdfm-x/pngimage.c 2018-02-17 08:41:35.000000000 +0000 -+++ b/texk/dvipdfm-x/pngimage.c 2018-10-09 01:52:01.648670875 +0100 -@@ -964,12 +964,16 @@ - png_bytep trans; - int num_trans; - png_uint_32 i; -+ png_byte bpc, mask, shift; - - if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) || - !png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL)) { - WARN("%s: PNG does not have valid tRNS chunk but tRNS is requested.", PNG_DEBUG_STR); - return NULL; - } -+ bpc = png_get_bit_depth(png_ptr, info_ptr); -+ mask = 0xff >> (8 - bpc); -+ shift = 8 - bpc; - - smask = pdf_new_stream(STREAM_COMPRESS); - dict = pdf_stream_dict(smask); -@@ -981,7 +985,8 @@ - pdf_add_dict(dict, pdf_new_name("ColorSpace"), pdf_new_name("DeviceGray")); - pdf_add_dict(dict, pdf_new_name("BitsPerComponent"), pdf_new_number(8)); - for (i = 0; i < width*height; i++) { -- png_byte idx = image_data_ptr[i]; -+ /* data is packed for 1/2/4 bpc formats, msb first */ -+ png_byte idx = (image_data_ptr[bpc * i / 8] >> (shift - bpc * i % 8)) & mask; - smask_data_ptr[i] = (idx < num_trans) ? trans[idx] : 0xff; - } - pdf_add_stream(smask, (char *)smask_data_ptr, width*height); -diff -Naur a/texk/dvipsk/writet1.c b/texk/dvipsk/writet1.c ---- a/texk/dvipsk/writet1.c 2016-11-25 18:24:26.000000000 +0000 -+++ b/texk/dvipsk/writet1.c 2018-10-09 01:52:01.648670875 +0100 -@@ -1449,7 +1449,9 @@ - *(strend(t1_buf_array) - 1) = ' '; - - t1_getline(); -+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE); - strcat(t1_buf_array, t1_line_array); -+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE); - strcpy(t1_line_array, t1_buf_array); - t1_line_ptr = eol(t1_line_array); - } -diff -Naur a/texk/web2c/luatexdir/font/writet1.w b/texk/web2c/luatexdir/font/writet1.w ---- a/texk/web2c/luatexdir/font/writet1.w 2016-11-25 18:24:34.000000000 +0000 -+++ b/texk/web2c/luatexdir/font/writet1.w 2018-10-09 01:52:01.648670875 +0100 -@@ -1625,7 +1625,9 @@ - if (sscanf(p, "%i", &i) != 1) { - strcpy(t1_buf_array, t1_line_array); - t1_getline(); -+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE); - strcat(t1_buf_array, t1_line_array); -+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE); - strcpy(t1_line_array, t1_buf_array); - t1_line_ptr = eol(t1_line_array); - } -diff -Naur a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w ---- a/texk/web2c/luatexdir/image/pdftoepdf.w 2018-01-17 18:00:12.000000000 +0000 -+++ b/texk/web2c/luatexdir/image/pdftoepdf.w 2018-10-09 01:52:01.648670875 +0100 -@@ -472,10 +472,10 @@ - break; - */ - case objString: -- copyString(pdf, obj->getString()); -+ copyString(pdf, (GooString *)obj->getString()); - break; - case objName: -- copyName(pdf, obj->getName()); -+ copyName(pdf, (char *)obj->getName()); - break; - case objNull: - pdf_add_null(pdf); -diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc ---- a/texk/web2c/luatexdir/lua/lepdflib.cc 2018-02-14 14:44:38.000000000 +0000 -+++ b/texk/web2c/luatexdir/lua/lepdflib.cc 2018-10-09 01:52:01.649670868 +0100 -@@ -674,7 +674,7 @@ - uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \ - if (uin->pd != NULL && uin->pd->pc != uin->pc) \ - pdfdoc_changed_error(L); \ -- gs = ((in *) uin->d)->function(); \ -+ gs = (GooString *)((in *) uin->d)->function(); \ - if (gs != NULL) \ - lua_pushlstring(L, gs->getCString(), gs->getLength()); \ - else \ -@@ -1813,7 +1813,7 @@ - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); - if (((Object *) uin->d)->isString()) { -- gs = ((Object *) uin->d)->getString(); -+ gs = (GooString *)((Object *) uin->d)->getString(); - lua_pushlstring(L, gs->getCString(), gs->getLength()); - } else - lua_pushnil(L); -diff -Naur a/texk/web2c/pdftexdir/writet1.c b/texk/web2c/pdftexdir/writet1.c ---- a/texk/web2c/pdftexdir/writet1.c 2016-11-25 18:24:37.000000000 +0000 -+++ b/texk/web2c/pdftexdir/writet1.c 2018-10-09 01:52:01.649670868 +0100 -@@ -1598,7 +1598,9 @@ - *(strend(t1_buf_array) - 1) = ' '; - - t1_getline(); -+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE); - strcat(t1_buf_array, t1_line_array); -+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE); - strcpy(t1_line_array, t1_buf_array); - t1_line_ptr = eol(t1_line_array); - } -diff -Naur a/texk/web2c/ptexdir/ptex_version.h b/texk/web2c/ptexdir/ptex_version.h ---- a/texk/web2c/ptexdir/ptex_version.h 2018-01-21 03:48:06.000000000 +0000 -+++ b/texk/web2c/ptexdir/ptex_version.h 2018-10-09 01:52:01.649670868 +0100 -@@ -1 +1 @@ --#define PTEX_VERSION "p3.8.0" -+#define PTEX_VERSION "p3.8.1" -diff -Naur a/texk/web2c/ptexdir/tests/free_ixsp.tex b/texk/web2c/ptexdir/tests/free_ixsp.tex ---- a/texk/web2c/ptexdir/tests/free_ixsp.tex 1970-01-01 01:00:00.000000000 +0100 -+++ b/texk/web2c/ptexdir/tests/free_ixsp.tex 2018-10-09 01:52:01.649670868 +0100 -@@ -0,0 +1,53 @@ -+%#!eptex -ini -etex -+\let\dump\relax -+\batchmode -+\input plain -+ -+\errorstopmode -+\catcode`@=11 -+\newcount\@tempcnta -+\newcount\@tempcntb -+\newcount\@tempcntc -+\mathchardef\LIM=256 -+ -+\def\MYCHAR#1{% -+ \@tempcntc=\numexpr7*#1+"101\relax -+ \@tempcnta=\@tempcntc\divide\@tempcnta 94 -+ \@tempcntb=\numexpr\@tempcntc-94*\@tempcnta+1\relax -+ \ifnum\@tempcntb<0\advance\@tempcntb94 \advance\@tempcnta-1\fi -+ \advance\@tempcnta18 % 18区以降 -+ \CNTA=\kuten\numexpr"100*\@tempcnta+\@tempcntb\relax -+} -+ -+\newcount\CNT\newcount\CNTA -+\CNT=0 -+\loop -+ \MYCHAR\CNT -+ \message{\the\CNT.} -+ \inhibitxspcode\CNTA=1\relax -+ \advance\CNT1\relax -+ \ifnum\CNT<\LIM -+\repeat -+ -+\newcount\CNTB -+ -+\loop -+ \MYCHAR\CNTB -+ \global\inhibitxspcode\CNTA=3 -+{% -+\CNT=0 -+\loop -+ \MYCHAR\CNT -+ \count@=\numexpr 1-\inhibitxspcode\CNTA\relax -+ \ifnum\count@=0\else\ifnum\CNTB=\CNT\else -+ \errmessage{<\the\CNTB, \the\CNT, \the\inhibitxspcode\CNTA>}\fi\fi -+ \advance\CNT1\relax -+ \ifnum\CNT<\LIM -+\repeat -+} -+ \MYCHAR\CNTB -+ \global\inhibitxspcode\CNTA=1\relax -+ \advance\CNTB1\relax -+ \ifnum\CNTB<\LIM -+\repeat -+\bye -diff -Naur a/texk/web2c/ptexdir/tests/free_pena.tex b/texk/web2c/ptexdir/tests/free_pena.tex ---- a/texk/web2c/ptexdir/tests/free_pena.tex 1970-01-01 01:00:00.000000000 +0100 -+++ b/texk/web2c/ptexdir/tests/free_pena.tex 2018-10-09 01:52:01.649670868 +0100 -@@ -0,0 +1,52 @@ -+%#!eptex -ini -etex -+\let\dump\relax -+\batchmode -+\input plain -+ -+\errorstopmode -+\catcode`@=11 -+\newcount\@tempcnta -+\newcount\@tempcntb -+\newcount\@tempcntc -+\mathchardef\LIM=256 -+ -+\def\MYCHAR#1{% -+ \@tempcntc=\numexpr7*#1+"101\relax -+ \@tempcnta=\@tempcntc\divide\@tempcnta 94 -+ \@tempcntb=\numexpr\@tempcntc-94*\@tempcnta+1\relax -+ \ifnum\@tempcntb<0\advance\@tempcntb94 \advance\@tempcnta-1\fi -+ \advance\@tempcnta18 % 18区以降 -+ \CNTA=\kuten\numexpr"100*\@tempcnta+\@tempcntb\relax -+} -+ -+\newcount\CNT\newcount\CNTA -+\CNT=0 -+\loop -+ \MYCHAR\CNT -+ \message{\the\CNT.} -+ \prebreakpenalty\CNTA=\numexpr\CNT+1\relax -+ \advance\CNT1\relax -+ \ifnum\CNT<\LIM -+\repeat -+ -+\newcount\CNTB -+ -+\loop -+ \MYCHAR\CNTB -+ \global\prebreakpenalty\CNTA=0 -+{% -+\CNT=0 -+\loop -+ \MYCHAR\CNT -+ \count@=\numexpr -\CNT-1+\prebreakpenalty\CNTA\relax -+ \ifnum\count@=0\else\ifnum\CNTB=\CNT\else\errmessage{<\the\CNTB, \the\CNT>}\fi\fi -+ \advance\CNT1\relax -+ \ifnum\CNT<\LIM -+\repeat -+} -+ \MYCHAR\CNTB -+ \global\prebreakpenalty\CNTA=\numexpr\CNTB+1\relax -+ \advance\CNTB1\relax -+ \ifnum\CNTB<\LIM -+\repeat -+\bye diff --git a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch deleted file mode 100644 index 024ff416af..0000000000 --- a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch +++ /dev/null @@ -1,293 +0,0 @@ -Fix LuaTeX compatibility with Poppler 0.75. - -Upstream LuaTeX have moved from Poppler to "pplib" and thus upstream -fixes are unavailable. This is based on Archs patch, with minor -tweaks to comply with texlive-bin-CVE-2018-17407.patch. -https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/texlive-bin&id=418dd6f008c3d41a461353fdb60f2d73d87c58ed - -diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w ---- a/texk/web2c/luatexdir/image/pdftoepdf.w -+++ b/texk/web2c/luatexdir/image/pdftoepdf.w -@@ -363,7 +363,7 @@ void copyReal(PDF pdf, double d) - - static void copyString(PDF pdf, GooString * string) - { -- char *p; -+ const char *p; - unsigned char c; - size_t i, l; - p = string->getCString(); -@@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooString * string) - pdf->cave = true; - } - --static void copyName(PDF pdf, char *s) -+static void copyName(PDF pdf, const char *s) - { - pdf_out(pdf, '/'); - for (; *s != 0; s++) { -@@ -412,7 +412,7 @@ static void copyArray(PDF pdf, PdfDocument * pdf_doc, Array * array) - Object obj1; - pdf_begin_array(pdf); - for (i = 0, l = array->getLength(); i < l; ++i) { -- obj1 = array->getNF(i); -+ obj1 = array->getNF(i).copy(); - copyObject(pdf, pdf_doc, &obj1); - } - pdf_end_array(pdf); -@@ -425,7 +425,7 @@ static void copyDict(PDF pdf, PdfDocument * pdf_doc, Dict * dict) - pdf_begin_dict(pdf); - for (i = 0, l = dict->getLength(); i < l; ++i) { - copyName(pdf, dict->getKey(i)); -- obj1 = dict->getValNF(i); -+ obj1 = dict->getValNF(i).copy(); - copyObject(pdf, pdf_doc, &obj1); - } - pdf_end_dict(pdf); -@@ -475,7 +475,7 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj) - copyString(pdf, (GooString *)obj->getString()); - break; - case objName: -- copyName(pdf, (char *)obj->getName()); -+ copyName(pdf, obj->getName()); - break; - case objNull: - pdf_add_null(pdf); -@@ -531,22 +531,22 @@ static PDFRectangle *get_pagebox(Page * page, int pagebox_spec) - { - switch (pagebox_spec) { - case PDF_BOX_SPEC_MEDIA: -- return page->getMediaBox(); -+ return (PDFRectangle *) page->getMediaBox(); - break; - case PDF_BOX_SPEC_CROP: -- return page->getCropBox(); -+ return (PDFRectangle *) page->getCropBox(); - break; - case PDF_BOX_SPEC_BLEED: -- return page->getBleedBox(); -+ return (PDFRectangle *) page->getBleedBox(); - break; - case PDF_BOX_SPEC_TRIM: -- return page->getTrimBox(); -+ return (PDFRectangle *) page->getTrimBox(); - break; - case PDF_BOX_SPEC_ART: -- return page->getArtBox(); -+ return (PDFRectangle *) page->getArtBox(); - break; - default: -- return page->getMediaBox(); -+ return (PDFRectangle *) page->getMediaBox(); - break; - } - } -@@ -788,12 +788,12 @@ void write_epdf(PDF pdf, image_dict * idict, int suppress_optional_info) - Now all relevant parts of the Page dictionary are copied. Metadata validity - check is needed(as a stream it must be indirect). - */ -- obj1 = pageDict->lookupNF("Metadata"); -+ obj1 = pageDict->lookupNF("Metadata").copy(); - if (!obj1.isNull() && !obj1.isRef()) - formatted_warning("pdf inclusion","/Metadata must be indirect object"); - /* copy selected items in Page dictionary */ - for (i = 0; pagedictkeys[i] != NULL; i++) { -- obj1 = pageDict->lookupNF(pagedictkeys[i]); -+ obj1 = pageDict->lookupNF(pagedictkeys[i]).copy(); - if (!obj1.isNull()) { - pdf_add_name(pdf, pagedictkeys[i]); - /* preserves indirection */ -@@ -806,13 +806,13 @@ void write_epdf(PDF pdf, image_dict * idict, int suppress_optional_info) - PDF file, climbing up the tree until the Resources are found. - (This fixes a problem with Scribus 1.3.3.14.) - */ -- obj1 = pageDict->lookupNF("Resources"); -+ obj1 = pageDict->lookupNF("Resources").copy(); - if (obj1.isNull()) { - op1 = &pagesobj1; - op2 = &pagesobj2; - *op1 = pageDict->lookup("Parent"); - while (op1->isDict()) { -- obj1 = op1->dictLookupNF("Resources"); -+ obj1 = op1->dictLookupNF("Resources").copy(); - if (!obj1.isNull()) { - pdf_add_name(pdf, "Resources"); - copyObject(pdf, pdf_doc, &obj1); -diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc ---- a/texk/web2c/luatexdir/lua/lepdflib.cc -+++ b/texk/web2c/luatexdir/lua/lepdflib.cc -@@ -240,7 +240,7 @@ static int l_new_Attribute(lua_State * L) - if (uobj->pd != NULL && uobj->pd->pc != uobj->pc) - pdfdoc_changed_error(L); - uout = new_Attribute_userdata(L); -- uout->d = new Attribute(n, nlen, (Object *)uobj->d); -+ uout->d = new Attribute((GooString)n, (Object *)uobj->d); - uout->atype = ALLOC_LEPDF; - uout->pc = uobj->pc; - uout->pd = uobj->pd; -@@ -496,7 +496,7 @@ static int l_new_Object(lua_State * L) - double numA = lua_tonumber(L,1); - double genA = lua_tonumber(L,2); - if ( ((numA)==(int)(numA)) && ((genA)==(int)(genA)) ){ -- uout->d = new Object((int)(numA), (int)(genA)); -+ uout->d = new Object({(int)(numA), (int)(genA)}); - uout->atype = ALLOC_LEPDF; - uout->pc = 0; - uout->pd = NULL; -@@ -596,7 +596,7 @@ static int m_##in##_##function(lua_State * L) \ - uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \ - if (uin->pd != NULL && uin->pd->pc != uin->pc) \ - pdfdoc_changed_error(L); \ -- o = ((in *) uin->d)->function(); \ -+ o = (out *) ((in *) uin->d)->function(); \ - if (o != NULL) { \ - uout = new_##out##_userdata(L); \ - uout->d = o; \ -@@ -889,7 +889,7 @@ static int m_Array_getNF(lua_State * L) - if (i > 0 && i <= len) { - uout = new_Object_userdata(L); - uout->d = new Object(); -- *((Object *) uout->d) = ((Array *) uin->d)->getNF(i - 1); -+ *((Object *) uout->d) = ((Array *) uin->d)->getNF(i - 1).copy(); - uout->atype = ALLOC_LEPDF; - uout->pc = uin->pc; - uout->pd = uin->pd; -@@ -1125,12 +1125,12 @@ m_poppler_get_INT(Dict, getLength); - - static int m_Dict_add(lua_State * L) - { -- char *s; -+ const char *s; - udstruct *uin, *uobj; - uin = (udstruct *) luaL_checkudata(L, 1, M_Dict); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- s = copyString(luaL_checkstring(L, 2)); -+ s = luaL_checkstring(L, 2); - uobj = (udstruct *) luaL_checkudata(L, 3, M_Object); - ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d))); - return 0; -@@ -1190,7 +1190,7 @@ static int m_Dict_lookupNF(lua_State * L) - s = luaL_checkstring(L, 2); - uout = new_Object_userdata(L); - uout->d = new Object(); -- *((Object *) uout->d) = ((Dict *) uin->d)->lookupNF(s); -+ *((Object *) uout->d) = ((Dict *) uin->d)->lookupNF(s).copy(); - uout->atype = ALLOC_LEPDF; - uout->pc = uin->pc; - uout->pd = uin->pd; -@@ -1263,7 +1263,7 @@ static int m_Dict_getValNF(lua_State * L) - if (i > 0 && i <= len) { - uout = new_Object_userdata(L); - uout->d = new Object(); -- *((Object *) uout->d) = ((Dict *) uin->d)->getValNF(i - 1); -+ *((Object *) uout->d) = ((Dict *) uin->d)->getValNF(i - 1).copy(); - uout->atype = ALLOC_LEPDF; - uout->pc = uin->pc; - uout->pd = uin->pd; -@@ -1653,7 +1653,7 @@ static int m_Object_initRef(lua_State * L) - pdfdoc_changed_error(L); - num = luaL_checkint(L, 2); - gen = luaL_checkint(L, 3); -- *((Object *) uin->d) = Object(num, gen); -+ *((Object *) uin->d) = Object({num, gen}); - return 0; - } - -@@ -2011,7 +2011,7 @@ static int m_Object_arrayGetNF(lua_State * L) - if (i > 0 && i <= len) { - uout = new_Object_userdata(L); - uout->d = new Object(); -- *((Object *) uout->d) = ((Object *) uin->d)->arrayGetNF(i - 1); -+ *((Object *) uout->d) = ((Object *) uin->d)->arrayGetNF(i - 1).copy(); - uout->atype = ALLOC_LEPDF; - uout->pc = uin->pc; - uout->pd = uin->pd; -@@ -2051,7 +2051,7 @@ static int m_Object_dictAdd(lua_State * L) - pdfdoc_changed_error(L); - if (!((Object *) uin->d)->isDict()) - luaL_error(L, "Object is not a Dict"); -- ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d))); -+ ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d))); - return 0; - } - -@@ -2104,7 +2104,7 @@ static int m_Object_dictLookupNF(lua_State * L) - if (((Object *) uin->d)->isDict()) { - uout = new_Object_userdata(L); - uout->d = new Object(); -- *((Object *) uout->d) = ((Object *) uin->d)->dictLookupNF(s); -+ *((Object *) uout->d) = ((Object *) uin->d)->dictLookupNF(s).copy(); - uout->atype = ALLOC_LEPDF; - uout->pc = uin->pc; - uout->pd = uin->pd; -@@ -2169,7 +2169,7 @@ static int m_Object_dictGetValNF(lua_State * L) - if (i > 0 && i <= len) { - uout = new_Object_userdata(L); - uout->d = new Object(); -- *((Object *) uout->d) = ((Object *) uin->d)->dictGetValNF(i - 1); -+ *((Object *) uout->d) = ((Object *) uin->d)->dictGetValNF(i - 1).copy(); - uout->atype = ALLOC_LEPDF; - uout->pc = uin->pc; - uout->pd = uin->pd; -@@ -2470,7 +2470,7 @@ static int m_PDFDoc_getFileName(lua_State * L) - uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- gs = ((PdfDocument *) uin->d)->doc->getFileName(); -+ gs = (GooString *) ((PdfDocument *) uin->d)->doc->getFileName(); - if (gs != NULL) - lua_pushlstring(L, gs->getCString(), gs->getLength()); - else -@@ -2559,7 +2559,7 @@ static int m_PDFDoc_readMetadata(lua_State * L) - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); - if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { -- gs = ((PdfDocument *) uin->d)->doc->readMetadata(); -+ gs = (GooString *) ((PdfDocument *) uin->d)->doc->readMetadata(); - if (gs != NULL) - lua_pushlstring(L, gs->getCString(), gs->getLength()); - else -@@ -2577,7 +2577,7 @@ static int m_PDFDoc_getStructTreeRoot(lua_State * L) - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); - if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { -- obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot(); -+ obj = (StructTreeRoot *) ((PdfDocument *) uin->d)->doc->getStructTreeRoot(); - uout = new_StructTreeRoot_userdata(L); - uout->d = obj; - uout->pc = uin->pc; ---- texlive-source/texk/web2c/luatexdir/lua/lepdflib.cc.orig 2019-04-24 09:41:05.090522664 +0000 -+++ texlive-source/texk/web2c/luatexdir/lua/lepdflib.cc 2019-04-24 09:43:37.119184926 +0000 -@@ -994,7 +994,8 @@ - pdfdoc_changed_error(L); - num = luaL_checkint(L, 2); - gen = luaL_checkint(L, 3); -- i = ((Catalog *) uin->d)->findPage(num, gen); -+ Ref numgen = {num, gen}; -+ i = ((Catalog *) uin->d)->findPage(numgen); - if (i > 0) - lua_pushinteger(L, i); - else -@@ -2596,8 +2597,9 @@ - pdfdoc_changed_error(L); - num = luaL_checkint(L, 2); - gen = luaL_checkint(L, 3); -+ Ref numgen = {num, gen}; - if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { -- i = ((PdfDocument *) uin->d)->doc->findPage(num, gen); -+ i = ((PdfDocument *) uin->d)->doc->findPage(numgen); - if (i > 0) - lua_pushinteger(L, i); - else ---- texlive-source/texk/web2c/luatexdir/image/pdftoepdf.w.orig 2019-04-24 09:56:38.406498975 +0000 -+++ texlive-source/texk/web2c/luatexdir/image/pdftoepdf.w 2019-04-24 09:56:57.020081327 +0000 -@@ -630,7 +630,7 @@ - if (link == NULL || !link->isOk()) - formatted_error("pdf inclusion","invalid destination '%s'",img_pagename(idict)); - Ref ref = link->getPageRef(); -- img_pagenum(idict) = catalog->findPage(ref.num, ref.gen); -+ img_pagenum(idict) = catalog->findPage(ref); - if (img_pagenum(idict) == 0) - formatted_error("pdf inclusion","destination is not a page '%s'",img_pagename(idict)); - delete link; diff --git a/gnu/packages/patches/texlive-bin-poppler-0.83.patch b/gnu/packages/patches/texlive-bin-poppler-0.83.patch new file mode 100644 index 0000000000..5e57e3efac --- /dev/null +++ b/gnu/packages/patches/texlive-bin-poppler-0.83.patch @@ -0,0 +1,52 @@ +Fix build with Poppler 0.83 and later. + +Taken from Arch Linux, but adjusted to patch the versioned Poppler +files, as upstream applies it after copying them in place. +https://git.archlinux.org/svntogit/packages.git/tree/trunk/texlive-poppler-0.83.patch?h=packages/texlive-bin + +diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc texlive-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc +--- texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc ++++ texlive-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc +@@ -723,7 +723,7 @@ + #endif + // initialize + if (!isInit) { +- globalParams = new GlobalParams(); ++ globalParams.reset(new GlobalParams()); + globalParams->setErrQuiet(false); + isInit = true; + } +@@ -1108,6 +1108,5 @@ + delete_document(p); + } + // see above for globalParams +- delete globalParams; + } + } +diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc texlive-source/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc +--- texlive-source-orig/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc ++++ texlive-source/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc +@@ -79,7 +79,7 @@ + exit(1); + } + fileName = new GString(argv[1]); +- globalParams = new GlobalParams(); ++ globalParams.reset(new GlobalParams()); + doc = new PDFDoc(fileName); + if (!doc->isOk()) { + fprintf(stderr, "Invalid PDF file\n"); +@@ -100,7 +100,7 @@ + if (objnum == 0) { + srcStream = catalogDict.dictLookup("SourceObject"); + static char const_SourceFile[] = "SourceFile"; +- if (!srcStream.isStream(const_SourceFile)) { ++ if (!srcStream.isDict(const_SourceFile)) { + fprintf(stderr, "No SourceObject found\n"); + exit(1); + } +@@ -202,5 +202,4 @@ + fprintf(stderr, "Cross-reference table extracted to %s\n", outname); + fclose(outfile); + delete doc; +- delete globalParams; + } diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e4346d1232..644b455966 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -227,9 +227,9 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (define texlive-extra-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2018/texlive-20180414-extra.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2019/texlive-20190410-extra.tar.xz") (sha256 (base32 - "0a83kymxc8zmlxjb0y1gf6mx7qnf0hxffwkivwh5yh138y2rfhsv")))) + "13ncf2an4nlqv18lki6y2p6pcsgs1i54zqkhfwprax5j53bk70j8")))) (define texlive-texmf-src (origin @@ -241,15 +241,15 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (define-public texlive-bin (package (name "texlive-bin") - (version "20180414") + (version "20190410") (source (origin (method url-fetch) - (uri (string-append "ftp://tug.org/historic/systems/texlive/2018/" + (uri (string-append "ftp://tug.org/historic/systems/texlive/2019/" "texlive-" version "-source.tar.xz")) (sha256 (base32 - "0khyi6h015r2zfqgg0a44a2j7vmr1cy42knw7jbss237yvakc07y")) + "1dfps39q6bdr1zsbp9p74mvalmy3bycihv19sb9c6kg30kprz8nj")) (patches (let ((arch-patch (lambda (name revision hash) @@ -260,14 +260,13 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." "&id=" revision)) (file-name (string-append "texlive-bin-" name)) (sha256 (base32 hash))))) - (arch-revision "c4b99aba97213ea554b6592a4916d3c7394a6d7b")) - (append (search-patches "texlive-bin-CVE-2018-17407.patch" - "texlive-bin-luatex-poppler-compat.patch") - (list - (arch-patch "pdftex-poppler0.76.patch" arch-revision - "15ypbh21amfsdxy7ca825x28lkmmkklxk1w660gpgvzdi7s70h0b") - (arch-patch "xetex-poppler-fixes.patch" arch-revision - "1jj1p5zkjljb7id9pjv29cw0cf8mwrgrh4ackgzz9c200vaqpsvx"))))))) + (arch-revision "49d7fe25e5ea63f136ebc20270c1d8fc9b00041c")) + (list + (arch-patch "pdftex-poppler0.76.patch" arch-revision + "03vc88dz37mjjyaspzv0fik2fp5gp8qv82114869akd1dhszbaax") + (search-patch "texlive-bin-poppler-0.83.patch") + (arch-patch "texlive-poppler-0.84.patch" arch-revision + "1ia6cr99krk4ipx4hdi2qdb98bh2h26mckjlpxdzrjnfhlnghksa")))))) (build-system gnu-build-system) (inputs `(("texlive-extra-src" ,texlive-extra-src) @@ -284,7 +283,7 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." "-checkout")) (sha256 (base32 - "0wrjls1y9b4k1z10l9l8w2l3yjcw7v7by2y16kchdpkiyldlkry6")))) + "1cj04svl8bpfwjr4gqfcc04rmklz3aggrxvgj7q5bxrh7c7g18xh")))) ("cairo" ,cairo) ("fontconfig" ,fontconfig) ("fontforge" ,fontforge) @@ -362,18 +361,13 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc" "texk/web2c/pdftexdir/pdftosrc.cc") #t)) - (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-poppler + (add-after 'unpack 'patch-dvisvgm-build-files (lambda _ - ;; Adjust for deprecated types in Poppler 0.73 and later. - (substitute* (append - (find-files "texk/web2c/luatexdir/" "\\.(cc|w)$") - '("texk/web2c/pdftexdir/pdftosrc.cc")) - (("GBool") "bool") - (("gFalse") "false") - (("gTrue") "true") - (("getCString") "c_str") - (("Guint") "unsigned int") - (("Guchar") "unsigned char")) + ;; XXX: Ghostscript is detected, but HAVE_LIBGS is never set, so + ;; the appropriate linker flags are not added. + (substitute* "texk/dvisvgm/configure" + (("^have_libgs=yes" all) + (string-append all "\nHAVE_LIBGS=1"))) #t)) (add-after 'unpack 'disable-failing-test (lambda _ -- cgit v1.2.3 From 46fd83031e72a0795ee8380a1e0285746e031c55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 9 Jan 2020 22:38:01 +0100 Subject: gnu: texlive-bin: Do not build static libraries. * gnu/packages/tex.scm (texlive-bin)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/tex.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 644b455966..3653e1d00c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -314,7 +314,8 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (arguments `(#:out-of-source? #t #:configure-flags - `("--disable-native-texlive-build" + '("--disable-static" + "--disable-native-texlive-build" "--with-system-cairo" "--with-system-freetype2" "--with-system-gd" -- cgit v1.2.3 From 928fc7c5116c3ecd8b9d4487eef0c07c71a43c37 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 9 Jan 2020 22:38:35 +0100 Subject: gnu: texlive-bin: Purge unused bundled software from the source. * gnu/packages/tex.scm (texlive-bin)[source](modules, snippet): New fields. --- gnu/packages/tex.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3653e1d00c..c9b211ed84 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -266,7 +266,22 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." "03vc88dz37mjjyaspzv0fik2fp5gp8qv82114869akd1dhszbaax") (search-patch "texlive-bin-poppler-0.83.patch") (arch-patch "texlive-poppler-0.84.patch" arch-revision - "1ia6cr99krk4ipx4hdi2qdb98bh2h26mckjlpxdzrjnfhlnghksa")))))) + "1ia6cr99krk4ipx4hdi2qdb98bh2h26mckjlpxdzrjnfhlnghksa")))) + (modules '((guix build utils) + (ice-9 ftw))) + (snippet + '(begin + (with-directory-excursion "libs" + (let ((preserved-directories '("." ".." "lua53" "luajit"))) + ;; Delete bundled software, except Lua which cannot easily be + ;; used as an external dependency. + (for-each delete-file-recursively + (scandir "." + (lambda (file) + (and (not (member file preserved-directories)) + (eq? 'directory (stat:type (stat file))))))))) + ;; TODO: Unbundle stuff in texk/dvisvgm/dvisvgm-src/libs too. + #t)))) (build-system gnu-build-system) (inputs `(("texlive-extra-src" ,texlive-extra-src) -- cgit v1.2.3 From 737ac0b7dafba31fee03bfd8618c8a5db5ef4521 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Jan 2020 23:05:07 +0100 Subject: gnu: Add texlive-hyphen-pali. * gnu/packages/tex.scm (texlive-hyphen-pali): New public variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c9b211ed84..4acdc3baf1 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1959,6 +1959,19 @@ It ranges from the Val d'Aran within Catalunya, to the South Western Italian Alps encompassing the southern half of the French pentagon.") (license license:lppl1.0+))) +(define-public texlive-hyphen-pali + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-pali" "pi" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pi.tex") + (base32 + "1fak853s4ijdqgrnhwymaq1lh8jab3qfyxapdmf6qpg6bqd20kxq"))) + (synopsis "Panjabi hyphenation patterns") + (description "This package provides hyphenation patterns for Panjabi in +T1/EC encoding.") + ;; Can be used with either license. + (license (list license:expat license:lgpl3+ license:gpl3+)))) + (define-public texlive-hyphen-piedmontese (package (inherit (texlive-hyphen-package -- cgit v1.2.3 From 85892948bd9fb5fcc3409a60204cc8b14a4eb030 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Jan 2020 23:53:40 +0100 Subject: gnu: TeX Live: Update packages to 2019.3. * gnu/packages/tex.scm (texlive-texmf, texlive): Update to 20190410. (texlive-union)[native-inputs]: Update "updmap.cfg". (texlive-latex-base)[source]: Adjust for removed files. [arguments]: Ignore one new csplain build. [native-inputs]: Update hash for "texlive-luatexconfig". [inputs]: Add TEXLIVE-HYPHEN-PALI. (texlive-hyphen-package)[native-inputs]: Add RUBY-HYDRA. [arguments]: Rewrite phases for upstream changes. In particular, the language is now detected automatically, rendering the CODE parameter obsolete. (texlive-hyphen-armenian, texlive-hyphen-turkish)[arguments]: Use pre-generated patterns. (texlive-hyphen-basque, texlive-hyphen-turkmen)[arguments]: Likewise. [license]: Adjust for updated source file. (texlive-hyphen-ethiopic, texlive-hyphen-galician)[arguments, license]: Likewise. [native-inputs]: Remove. (texlive-hyphen-german)[source]: Adjust for file rename. (texlive-latex-fancyvrb): Use SIMPLE-TEXLIVE-PACKAGE. (texlive-fonts-ec)[license]: Update URI. (texlive-doi, texlive-pst-text)[source]: Update paths and hash. (texlive-latex-pgf)[native-inputs]: Update "texlive-latex-pgf-generic". (texlive-generic-pdftex)[native-inputs]: Update "pdftex-map". (texlive-latex-pdfx)[native-inputs]: Update "texlive-tex-pdfx". (hyph-utf8-scripts, texlive-docstrip, texlive-unicode-data, texlive-hyphen-base, texlive-fontinst, texlive-cm, texlive-tex-plain, texlive-hyphen-afrikaans, texlive-hyphen-ancientgreek, texlive-hyphen-belarusian, texlive-hyphen-bulgarian, texlive-hyphen-catalan, texlive-hyphen-chinese, texlive-hyphen-churchslavonic, texlive-hyphen-coptic, texlive-hyphen-croatian, texlive-hyphen-czech, texlive-hyphen-danish, texlive-hyphen-dutch, texlive-hyphen-english, texlive-hyphen-esperanto, texlive-hyphen-estonian, texlive-hyphen-finnish, texlive-hyphen-french, texlive-hyphen-friulan, texlive-hyphen-galician, texlive-hyphen-georgian, texlive-hyphen-greek, texlive-hyphen-hungarian, texlive-hyphen-icelandic, texlive-hyphen-indic, texlive-hyphen-indonesian, texlive-hyphen-interlingua, texlive-hyphen-irish, texlive-hyphen-italian, texlive-hyphen-kurmanji, texlive-hyphen-latin, texlive-hyphen-latvian, texlive-hyphen-lithuanian, texlive-hyphen-mongolian, texlive-hyphen-norwegian, texlive-hyphen-occitan, texlive-hyphen-piedmontese, texlive-hyphen-polish, texlive-hyphen-portuguese, texlive-hyphen-romanian, texlive-hyphen-romansh, texlive-hyphen-russian, texlive-hyphen-sanskrit, texlive-hyphen-serbian, texlive-hyphen-slovak, texlive-hyphen-slovenian, texlive-hyphen-spanish, texlive-hyphen-swedish, texlive-hyphen-thai, texlive-hyphen-ukrainian, texlive-hyphen-uppersorbian, texlive-hyphen-welsh, texlive-hyph-utf8, texlive-dehyph-exptl, texlive-latex-kpathsea, texlive-latex-filecontents, texlive-latex-oberdisk, texlive-latex-tools, texlive-latex-l3kernel, texlive-latex-l3packages, texlive-latex-fontspec, texlive-latex-amsmath, texlive-latex-babel, texlive-generic-babel-german, texlive-latex-etoolbox, texlive-latex-g-brief, texlive-latex-geometry, texlive-latex-polyglossia, texlive-tex-texinfo, texlive-latex-colortbl, texlive-luatex-fancyhdr, texlive-latex-listings, texlive-latex-eso-pic, texlive-latex-enumitem, texlive-latex-multirow, texlive-latex-overpic, texlive-latex-parskip, texlive-latex-metapost, texlive-latex-acmart, texlive-fonts-media9, texlive-latex-ocgx2, texlive-latex-pgf, texlive-metapost, texlive-latex-koma-script, texlive-generic-listofitems, texlive-latex-bibtex, texlive-context-base, texlive-beamer, texlive-latex-pdfx, texlive-pstricks, texlive-tools, texlive-siunitx): Update hashes. --- gnu/packages/tex.scm | 501 +++++++++++++++++---------------------------------- 1 file changed, 162 insertions(+), 339 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4acdc3baf1..a31e2695e7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2018 Arun Isaac @@ -143,19 +143,17 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." "-checkout")) (sha256 (base32 - "1ix8h637hwhz4vrdhilf84kzzdza0wi8fp26nh7iws0bq08sl517")))) + "0lk7shx768sxvgr85y8bnmmnj8x4bbkgpxrz3z8jp8avi33prw83")))) (define (texlive-hyphen-package name code locations hash) + "Return a TeX Live hyphenation package with the given NAME, using source +files from LOCATIONS with expected checksum HASH. CODE is not currently in use." (let ((parent (simple-texlive-package name locations hash #:trivial? #t))) (package (inherit parent) (arguments (substitute-keyword-arguments (package-arguments parent) - ((#:modules _ '()) - '((guix build gnu-build-system) - (guix build utils) - (ice-9 match))) ((#:phases phases) `(modify-phases ,phases (replace 'build @@ -168,12 +166,8 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (string-append root "/tex/generic/hyph-utf8/loadhyph")) (ptex (string-append root "/tex/generic/hyph-utf8/patterns/ptex")) - (filter-expression - (match ',code - ((? string?) - (format #f "\nlanguages.select!{|l| l.code == \"~a\"}\n" ',code)) - ((a b ...) - (format #f "\nlanguages.select!{|l| [~{\"~a\",~}].include? l.code }\n" ',code))))) + (quote + (string-append root "/tex/generic/hyph-utf8/patterns/quote"))) (mkdir "scripts") (copy-recursively (assoc-ref inputs "hyph-utf8-scripts") "scripts") @@ -182,45 +176,40 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (mkdir-p patterns) (mkdir-p loaders) (mkdir-p ptex) + (mkdir-p quote) ;; Generate plain patterns (with-directory-excursion "scripts" - (substitute* "languages.rb" - (("../../../tex/generic/") "../tex/generic/")) + (substitute* "lib/tex/hyphen/path.rb" + (("^([[:blank:]]+)TeXROOT = .*" _ indent) + (string-append indent "TeXROOT = \"" + (getcwd) "/..\"\n"))) + (substitute* "generate-plain-patterns.rb" ;; Ruby 2 does not need this. (("require 'unicode'") "") - (("Unicode.upcase\\(ch\\)") "ch.upcase") ;; Write directly to the output directory - (("\\$path_root=File.*") - (string-append "$path_root=\"" out "/share/texmf-dist/\"\n")) - ;; Create quote directory when needed - (("f = File.open\\(\"#\\{\\$path_quote\\}" m) - (string-append "require 'fileutils'; FileUtils.mkdir_p $path_quote;" m)) - ;; Only generate patterns for this language. - (("languages =.*" m) - (string-append m filter-expression))) + (("File\\.join\\(PATH::TXT") + (string-append "File.join(\"" patterns "\"")) + (("File\\.join\\(PATH::QUOTE") + (string-append "File.join(\"" quote "\""))) (invoke "ruby" "generate-plain-patterns.rb") ;; Build pattern loaders (substitute* "generate-pattern-loaders.rb" - (("\\$path_tex_generic=File.*") - (string-append "$path_tex_generic=\"" root "/tex/generic\"\n")) - ;; Only generate loader for this language. - (("languages =.*" m) - (string-append m filter-expression))) + (("File\\.join\\(PATH::LOADER") + (string-append "File.join(\"" loaders "\""))) + (invoke "ruby" "generate-pattern-loaders.rb") ;; Build ptex patterns (substitute* "generate-ptex-patterns.rb" - (("\\$path_root=File.*") - (string-append "$path_root=\"" root "\"\n")) - ;; Only generate ptex patterns for this language. - (("languages =.*" m) - (string-append m filter-expression))) + (("File\\.join\\(PATH::PTEX") + (string-append "File.join(\"" ptex "\""))) (invoke "ruby" "generate-ptex-patterns.rb"))))))))) (native-inputs `(("ruby" ,ruby) + ("ruby-hydra" ,ruby-hydra) ("hyph-utf8-scripts" ,hyph-utf8-scripts))) (home-page "https://ctan.org/pkg/hyph-utf8")))) @@ -234,9 +223,9 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (define texlive-texmf-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2018/texlive-20180414-texmf.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2019/texlive-20190410-texmf.tar.xz") (sha256 (base32 - "1b8zigzg8raxkhhzphcmynf84rbdbj2ym2qkz24v8n0qx82zmqms")))) + "00n4qh9fj8v9zzy3y488hpfq1g3dnnh72y4yjsaikfcqpi59gv62")))) (define-public texlive-bin (package @@ -460,7 +449,7 @@ This package contains the binaries.") "texlive-docstrip" (list "/tex/latex/base/docstrip.tex") (base32 - "17vdy43d9vknldz7wb69hp33r8awmdvn4xszamvgs5ikcl4cp289") + "1f9sx1lp7v34zwm186msf03q2h28rrg0lh65z59zc0cvqffs6dvb") #:trivial? #t)) (home-page "https://www.ctan.org/texlive") (synopsis "Utility to strip documentation from TeX files.") @@ -475,7 +464,7 @@ documentation from TeX files. It is part of the LaTeX base.") (list "/tex/generic/unicode-data/" "/doc/generic/unicode-data/") (base32 - "1j63kz29arfiydb8r1a53q1r4zyk1yjbcq0w9i93zddczgqzgbfb") + "0zy4v9y667cka5fi4dnc6x500907812y7pcaf63s5qxi8l7khxxy") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/unicode-data") (synopsis "Unicode data and loaders for TeX") @@ -508,7 +497,7 @@ out to date by @code{unicode-letters.tex}. ") "/tex/generic/hyphen/hypht1.tex" "/tex/generic/hyphen/zerohyph.tex") (base32 - "002g5zhzbj3ikgg8zidagdp605ac9f4qmfl148mp0mbpz1svk0ni") + "0f19nml4hdx9lh7accqdk1b9ismwfm2523l5zsc4kb4arysgcakz") #:trivial? #t)) (home-page "https://tug.org/texlive/") (synopsis "Core hyphenation support files") @@ -637,7 +626,7 @@ build fonts using the Metafont system.") "/scripts/texlive/fontinst.sh") (base32 - "09drlb0krhnizw92xlm5wxzzpgn3shcxd684xlg0zc5p16l47w6h") + "0lprwib7n2ygfxvrw675vhif7ghyip2x6k70kqs9syp8lqxiizf8") #:trivial? #t))) (package (inherit template) @@ -726,7 +715,7 @@ documents.") "/fonts/map/dvips/cm/cmtext-bsr-interpolated.map" "/doc/fonts/cm/") (base32 - "1h0q71paqmg1xjg6k35ni2i6m93kmlq9rdwm913xg9n4qngywl18") + "09mvl94qrwlb9b4pkigi151l256v3djhwl4m5lgvk6yhn5y75zrp") #:trivial? #t))) (package (inherit template) @@ -1288,7 +1277,7 @@ incorporates the e-TeX extensions.") "texlive-tex-plain" (list "/tex/plain/") (base32 - "1rrfay4d7lbyj02wlf23mwvbpjd160nwlgryx97hq1vb7dva4swr") + "1m4qpaszwfv7j8a85rlwl7rs4iv5nlj67c1vvn6ysly72h9gjydb") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/plain") (synopsis "Plain TeX format and supporting files") @@ -1304,7 +1293,7 @@ discussed in the book).") "texlive-hyphen-afrikaans" "af" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-af.tex") (base32 - "1vb3jccqnn1pm0680yqx52kvz595fmxnwa0cbf8qman6zglsssiw"))) + "1k9k27a27bbrb0gz36191w32l2v6d3zbdh8zhrp4l3ild2pj3n4l"))) (synopsis "Hyphenation patterns for Afrikaans") (description "The package provides hyphenation patterns for the Afrikaans language.") @@ -1318,7 +1307,7 @@ language.") "/tex/generic/hyphen/grahyph5.tex" "/tex/generic/hyphen/ibyhyph.tex") (base32 - "0kwrqsz7wdr1d9kylzwp60ka3wfbj8iad029k5h6y94nb86mf7zv"))) + "01326lb6z0s8krcfgs8i1pnjfrm4gr33rc53gy80f63qbv4ssxrw"))) (synopsis "Hyphenation patterns for ancient Greek") (description "The package provides hyphenation patterns for ancient Greek.") @@ -1327,33 +1316,11 @@ Greek.") (define-public texlive-hyphen-armenian (let ((template (texlive-hyphen-package "texlive-hyphen-armenian" "hy" - (list "/source/generic/hyph-utf8/languages/hy/generate_patterns_hy.rb") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-hy.tex") (base32 - "0z666y580w1kpxssdanz67ykq257lf11a1mnp1jrn08zijvfrw9c")))) + "0hzny0npynsb07syxrpbfa5pkpj8r0j51pj64yxyfl1c0bak1fwp")))) (package (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'build 'build-patterns - (lambda _ - (let ((target (string-append (getcwd) - "/tex/generic/hyph-utf8/patterns/tex"))) - (mkdir-p target) - (with-directory-excursion "source/generic/hyph-utf8/languages/hy/" - (substitute* "generate_patterns_hy.rb" - (("\\$file = File.new.*") - (string-append "$file = File.new(\"" target - "/hyph-hy.tex\",\"w\")\n"))) - (invoke "ruby" "generate_patterns_hy.rb")) - #t))) - (add-after 'install 'install-hyph-hy.tex - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (target (string-append out "/share/texmf-dist/tex"))) - (copy-recursively "tex" target) - #t))))))) (synopsis "Hyphenation patterns for Armenian") (description "The package provides hyphenation patterns for the Armenian language.") @@ -1363,39 +1330,17 @@ language.") (define-public texlive-hyphen-basque (let ((template (texlive-hyphen-package "texlive-hyphen-basque" "eu" - (list "/source/generic/hyph-utf8/languages/eu/generate_patterns_eu.rb") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-eu.tex") (base32 - "1yhsbzf1g9dm70jfixsz51hsfvn26cwfkfxvhg7xv2piynr4v51l")))) + "15w969g1jqzn68l2b2lzf7iv7g3kil02aba3if6cag3qcnq92ra9")))) (package (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'build 'build-patterns - (lambda _ - (let ((target (string-append (getcwd) - "/tex/generic/hyph-utf8/patterns/tex"))) - (mkdir-p target) - (with-directory-excursion "source/generic/hyph-utf8/languages/eu/" - (substitute* "generate_patterns_eu.rb" - (("\\$file = File.new.*") - (string-append "$file = File.new(\"" target - "/hyph-eu.tex\",\"w\")\n"))) - (invoke "ruby" "generate_patterns_eu.rb")) - #t))) - (add-after 'install 'install-hyph-eu.tex - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (target (string-append out "/share/texmf-dist/tex"))) - (copy-recursively "tex" target) - #t))))))) (synopsis "Hyphenation patterns for Basque") (description "The package provides hyphenation patterns for the Basque language.") - ;; "Free for any purpose". + ;; Similar to Unicode license. (license (license:fsf-free - "/source/generic/hyph-utf8/languages/eu/generate_patterns_eu.rb"))))) + "/tex/generic/hyph-utf8/patterns/tex/hyph-eu.tex"))))) (define-public texlive-hyphen-belarusian (package @@ -1403,7 +1348,7 @@ language.") "texlive-hyphen-belarusian" "be" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-be.tex") (base32 - "1xvffph824rg43gi2xs3ny9gzlp708fyxj9zfhckmg8pzh9vv3n6"))) + "0ppm12wndaxv9da62dwkbnk7w9nijikn6jkc97m76xis338g2h02"))) (synopsis "Hyphenation patterns for Belarusian") (description "The package provides hyphenation patterns for the Belarusian language.") @@ -1417,7 +1362,7 @@ language.") "/doc/generic/hyph-utf8/bg/azbukaExtended.tex" "/tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex") (base32 - "06dxkk9azsggbri04i6g62lswygzadsx3rpqvbyzvbxc5wxz1dj1"))) + "0ngrgw2rmipxss76rgfk62x9nnsgwmaxxna2jqxxhybai3q39mx5"))) (synopsis "Hyphenation patterns for Bulgarian") (description "The package provides hyphenation patterns for the Bulgarian language in T2A and UTF-8 encodings.") @@ -1431,7 +1376,7 @@ language in T2A and UTF-8 encodings.") "texlive-hyphen-catalan" "ca" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ca.tex") (base32 - "0cisx76jpw8kpd3an37m9h8ppiysnizgfzl48y9d9n3fvx8jyykb"))) + "10zzlfz5v8d9csg85ibpp2vfvmpqa56vbl85qy5gws099vygpayg"))) (synopsis "Hyphenation patterns for Catalan") (description "The package provides hyphenation patterns for Catalan in T1/EC and UTF-8 encodings.") @@ -1443,7 +1388,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-chinese" "zh-latn-pinyin" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-zh-latn-pinyin.tex") (base32 - "07gbrn5fcl5d3hyg1zpai3zp1ggl73cmvpalwvh7ah313f57gjkk"))) + "1j68mry2zy91m1kbzwhin5q2jajf6xh48npdds8wvp1sqmzih2a3"))) (synopsis "Hyphenation patterns for unaccented Chinese pinyin") (description "The package provides hyphenation patterns for unaccented Chinese pinyin T1/EC and UTF-8 encodings.") @@ -1455,7 +1400,7 @@ Chinese pinyin T1/EC and UTF-8 encodings.") "texlive-hyphen-churchslavonic" "cu" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-cu.tex") (base32 - "0xkqlz3ixyl4fxsnzrbxqrb82p0n67rhgpddbiyv3qwfnbr2b5a4"))) + "0fhbwaapq2213msbhgr0d1lw06ihmrqirxj092mn73d8ynl13qlh"))) (synopsis "Hyphenation patterns for Church Slavonic") (description "The package provides hyphenation patterns for Church Slavonic in UTF-8 encoding.") @@ -1468,7 +1413,7 @@ Slavonic in UTF-8 encoding.") (list "/tex/generic/hyph-utf8/patterns/tex-8bit/copthyph.tex" "/tex/generic/hyph-utf8/patterns/tex/hyph-cop.tex") (base32 - "07i03jpdfy4ip7zbg4gnk4hk8zwj8rlni9dgrb1p8mfw2w19d80c"))) + "1jlxxvyfa2aljizaa3qlcxyhqsrb4dawv3q3fbyp2lxz6ag9fy6m"))) (synopsis "Hyphenation patterns for Coptic") (description "The package provides hyphenation patterns for Coptic in UTF-8 encoding as well as in ASCII-based encoding for 8-bit engines.") @@ -1481,7 +1426,7 @@ UTF-8 encoding as well as in ASCII-based encoding for 8-bit engines.") "texlive-hyphen-croatian" "hr" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-hr.tex") (base32 - "129nz2nqilyq2477n2clx20xfbxh1qxm69zg4n2f6c4d4a8711nc"))) + "12n9r2winai15jc622sqdwclgcs1s68r6vcf7ic8vvq0x9qhwc5v"))) (synopsis "Hyphenation patterns for Croatian") (description "The package provides hyphenation patterns for Croatian in T1/EC and UTF-8 encodings.") @@ -1493,7 +1438,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-czech" "cs" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-cs.tex") (base32 - "1k5516gbfp1d5p97j247byag9sdgds5zwc11bwxfk58i6zq1v0m6"))) + "1q37s6p8yfyi3rp1azbz421lg4lr4aiki8m631i4x9rmps89m8iq"))) (synopsis "Hyphenation patterns for Czech") (description "The package provides hyphenation patterns for Czech in T1/EC and UTF-8 encodings.") @@ -1505,7 +1450,7 @@ and UTF-8 encodings.") "texlive-hyphen-danish" "da" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-da.tex") (base32 - "0zxzs1b1723mav76i0wiyq4w82x8715cykvwa2bc60ldc2amv0vs"))) + "1vj8nip64rzcrcg3skm4vqad1ggqwgan74znrdns610wjcm1z9qd"))) (synopsis "Hyphenation patterns for Danish") (description "The package provides hyphenation patterns for Danish in T1/EC and UTF-8 encodings.") @@ -1518,7 +1463,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-dutch" "nl" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-nl.tex") (base32 - "0cq46cmgjc4y2x0xs9b0a5zca3jmszv4rkzmrhgjb5z2nm3xkrpi"))) + "1bg9g790ksq5cn8qihai6pacmkp9vpf35h4771z361nvwa40l8yk"))) (synopsis "Hyphenation patterns for Dutch") (description "The package provides hyphenation patterns for Dutch in T1/EC and UTF-8 encodings.") @@ -1531,7 +1476,7 @@ and UTF-8 encodings.") (list "/tex/generic/hyph-utf8/patterns/tex/hyph-en-gb.tex" "/tex/generic/hyph-utf8/patterns/tex/hyph-en-us.tex") (base32 - "08hyih8hn2w2q12gc4zygz0ckbz00mkzzn9898z2bicky02zg3kc"))) + "08b3jihjaamcl1pvffi0s47nwavkm66l9mrrmby3l32dfpkprrc5"))) (synopsis "Hyphenation patterns for American and British English") (description "The package provides additional hyphenation patterns for American and British English in ASCII encoding.") @@ -1545,7 +1490,7 @@ American and British English in ASCII encoding.") "texlive-hyphen-esperanto" "eo" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-eo.tex") (base32 - "03xbjbzasznsyf4wd45bya6f4snfmzpdzg5zpvqj5q6gjykdg54k"))) + "1503kzn9bk4mm4ba35cka2hm8rz0v3j5l30v5rrsd4rqgpibcgic"))) (synopsis "Hyphenation patterns for Esperanto") (description "The package provides hyphenation patterns for Esperanto ISO Latin 3 and UTF-8 encodings.") @@ -1557,7 +1502,7 @@ Latin 3 and UTF-8 encodings.") "texlive-hyphen-estonian" "et" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-et.tex") (base32 - "0idl6xajkkgxqngjn19jcfd29is5rhfn59v0z8h4sv8yjv6k934m"))) + "1rdas2450ib02rwy65i69l86nyc9h15bl07xbbwhmhxfnj8zj4v8"))) (synopsis "Hyphenation patterns for Estonian") (description "The package provides hyphenation patterns for Estonian in T1/EC and UTF-8 encodings.") @@ -1567,53 +1512,17 @@ T1/EC and UTF-8 encodings.") (define-public texlive-hyphen-ethiopic (let ((template (texlive-hyphen-package "texlive-hyphen-ethiopic" "mul-ethi" - (list "/source/generic/hyph-utf8/languages/mul-ethi/generate_patterns_mul-ethi.lua") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-mul-ethi.tex") (base32 - "1dp5qn1mhv62kj27lqc7s0ca65z9bziyavkvif9ds5ivk7aq9drw")))) + "1b93fc6j4aybh0pgq23hsn1njm6asf7sfz803fbj3ai0whsxd10l")))) (package (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'build 'build-patterns - (lambda* (#:key inputs #:allow-other-keys) - (let ((tex (string-append (getcwd) - "/tex/generic/hyph-utf8/patterns/tex/"))) - (mkdir-p tex) - (with-directory-excursion "source/generic/hyph-utf8/languages/mul-ethi/" - (substitute* "generate_patterns_mul-ethi.lua" - (("\"UnicodeData.txt\"") - (string-append "\"" - (assoc-ref inputs "UnicodeData.txt") - "\""))) - (invoke "texlua" "generate_patterns_mul-ethi.lua") - (rename-file "hyph-mul-ethi.tex" - (string-append tex "/hyph-mul-ethi.tex")) - #t)))) - (add-after 'install 'install-hyph-mul-ethi.tex - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (target (string-append out "/share/texmf-dist/tex"))) - (copy-recursively "tex" target) - #t))))))) - (native-inputs - `(,@(package-native-inputs template) - ("texlive-bin" ,texlive-bin) - ("UnicodeData.txt" - ,(origin - (method url-fetch) - (uri (string-append "http://www.unicode.org/Public/10.0.0/ucd/" - "UnicodeData.txt")) - (sha256 - (base32 - "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj")))))) (synopsis "Hyphenation patterns for Ethiopic scripts") (description "The package provides hyphenation patterns for languages written using the Ethiopic script for Unicode engines. They are not supposed to be linguistically relevant in all cases and should, for proper typography, be replaced by files tailored to individual languages.") - (license license:lppl)))) + (license license:expat)))) (define-public texlive-hyphen-finnish (package @@ -1621,7 +1530,7 @@ be replaced by files tailored to individual languages.") "texlive-hyphen-finnish" "fi" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fi.tex") (base32 - "03n6s8dwwa5vfk9bbyhcdf7p0bc0d1rrr312hpgbz8jfc9fbgd7n"))) + "1f72b4ydb4zddvw2i004948khmwzigxkdkwfym5v1kkq0183sfpj"))) (synopsis "Hyphenation patterns for Finnish") (description "The package provides hyphenation patterns for Finnish in T1/EC and UTF-8 encodings.") @@ -1633,7 +1542,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-french" "fr" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fr.tex") (base32 - "1q82mmwvy7fdkm42958ajb53w89qkcdwybswxlwcvqngvhpy3zf0"))) + "0jc3kqys6cxjw8x8pzjln7z78l8s7f5rlyrkv7dzr1kiwnwilk9d"))) (synopsis "Hyphenation patterns for French") (description "The package provides hyphenation patterns for French in T1/EC and UTF-8 encodings.") @@ -1645,7 +1554,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-friulan" "fur" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fur.tex") (base32 - "07m975p0ghzs9sjqqgxy7qdkqmgvg4rx4xp08zwm1parqsdlwd5d"))) + "1dlnh8slpf50mryxv7zzbx08xp54zkdfs1j7y37ipwbrajvd740f"))) (synopsis "Hyphenation patterns for Friulan") (description "The package provides hyphenation patterns for Friulan in ASCII encodings.") @@ -1654,50 +1563,15 @@ ASCII encodings.") (define-public texlive-hyphen-galician (let ((template (texlive-hyphen-package "texlive-hyphen-galician" "gl" - (list "/source/generic/hyph-utf8/languages/gl/README" - "/source/generic/hyph-utf8/languages/gl/glhybiox.tex" - "/source/generic/hyph-utf8/languages/gl/glhyextr.tex" - "/source/generic/hyph-utf8/languages/gl/glhymed.tex" - "/source/generic/hyph-utf8/languages/gl/glhyquim.tex" - "/source/generic/hyph-utf8/languages/gl/glhytec.tex" - "/source/generic/hyph-utf8/languages/gl/glhyxeog.tex" - "/source/generic/hyph-utf8/languages/gl/glpatter-utf8.tex") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-gl.tex") (base32 - "1yj1gxhkqqlyaand5gd6ij6xwffskryzlbcigdam3871a9p8x18w")))) + "13zx2r3nrxdr025g2lxrph0ga6wf7cs8dxixn4fhbl6xr1cx028g")))) (package (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'build 'build-patterns - (lambda* (#:key inputs #:allow-other-keys) - (let ((tex (string-append (getcwd) - "/tex/generic/hyph-utf8/patterns/tex/"))) - (mkdir-p tex) - (with-directory-excursion "source/generic/hyph-utf8/languages/gl/" - (setenv "TEXINPUTS" - (string-append (getcwd) "//:" - (assoc-ref inputs "texlive-mkpattern") "//")) - (invoke "tex" "-ini" "-8bit" "glpatter-utf8.tex") - (rename-file "hyph-gl.tex" - (string-append tex "/hyph-gl.tex")) - #t)))) - (add-after 'install 'install-hyph-gl.tex - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (target (string-append out "/share/texmf-dist/tex"))) - (copy-recursively "tex" target) - #t))))))) - (native-inputs - `(,@(package-native-inputs template) - ("texlive-bin" ,texlive-bin) - ("texlive-mkpattern" ,texlive-mkpattern))) (synopsis "Hyphenation patterns for Galician") (description "The package provides hyphenation patterns for Galician in T1/EC and UTF-8 encodings.") - ;; glhyextr.tex is the only file in the public domain. - (license (list license:lppl1.3 license:public-domain))))) + (license license:lppl1.3)))) (define-public texlive-hyphen-georgian (package @@ -1705,7 +1579,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-georgian" "ka" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ka.tex") (base32 - "01zhn6mflpiqw4lyi8dx8syiz5mky9jrxm87cgw31hanis5cml4l"))) + "0l0hk7ka04fr8x11nnw95x151cxyycy0fph772m3a3p8qk4x9wp7"))) (synopsis "Hyphenation patterns for Georgian") (description "The package provides hyphenation patterns for Georgian in T8M, T8K, and UTF-8 encodings.") @@ -1718,12 +1592,12 @@ T8M, T8K, and UTF-8 encodings.") (list "/tex/generic/hyph-utf8/patterns/tex/hyph-de-1901.tex" "/tex/generic/hyph-utf8/patterns/tex/hyph-de-1996.tex" "/tex/generic/hyph-utf8/patterns/tex/hyph-de-ch-1901.tex" - "/tex/generic/hyphen/dehyphn.tex" - "/tex/generic/hyphen/dehypht.tex" - "/tex/generic/hyphen/dehyphtex.tex" - "/tex/generic/hyphen/ghyphen.README") + "/tex/generic/dehyph/dehyphn.tex" + "/tex/generic/dehyph/dehypht.tex" + "/tex/generic/dehyph/dehyphtex.tex" + "/tex/generic/dehyph/README") (base32 - "1g0vhpvl2l69rn2lx7lkw0inrjbcxkj2sjgwd2fq7hdi4yb2ms76"))) + "0wp5by5kkf4ac6li5mbppqzw11500wa7f22p5vpz3m1kwd15zavw"))) (synopsis "Hyphenation patterns for German") (description "This package provides hyphenation patterns for German in T1/EC and UTF-8 encodings, for traditional and reformed spelling, including @@ -1742,7 +1616,7 @@ Swiss German.") "/tex/generic/hyphen/grmhyph5.tex" "/tex/generic/hyphen/grphyph5.tex") (base32 - "04626jhlrv2flgdygm7sfv6xpqhfwiavi16gy2ac04iliyk4rypg"))) + "1qyr6m1nh6d4wj68616cfxv4wjpiy1w2rlldxlx2ajzba381w3hf"))) (synopsis "Hyphenation patterns for Greek") (description "This package provides hyphenation patterns for Modern Greek in monotonic and polytonic spelling in LGR and UTF-8 encodings.") @@ -1756,7 +1630,7 @@ in monotonic and polytonic spelling in LGR and UTF-8 encodings.") "/doc/generic/hyph-utf8/hu/" "/tex/generic/hyph-utf8/patterns/tex/hyph-hu.tex") (base32 - "0c81w2569cqsi4j56azwz0lfx16541zhiqgmn3m4iwh7mpx3rji8"))) + "1j1b8kksg9r8nmjyjvvz8fr3hgcrjj6jlybf9p06nwrrwm2r8j8f"))) (synopsis "Hyphenation patterns for Hungarian") (description "This package provides hyphenation patterns for Hungarian in T1/EC and UTF-8 encodings.") @@ -1769,7 +1643,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-icelandic" "is" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-is.tex") (base32 - "1ah1f82lgfhqgid4ngsfiypybx10v8gwxnb12396vfsj3bq6j0ba"))) + "1m9xj41csj3ldym09d82zjbd3345sg2z10d8pxpvhgibf97mb66h"))) (synopsis "Hyphenation patterns for Icelandic") (description "This package provides hyphenation patterns for Icelandic in T1/EC and UTF-8 encodings.") @@ -1792,7 +1666,7 @@ T1/EC and UTF-8 encodings.") "/tex/generic/hyph-utf8/patterns/tex/hyph-ta.tex" "/tex/generic/hyph-utf8/patterns/tex/hyph-te.tex") (base32 - "1v8zc3wdbkhzjrflndmz4gdj11syz8vrcg0vwvm5bwhkx23g91lv"))) + "02d2kcd3lpk95fykjwhzw9s2a1s2w1skz8h2mmszrz979d1xzhpm"))) (synopsis "Indic hyphenation patterns") (description "This package provides hyphenation patterns for Assamese, Bengali, Gujarati, Hindi, Kannada, Malayalam, Marathi, Oriya, Panjabi, Tamil @@ -1805,7 +1679,7 @@ and Telugu for Unicode engines.") "texlive-hyphen-indonesian" "id" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-id.tex") (base32 - "0mf0hr9c952kb2hmzid7fqg5whshwpribbyndb3ba092wh02abh5"))) + "1r62w02rf0i4z0jgij54d16qjbj0zyfwm9dwdkqka76jrivij83q"))) (synopsis "Indonesian hyphenation patterns") (description "This package provides hyphenation patterns for Indonesian (Bahasa Indonesia) in ASCII encoding. They are probably also @@ -1818,7 +1692,7 @@ usable for Malay (Bahasa Melayu).") "texlive-hyphen-interlingua" "ia" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ia.tex") (base32 - "1aihgma3rix4jkc1z5k1lh6hlfrncn66yj0givd3j6xjqflafr2g"))) + "0a9na20vjnzhgjbicaxay0jk4rm5zg1rjyiswr377mjhd9mx5cg3"))) (synopsis "Interlingua hyphenation patterns") (description "This package provides hyphenation patterns for Interlingua in ASCII encoding.") @@ -1830,7 +1704,7 @@ in ASCII encoding.") "texlive-hyphen-irish" "ga" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ga.tex") (base32 - "02k1fykgj3xamczjq16i9fsjjsh78pp5ypmh93p64izk2vymfwk0"))) + "1h1l9jzkpsb91nyhz6s6c9jfrbz8jx5ip8vyq3dkz0rl6g960i6b"))) (synopsis "Irish hyphenation patterns") (description "This package provides hyphenation patterns for Irish (Gaeilge) in T1/EC and UTF-8 encodings.") @@ -1843,7 +1717,7 @@ Irish (Gaeilge) in T1/EC and UTF-8 encodings.") "texlive-hyphen-italian" "it" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-it.tex") (base32 - "1a65q3hjn2p212cgv6p7wa0wcn34qnxcz2pl3v3ip0xmb16qqsk5"))) + "03c7jiqslfxvl3gbdx79hggbvrfi2l4z2bnwxc0na8f8lkp1m787"))) (synopsis "Italian hyphenation patterns") (description "This package provides hyphenation patterns for Italian in ASCII encoding. Compliant with the Recommendation UNI 6461 on hyphenation @@ -1857,7 +1731,7 @@ UNI).") "texlive-hyphen-kurmanji" "kmr" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-kmr.tex") (base32 - "1145ykfd0b0hgklindlxdgkqmsnj3cai3cwgllz411yqmrhjc6y9"))) + "01ylbsi5wymrdrxr9b28nmjmcj72mdhqr657lwsb6m9aj33c9ql6"))) (synopsis "Kurmanji hyphenation patterns") (description "This package provides hyphenation patterns for Kurmanji (Northern Kurdish) as spoken in Turkey and by the Kurdish diaspora in @@ -1872,7 +1746,7 @@ Europe, in T1/EC and UTF-8 encodings.") "/tex/generic/hyph-utf8/patterns/tex/hyph-la-x-liturgic.tex" "/tex/generic/hyph-utf8/patterns/tex/hyph-la.tex") (base32 - "1d8d6b47r4r000gqgzyl0sy9is0y0dg41jp8fw4gqq8qmcgdxgsg"))) + "0rxg8a4s5cpj8vlkz5a74a036axda5jqgvr3f9aj2cc2x9f2f3w9"))) (synopsis "Liturgical Latin hyphenation patterns") (description "This package provides hyphenation patterns for Latin in T1/EC and UTF-8 encodings, mainly in modern spelling (u when u is needed and v @@ -1893,7 +1767,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-latvian" "lv" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-lv.tex") (base32 - "1xbh5s6nwfjbv7g4kmcpjkm02a6s767p7jn9qjcnz5ip0ndl5g66"))) + "00jf8xma4ldz0zpqwma97k9q3j0mqx7qdj6b7baph3n5xgc24aaw"))) (synopsis "Latvian hyphenation patterns") (description "This package provides hyphenation patterns for Latvian in L7X and UTF-8 encodings.") @@ -1906,7 +1780,7 @@ L7X and UTF-8 encodings.") "texlive-hyphen-lithuanian" "lt" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-lt.tex") (base32 - "0v9spw0qkygkihj5app2immzqqr98w81pz460bcgvj1ah35jdfsl"))) + "1kfq7j2ajg6nj952s1ygd520sj9z9kl0bqvd291a36ni2b1frzgd"))) (synopsis "Lithuanian hyphenation patterns") (description "This package provides hyphenation patterns for Lithuanian in L7X and UTF-8 encodings.") @@ -1921,7 +1795,7 @@ L7X and UTF-8 encodings.") (list "/tex/generic/hyph-utf8/patterns/tex/hyph-mn-cyrl-x-lmc.tex" "/tex/generic/hyph-utf8/patterns/tex/hyph-mn-cyrl.tex") (base32 - "0lqq3jgwgnclb1cn3x99xmk90xra9q51b00ypwy5crssmy023hqc"))) + "1y1b91ihrdl9bad3rxlsfjpd9wmyd5zzgci3qv9w8qqk33jxhwya"))) (synopsis "Mongolian hyphenation patterns in Cyrillic script") (description "This package provides hyphenation patterns for Mongolian in T2A, LMC and UTF-8 encodings.") @@ -1936,7 +1810,7 @@ T2A, LMC and UTF-8 encodings.") "/tex/generic/hyph-utf8/patterns/tex/hyph-nn.tex" "/tex/generic/hyph-utf8/patterns/tex/hyph-no.tex") (base32 - "1fxnf671yz0p3lmdkspna7fjh96br1jy6yf7v17yh4fxwry3s4yz"))) + "08gbwj64p4fckm199k52yp5lx65h9f4wwdkvl4pv4aa7k370jq9y"))) (synopsis "Norwegian Bokmal and Nynorsk hyphenation patterns") (description "This package provides hyphenation patterns for Norwegian Bokmal and Nynorsk in T1/EC and UTF-8 encodings.") @@ -1950,7 +1824,7 @@ Bokmal and Nynorsk in T1/EC and UTF-8 encodings.") "texlive-hyphen-occitan" "oc" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-oc.tex") (base32 - "1y6j6ac9ncn79p7hnp6mdwdsw9ij14zyjby5iwdhpvzzn7yyc7p8"))) + "0vhjbq2nr58vhqwwky3cwx4dqiwjmmfwp81rb65mfpf0m8yypdfg"))) (synopsis "Occitan hyphenation patterns") (description "This package provides hyphenation patterns for Occitan in T1/EC and UTF-8 encodings. They are supposed to be valid for all the Occitan @@ -1978,7 +1852,7 @@ T1/EC encoding.") "texlive-hyphen-piedmontese" "pms" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pms.tex") (base32 - "00fqzymkg374r3dzf1y82k6b18bqrf688vnjv0vkvw5a45srlb5r"))) + "0xva3l2gwzkqw1sz64k5g5iprhdyr27w1mv8rxp8x62i5y3aqr1k"))) (synopsis "Piedmontese hyphenation patterns") (description "This package provides hyphenation patterns for Piedmontese in ASCII encoding. Compliant with 'Gramatica dla lengua piemonteisa' by @@ -1991,7 +1865,7 @@ Camillo Brero.") "texlive-hyphen-polish" "pl" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pl.tex") (base32 - "0dzq8ca96q7m5bslh51x8d30pdb86glh2gn3mmvq5ip813ckwh3s"))) + "1c22g99isxapv4xjrmsw24hhp1xb83wbgcxyd8j24mxdnizywxzm"))) (synopsis "Polish hyphenation patterns") (description "This package provides hyphenation patterns for Polish in QX and UTF-8 encodings.") @@ -2004,7 +1878,7 @@ and UTF-8 encodings.") "texlive-hyphen-portuguese" "pt" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pt.tex") (base32 - "1waxrmm33fd2qfc4kiaiblg8kwzasrvgq4j3l14z733d0hlg4rfz"))) + "00rkjy4p7893zs940bq3s4hp7al0skgxqggj5qfax0bx8karf30b"))) (synopsis "Portuguese hyphenation patterns") (description "This package provides hyphenation patterns for Portuguese in T1/EC and UTF-8 encodings.") @@ -2016,7 +1890,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-romanian" "ro" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ro.tex") (base32 - "12i1vryl51yhdpj163ahfyiy21rjmf4gkqgslpriirdjmyrwrs65"))) + "1ykb5v7ip6p3n34wq8qypfyrap4gg946by5rsl6ab0k5gv6ypsbf"))) (synopsis "Romanian hyphenation patterns") (description "This package provides hyphenation patterns for Romanian in T1/EC and UTF-8 encodings.") @@ -2029,7 +1903,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-romansh" "rm" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-rm.tex") (base32 - "06wan8i4appc1zfvc0q4cgnfv1nj0qgk02w3sg56zc11hf8sywl9"))) + "0a1q9p6sp5n6a9w6xhwk03vmkrrmnh2md7g1k4qhnf0dc4h7dy9r"))) (synopsis "Romansh hyphenation patterns") (description "This package provides hyphenation patterns for Romansh in ASCII encodings. They are supposed to comply with the rules indicated by the @@ -2042,7 +1916,7 @@ Lia Rumantscha (Romansh language society).") "texlive-hyphen-russian" "ru" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ru.tex") (base32 - "09s4vq23x4vff08ykmf08dvcdradjzzwvyys8p2wk6jxaqp980s3"))) + "00sy7qh5f8ryxw36fwbyd1yi2hxhv7hmk99yp7dwh73n4mxv6lpl"))) (synopsis "Russian hyphenation patterns") (description "This package provides hyphenation patterns for Russian in T2A and UTF-8 encodings.") @@ -2055,7 +1929,7 @@ T2A and UTF-8 encodings.") (list "/doc/generic/hyph-utf8/sa/hyphenmin.txt" "/tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex") (base32 - "0grnn09l4i5yridx10yhm6dg9sbhgc2pmsp1p6hrcy7lzkqwdvs3"))) + "0gi2qk0wf388h9n25gzhv0cdz67ph83wal8h3iz2sqnpdjsw8kpc"))) (synopsis "Sanskrit hyphenation patterns") (description "This package provides hyphenation patterns for Sanskrit and Prakrit in longdesc transliteration, and in Devanagari, Bengali, Kannada, @@ -2072,7 +1946,7 @@ Malayalam longdesc and Telugu scripts for Unicode engines.") "/tex/generic/hyph-utf8/patterns/tex/hyph-sh-latn.tex" "/tex/generic/hyph-utf8/patterns/tex/hyph-sr-cyrl.tex") (base32 - "0fhdfydyaspb8dwirlf24vn7y9dzwmhsld0mmw0fz1lmcfaj252n"))) + "0pwc9z0m5y6acq1vqm0da9akg156jbhxzvsfp2f8bsz5b99y5z45"))) (synopsis "Serbian hyphenation patterns") (description "This package provides hyphenation patterns for Serbian in T1/EC, T2A and UTF-8 encodings.") @@ -2085,7 +1959,7 @@ T1/EC, T2A and UTF-8 encodings.") "texlive-hyphen-slovak" "sk" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sk.tex") (base32 - "1cgw6fmyci3za3vsa49b6m74wqv582w0rpca7s9xva3hqm1m5qdg"))) + "0ppp53bbclp5c8wvx748krvrp5y5053khgkjnnv966a90fvp3vgd"))) (synopsis "Slovak hyphenation patterns") (description "This package provides hyphenation patterns for Slovak in T1/EC and UTF-8 encodings.") @@ -2097,7 +1971,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-slovenian" "sl" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sl.tex") (base32 - "1ixf2pxir9xf1gggq9k28xxglsq9bwqlghd9cl4amk5vrn5bjbds"))) + "02n8l9yf4hqyhbpsc1n6b2mggy09z6lq4dcb8ndiwawb6h0mp7s4"))) (synopsis "Slovenian hyphenation patterns") (description "This package provides hyphenation patterns for Slovenian in T1/EC and UTF-8 encodings.") @@ -2113,7 +1987,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-spanish" "es" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-es.tex") (base32 - "0jgs0zzyk2wwrjbx2hqdh5qggrnik9xmsxygbfhlb7gdrcrs0mbj"))) + "1h3yg9vcq0lf7hxv0ahkqmyg269dxjs8m2mz8sgz5l1fxmvahvaj"))) (synopsis "Hyphenation patterns for Spanish") (description "The package provides hyphenation patterns for Spanish in T1/EC and UTF-8 encodings.") @@ -2125,7 +1999,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-swedish" "sv" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sv.tex") (base32 - "12sf9f43zwyzb4cn57yry8r4zmwdc7cfdljn3qwxwrny4m3sw4w8"))) + "1n7incy7n24pix1q2i8c3h7i78zpql5ayhskavlmy6mhd7ayncaw"))) (synopsis "Swedish hyphenation patterns") (description "This package provides hyphenation patterns for Swedish in T1/EC and UTF-8 encodings.") @@ -2137,7 +2011,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-thai" "th" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-th.tex") (base32 - "15k1n4xdw8zzd5nrh76s53z4j95gxa4i2h1av5gx5vrjgblzzl97"))) + "00gxcs4jfqifd5cnrjipn77m73fmpw2qms4lp216jj3kz4a7h9kf"))) (synopsis "Thai hyphenation patterns") (description "This package provides hyphenation patterns for Thai in LTH and UTF-8 encodings.") @@ -2146,33 +2020,11 @@ and UTF-8 encodings.") (define-public texlive-hyphen-turkish (let ((template (texlive-hyphen-package "texlive-hyphen-turkish" "tr" - (list "/source/generic/hyph-utf8/languages/tr/generate_patterns_tr.rb") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-tr.tex") (base32 - "0rvlhs2z2sn312lqsf44bzknid5dry7d2sl2q1whfvr0y4qj1g8f")))) + "04sihjgpm31i5bi67rrfp15w3imn7hxwwk70v0vhx053ghxy72vh")))) (package (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'build 'build-patterns - (lambda _ - (let ((target (string-append (getcwd) - "/tex/generic/hyph-utf8/patterns/tex"))) - (mkdir-p target) - (with-directory-excursion "source/generic/hyph-utf8/languages/tr/" - (substitute* "generate_patterns_tr.rb" - (("\\$file = File.new.*") - (string-append "$file = File.new(\"" target - "/hyph-tr.tex\",\"w\")\n"))) - (invoke "ruby" "generate_patterns_tr.rb")) - #t))) - (add-after 'install 'install-hyph-tr.tex - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (target (string-append out "/share/texmf-dist/tex"))) - (copy-recursively "tex" target) - #t))))))) (synopsis "Hyphenation patterns for Turkish") (description "The package provides hyphenation patterns for Turkish in T1/EC and UTF-8 encodings. The patterns for Turkish were first produced for @@ -2185,37 +2037,15 @@ compatibility with 8-bit engines.") (define-public texlive-hyphen-turkmen (let ((template (texlive-hyphen-package "texlive-hyphen-turkmen" "tk" - (list "/source/generic/hyph-utf8/languages/tk/generate_patterns_tk.rb") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-tk.tex") (base32 - "1wlqx8wb0wsqhdv823brc3i8w1vf4m4bkb2vg917j5dq8p8p71aw")))) + "0g5ip2lw9g47s61mv3cypswc6qm7zy9c4iqq4h19ysvds81adzkr")))) (package (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'build 'build-patterns - (lambda _ - (let ((target (string-append (getcwd) - "/tex/generic/hyph-utf8/patterns/tex"))) - (mkdir-p target) - (with-directory-excursion "source/generic/hyph-utf8/languages/tk/" - (substitute* "generate_patterns_tk.rb" - (("\\$file = File.new.*") - (string-append "$file = File.new(\"" target - "/hyph-tr.tex\",\"w\")\n"))) - (invoke "ruby" "generate_patterns_tk.rb")) - #t))) - (add-after 'install 'install-hyph-tk.tex - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (target (string-append out "/share/texmf-dist/tex"))) - (copy-recursively "tex" target) - #t))))))) (synopsis "Hyphenation patterns for Turkmen") (description "The package provides hyphenation patterns for Turkmen in T1/EC and UTF-8 encodings.") - (license license:public-domain)))) + (license license:expat)))) (define-public texlive-hyphen-ukrainian (package @@ -2223,7 +2053,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-ukrainian" "uk" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-uk.tex") (base32 - "17z0gmw5svsf5zlhjkckwk4y21g7prfwj473jlqnwcsr8a941gsf"))) + "0fbfhx1fmbshxr4ihsjaqgx251h69h7i288p8gh3w6ysgxr53p60"))) (synopsis "Ukrainian hyphenation patterns") (description "This package provides hyphenation patterns for Ukrainian in T2A and UTF-8 encodings.") @@ -2236,7 +2066,7 @@ T2A and UTF-8 encodings.") "texlive-hyphen-uppersorbian" "hsb" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-hsb.tex") (base32 - "1q42s32cfbynlnzn9hpcldi77fszi5xkn1c85l8xqjmfydqbqdyi"))) + "0x0051wph3sqmzzw6prvjy6bp7gn02rbmys1bmbc210jk3pkylfj"))) (synopsis "Upper Sorbian hyphenation patterns") (description "This package provides hyphenation patterns for Upper Sorbian in T1/EC and UTF-8 encodings.") @@ -2248,7 +2078,7 @@ in T1/EC and UTF-8 encodings.") "texlive-hyphen-welsh" "cy" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-cy.tex") (base32 - "0h8yjj5zdg0hvpb2vx9gi376536nl59hp8w286z1a13diaayg1m2"))) + "1bpxp3jiifdw7waw2idz5j9xgi3526nkxm8mbmsspr4mlf2xyr76"))) (synopsis "Welsh hyphenation patterns") (description "This package provides hyphenation patterns for Welsh in T1/EC and UTF-8 encodings.") @@ -2277,7 +2107,7 @@ T1/EC and UTF-8 encodings.") "/doc/generic/hyph-utf8/img/miktex-languages.png" "/doc/generic/hyph-utf8/img/texlive-collection.png") (base32 - "10y8svgk68sivmgzrv8gv137r7kv49cs256cq2wja9ms437pxvbj"))) + "1bar5mc808ch20anhqrdxcwiych359qsvr7mggxpg2l2kq5xdyq0"))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments @@ -2410,7 +2240,7 @@ converters, will completely supplant the older patterns.") (list "/tex/generic/dehyph-exptl/" "/doc/generic/dehyph-exptl/") (base32 - "1w2danvvy2f52hcb4acvjks53kcanwxr9s990fap6mj279hpgmh2") + "1fnqc63gz8gvdyfz45bx8dxn1r1rwrypahs3bqd2vlc8ff76xp86") #:trivial? #t)) (propagated-inputs `(("texlive-hyphen-base" ,texlive-hyphen-base) @@ -2517,7 +2347,7 @@ UCY (Omega Unicode Cyrillic), LCY, LWN (OT2), and koi8-r.") "/web2c/tcvn-t5.tcx" "/web2c/viscii-t5.tcx") (base32 - "0ajfp9kr330lcm2ymr3kl9zn6y2xjkrzpa0c0azc4qdm5jllawb9") + "191i8n3g46p53bb9dkx2ggwpzy7skgg0pbklsrpx8x4ayd86wcaf") #:trivial? #t)) (home-page "https://www.tug.org/texlive/") (synopsis "Files related to the path searching library for TeX") @@ -2550,18 +2380,16 @@ formats.") ;; these are not: "/tex/latex/base/idx.tex" "/tex/latex/base/lablst.tex" - "/tex/latex/base/lppl.tex" "/tex/latex/base/ltnews.cls" "/tex/latex/base/ltxcheck.tex" "/tex/latex/base/ltxguide.cls" "/tex/latex/base/minimal.cls" "/tex/latex/base/sample2e.tex" "/tex/latex/base/small2e.tex" - "/tex/latex/base/source2e.tex" "/tex/latex/base/testpage.tex" "/tex/latex/base/texsys.cfg") (base32 - "0f8d41wk1gb7i6xq1a10drwhhayc50pg9nwzjkrqnxrv0pcc08w5") + "0m0gjb4hbsf2iqkkx3px4f28r2scjvsjv4zb2whkbnb44apyw1f0") #:trivial? #t))) (package (inherit template) @@ -2616,6 +2444,7 @@ formats.") '("aleph aleph" "lamed aleph" "uptex uptex" "euptex euptex" "eptex eptex" "ptex ptex" "pdfxmltex pdftex" "platex eptex" "csplain pdftex" "mf mf-nowin" "mex pdftex" "pdfmex pdftex" + "luacsplain luatex" "cont-en xetex" "cont-en pdftex" "pdfcsplain xetex" "pdfcsplain pdftex" "pdfcsplain luatex" "cslatex pdftex" "mptopdf pdftex" "uplatex euptex" "jadetex pdftex" @@ -2674,7 +2503,7 @@ formats.") "/tex/generic/config/luatexiniconfig.tex" "/web2c/texmfcnf.lua") (base32 - "0cs67a8wwh4s5p5gn8l49jyccgy7glw8mfq5klgn3dfsl2fdlhk7"))))) + "1gi87wy12r8w8fhx9ajcid382dmqzf6b9070b5nndvbbjrvhwf23"))))) (propagated-inputs `(("texlive-dehyph-exptl" ,texlive-dehyph-exptl) ("texlive-etex" ,texlive-etex) @@ -2719,6 +2548,7 @@ formats.") ("texlive-hyphen-mongolian" ,texlive-hyphen-mongolian) ("texlive-hyphen-norwegian" ,texlive-hyphen-norwegian) ("texlive-hyphen-occitan" ,texlive-hyphen-occitan) + ("texlive-hyphen-pali" ,texlive-hyphen-pali) ("texlive-hyphen-piedmontese" ,texlive-hyphen-piedmontese) ("texlive-hyphen-polish" ,texlive-hyphen-polish) ("texlive-hyphen-portuguese" ,texlive-hyphen-portuguese) @@ -2760,7 +2590,7 @@ contain.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0swkbxv8vg0yizadfnvrwjb4cj0pn34v9wm6v7wqq903fdav7k7q")))) + "1h78zw0vhldx478zs4v86ajg7vpkysd1kg3npc480qqls3q6ba40")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/filecontents")) (home-page "https://www.ctan.org/pkg/filecontents") @@ -2825,19 +2655,13 @@ users, via its Plain TeX version.)") (define-public texlive-latex-fancyvrb (package - (name "texlive-latex-fancyvrb") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "latex" "fancyvrb")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "03l7140y031rr14h02i4z9zqsfvrbn7wzwxbjsrjcgrk6sdr71wv")))) - (build-system texlive-build-system) - (arguments - '(#:tex-directory "latex/fancyvrb" - #:tex-format "latex")) + (inherit (simple-texlive-package + "texlive-latex-fancyvrb" + (list "/doc/latex/fancyvrb/README" + "/tex/latex/fancyvrb/") + (base32 + "1dwkcradz9nwpjwmv1sjzn77lvw25ypr0rrgmf1kd8pd2mw7dxcn") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/fancyvrb") (synopsis "Sophisticated verbatim text") (description @@ -2990,7 +2814,7 @@ pdf and HTML backends. The package is distributed with the @code{backref} and (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1m9fg8ddhpsl1212igr9a9fmj012lv780aghjn6fpidg2wqrffmn")))) + "0pi2d6gsddcs9wprdbar46s91kdc5fxl1m79g7xrbccsx8s9xbml")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/oberdiek" @@ -3023,7 +2847,7 @@ arrows; record information about document class(es) used; and many more.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0vj7h1fgf1396h4qjdc2m07y08i54gbbfrxl8y327cn3r1n093s6")))) + "1wqvn4z0s92h5iqzrvxw7hinzp95avjk9v8lnqbqr4kz6nv4xb9l")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/tools" @@ -3092,7 +2916,7 @@ Live distribution.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0p3fsxap1ilwjz356aq4s5ygwvdscis8bh93g8klf8mhrd8cr2jy")))) + "0s77z2cbv841l45qrpf0s8qhzfa4wi689lg7zkw88qg18nzvy0ly")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/l3kernel")) @@ -3116,7 +2940,7 @@ that the LaTeX3 conventions can be used with regular LaTeX 2e packages.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0pyx0hffiyss363vv7fkrcdiaf7p099xnq0mngzqc7v8v9q849hs")))) + "1cv4fk9pabh7mkxhfsdmh4k8xpmzg1psgcsvd11c869m7n3a629h")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/l3packages" @@ -3171,7 +2995,7 @@ programming tools and kernel sup­port. Packages provided in this release are: (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1p0mkn6iywl0k4m9cx3hnhylpi499inisff3f72pcf349baqsnvq")))) + "1223cw029n6zff7pqpwbsq1x8v3w63smczkmnybqxkw5h2za8gbz")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/fontspec" @@ -3354,7 +3178,7 @@ loading fonts by their proper names instead of file names.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0arvk7gn32mshnfdad5qkgf3i1arxq77k3vq7wnpm4nwnrzclxal")))) + "0qgk2332dacsxn1z95qzp35gbs7wrzl1ipjdhnmk1r897msm4sf5")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/amsmath")) (home-page "https://www.ctan.org/pkg/amsmath") @@ -3407,7 +3231,7 @@ distribution.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0yhlfiz3fjc8jd46f1zrjj4jig48l8rrzh8cmd8ammml8z9a01z6")))) + "1rwqq841i1rxywymzwkw0cw2yhgvxwjx5mgygfasvypwrwll6f6s")))) (build-system texlive-build-system) (arguments '(#:tex-directory "generic/babel" @@ -3464,7 +3288,7 @@ for Canadian and USA text.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0h47s67gnhdaxfgbf8pirp5vw4z6rrhxl8zav803yjxka0096i3y")))) + "129f9w41cb6yyrr6kpv3zz9ml6334hyq1wcz7j9jn47p0hlxqfk8")))) (build-system texlive-build-system) (arguments '(#:tex-directory "generic/babel-german")) (home-page "https://www.ctan.org/pkg/babel-german") @@ -3678,7 +3502,7 @@ standard LaTeX packages." (number->string %texlive-revision))) (sha256 (base32 - "06mwpy5i218g5k3sf4gba0fmxgas82hkzx9fhwn67z5ik37d8apq")))))) + "0faqknqxs80qp9ywk0by5k85s0yalg97c4lja4q56lsyblrr4j7i")))))) (home-page (package-home-page texlive-bin)) (synopsis "Union of TeX Live packages") (description "This package provides a subset of the TeX Live @@ -4153,10 +3977,10 @@ to something that's not a float.") (package (inherit (simple-texlive-package "texlive-doi" - (list "/doc/latex/doi/README" + (list "/doc/latex/doi/README.md" "/tex/latex/doi/") (base32 - "17lnnhfmb8g4nh4fnyc9616h8xg3vjrzmlvfmlfqwwlfpma9xnnw") + "18z9922lqb3hliqn95h883fndqs4lgyi5yqbnq2932ya0imc3j7h") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/doi") (synopsis "Create correct hyperlinks for DOI numbers") @@ -4180,7 +4004,7 @@ hyperlink to the target of the DOI.") (list "/doc/latex/etoolbox/" "/tex/latex/etoolbox/") (base32 - "1qg4x5r4ibinl6zy5lq70lv4zcrjsn54n6hwv31k5kl7mwv0mvr3") + "1cc1vw1ach55g4ff4x30by8k1mg01w199ccxvn72f5khlnnxial0") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/etoolbox") (synopsis "e-TeX tools for LaTeX") @@ -4282,7 +4106,7 @@ course of the framed/shaded matter. There is also a command (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0sikazkg0dpkcpzlbqw8qzxr81paf2f443vsrh14jnw7s4gswvc5")))) + "1br4kv9y17cvngp83ykpvy7gy3jqfan5plk7sggcgbdfhndi5dsr")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/g-brief" @@ -4355,7 +4179,7 @@ BibLaTeX, and is considered experimental.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0yw6bjfgsli3s1dldsgb7mkr7lnk329cgdjbgs8z2xn59pmmdsn4")))) + "0a8f38c2ds1flxcr0apdpyaaz3k6fyalz6dkbrmcv9srjc40mh3n")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/geometry")) (propagated-inputs @@ -4406,7 +4230,7 @@ array environments; verbatim handling; and syntax diagrams.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "03ma58z3ypsbp7zgkzb1ylpn2ygr27cxzkf042ns0rif4g8s491f")))) + "0na7v4hsyx5s67cpjj2dbnq8j67k8lln6b19hmj631gfs27slss1")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/polyglossia")) (home-page "https://www.ctan.org/pkg/polyglossia") @@ -4452,7 +4276,7 @@ situations where longtable has problems.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "06cf821y1j7jdg93pb41ayigrfwgn0y49d7w1025zlijjxi6bvjp")))) + "16jy02m089m7n6v9vbfi4xjgngc1fnvsmmppk8axfwzbhdky3c9c")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -4626,7 +4450,7 @@ copy-and-paste functions work properly.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "190pmq8la2rq07xry8bn8z8yywzxv6fqyqaj7yjfj5rgw6x0mas8")))) + "16vd99p01a0y30xr5yf1z2j5da9x8gy21vb30wk08jh31zffbaqj")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/colortbl")) (home-page "https://www.ctan.org/pkg/colortbl") @@ -4685,7 +4509,7 @@ floats, center, flushleft, and flushright, lists, and pages.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1xsnzx7vgdfh9zh2m7bjz6bgdpxsgb1kyc19p50vhs34x5nbgsnr")))) + "0hrwspqkqfahxyzzsnjyrxlgxj06zw1f3636gx76pvl4xhvdj1cj")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -4763,7 +4587,7 @@ footnotes with symbols rather than numbers.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1nsn9wp3wl12b36c0sqrim33lf33cr5wky0h4ncnw8lvqgm7h8wf")))) + "1fbrhqj22vzakn30j71fc41l8nliqbv1dmxm0zlwi2qjjbq6fwav")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/listings" @@ -4897,7 +4721,7 @@ fonts are available in (traced) Adobe Type 1 format, as part of the set, Latin Modern, is not actually a direct development of the EC set, and differs from the EC in a number of particulars.") (license (license:fsf-free "https://www.tug.org/svn/texlive/tags/\ -texlive-2018.2/Master/texmf-dist/doc/fonts/ec/copyrite.txt")))) +texlive-2019.3/Master/texmf-dist/doc/fonts/ec/copyrite.txt")))) ;; FIXME: the fonts should be built from source, but running "tex aefonts.tex" ;; fails with obscure TeX-typical error messages. @@ -5092,7 +4916,7 @@ one of the packages @code{calrsfs} and @code{mathrsfs}.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1xvmms28mvvfpks9x7lfya2xhh5k8jy3qnlih1mzcnf156xnb89z")))) + "0y2y08kr3w6asm9lblj9yywqmhaal36fq71zzcbfsc7cvwf641q7")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/eso-pic")) (home-page "https://www.ctan.org/pkg/eso-pic") @@ -5154,7 +4978,7 @@ splines, and filled circles and ellipses. The package uses @code{tpic} (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0q24b1bkdi9l6bw787bpggww83jh2vj8955aw2m5yccqbx4vgr5r")))) + "1vm9xp67hzif0pqab4r3ialf0cyhi0fa4p8kxgp1ymcf85pqip14")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -5186,7 +5010,7 @@ in the form @code{key=value} are available, for example: (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0qlxy47f1f8plgch3jqfsnrdgpyz20sz46yp33i2jwvf9hvfczf0")))) + "07vbcp6avdwldr870cwf65av2s9lfyzcpp8gpld53yw6lcxgaipj")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/multirow")) (home-page "https://www.ctan.org/pkg/multirow") @@ -5211,7 +5035,7 @@ entry at the \"natural\" width of its text.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1rpx4ibjncj5416rg19v0xjbj3z9avhfdfn2gzp8r8sz9vz25c6g")))) + "1pr6ym3ad7x14ng7gmhsmywh3685d2cnm5qgyrqbigng2r6fcc1k")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -5247,7 +5071,7 @@ positions; a grid for orientation is available.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "14r6h9hqb0qgccxj5l1208694fx8sb8avmgzps36lsbbpszl7i7m")))) + "0j1fhm1m9k6rz80lmch3x44g20y9nm4abaaf8czb0q8hzwlx5aq5")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -5598,7 +5422,7 @@ OT2 encoded fonts, CM bright shaped fonts and Concrete shaped fonts.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0sf18pc6chgy26p9bxxn44xcqhzjrfb53jxjr2y7l3jb6xllhblq")))) + "1xyd57c8z1xi0kbqpbad61flcazz68i9ssxrag0gjvci3irxi8xh")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -5627,7 +5451,7 @@ than the bitmaps Metafont creates.") (uri (texlive-ref "latex" "acmart")) (sha256 (base32 - "0n62cs8dhcbn29y9ij1nnyigzr76yhk36kyahhqkkmvbafbys9s7")) + "18rl67p2zhngskisnhv78mksv8q8q658l6igkswzswldixmkpphq")) (file-name (string-append name "-" version "-checkout")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/acmart")) @@ -5865,7 +5689,7 @@ e-TeX.") (file-name (string-append name "-map-" version "-checkout")) (sha256 (base32 - "18jvcm0vwpg6wwzijvnb92xx78la45kkh71k6l44425krp2vnwm0")))))) + "03rfif2631pgd8g1ar4xblcdh078kky7fvw3kfsj5a47rxxgicp2")))))) (home-page "https://www.ctan.org/pkg/pdftex") (synopsis "TeX extension for direct creation of PDF") (description @@ -5876,7 +5700,7 @@ directly generate PDF documents instead of DVI.") (define texlive-texmf (package (name "texlive-texmf") - (version "20180414") + (version "20190410") (source texlive-texmf-src) (build-system gnu-build-system) (inputs @@ -5953,7 +5777,7 @@ This package contains the complete tree of texmf-dist data.") (define-public texlive (package (name "texlive") - (version "20180414") + (version "20190410") (source #f) (build-system trivial-build-system) (inputs `(("bash" ,bash) ; for wrap-program @@ -6359,7 +6183,7 @@ required: automatic sectioning and pagination, spell checking and so forth.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0lhb2h5hxjq9alpk4r3gvg21pwyifs4ah6hqzp92k55mkp1xv73j")))) + "0s86v2b6b1vky1svmmn8pn0l2gz3v280mvjbr2d9l2sjyarlgz9w")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -6399,7 +6223,7 @@ specification. It replaces the now obsolete @code{movie15} package.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0zp00jg058djx8xp0xqwas92y3j97clkyd8z6pqr890yqy06myqb")))) + "1yhp51w8yr10c10pc9196q7hlw80brzqinnqbjw81d0sf2p0llc5")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -6600,7 +6424,7 @@ striking out (line through words) and crossing out (/// over words).") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1dq8p10pz8wn0vx412m7d7d5gj1syxly3yqdqvf7lv2xl8zndn5h")))) + "1dscrgwyr71vgx35mzb316xl669arzagfgq50fdv3nxga63959b3")))) (build-system trivial-build-system) (native-inputs `(("texlive-latex-pgf-generic" @@ -6614,7 +6438,7 @@ striking out (line through words) and crossing out (/// over words).") (file-name (string-append "texlive-latex-pgf-generic" version "-checkout")) (sha256 (base32 - "0xkxw26sjzr5npjpzpr28yygwdbhzpdd0hsk80gjpidhcxmz393i")))))) + "0hk5x2j15n4pps279cmkbjl1dvhasq3mbhna5xdvp2qgh635ahks")))))) (propagated-inputs `(("texlive-latex-xcolor" ,texlive-latex-xcolor))) (arguments @@ -6658,7 +6482,7 @@ produce either PostScript or PDF output.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0nqwf0sr4mf3v9gqa6apv6ml2xhcdwax0vgyf12a672g7rpdyvgm")))) + "1vz9zg7s5w52xr323zgglzprfrvba2zvyzf6b8vrdf4wdghlpv4z")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils) @@ -6718,7 +6542,7 @@ typearea (which are the main parts of the bundle).") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0hs28fc0v2l92ad9las9b8xcckyrdrwmyhcx1yzmbr6s7s6nvsx8")))) + "1x4wnpca97rnbvvg6wjmbkxxvnfva274q9ahzx746b435q93z3i1")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -6907,7 +6731,7 @@ AMS-LaTeX, AMS-TeX, and plain TeX). The distribution includes Michael Barr's (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0hnbs0s1znbn32hfcsyijl39z81sdb00jf092a4blqz421qs2mbv")))) + "1wijqq605cbhn2bdaryby3xpkwmnk9ixcrjn5zwlfrxbgfblzfmz")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -6966,7 +6790,7 @@ Support for use with LaTeX is available in @code{freenfss}, part of (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0rlx4qqijms1n64gjx475kvip8l322fh7v17zkmwp1l1g0w3vlyz")))) + "0d7d74giz5knvj4rj6mbzd6c05mwg9jrxab86jxdqbc3jy7cl4kz")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -6992,7 +6816,7 @@ of support information.") (list "/doc/latex/beamer/" "/tex/latex/beamer/") (base32 - "00z1a32wkz1ffif7dc8h3ar2fn2hlvfnljgim2szjam2k14l82x3") + "1fqzbkmw2kfxihab8j4dadc3v68xap6v2ghpp2064fna47xlwy1c") #:trivial? #t)) (propagated-inputs `(("texlive-latex-hyperref" ,texlive-latex-hyperref) @@ -7051,7 +6875,7 @@ the file to which it applies.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0ikxg8yzq78hy5b9x13d4nah46d0yvmwlqmdri06pygbx116dcac")))) + "18294h0cr05fs424m3x6aq24z5hf5zmiflalkj4kvpmsyyqqsj74")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/pdfx" @@ -7085,7 +6909,7 @@ the file to which it applies.") (file-name (string-append "texlive-tex-latex-pdfx-" version "-checkout")) (sha256 (base32 - "14j1zsvqc59ims3sk34v6km8db6cimks28y5fcxcr5mi2ykvj4vf")))))) + "171ffvpkj2fab4ljcxv3l6l5c8ga8zavdhmhfq07id8zyyr619ip")))))) (home-page "https://www.ctan.org/pkg/pdfx") (synopsis "PDF/X and PDF/A support for pdfTeX, LuaTeX and XeTeX") (description @@ -7149,7 +6973,7 @@ change.") "/tex/generic/pstricks/" "/tex/latex/pstricks/") (base32 - "04566354c77claxl1sznc490cda0m5gaa5ck6ms4q7mm44rj3rzk") + "0sdxdd0qi4sccw9il7d4s7jivs24pq99cdzfnrf0gkqjb1y8s7cl") #:trivial? #t))) (package (inherit template) @@ -7173,12 +6997,11 @@ or shading the cells of tables.") (let ((template (simple-texlive-package "texlive-pst-text" (list "/doc/generic/pst-text/" - "/source/generic/pst-text/Makefile" "/dvips/pst-text/pst-text.pro" "/tex/generic/pst-text/" "/tex/latex/pst-text/") (base32 - "0s2bbkdfy0shqrrkjflrn0x0pnvxzbdc38pjbdfw46wnmnxrnasm") + "146fpzd1xlqi94q5r48z8ni8qww713yh6nwkbr9pw27mjrqdadb9") #:trivial? #t))) (package (inherit template) @@ -7217,7 +7040,7 @@ LuaTeX (respectively) is not the engine in use.") (list "/doc/latex/tools/" "/source/latex/tools/") (base32 - "0v3zqcpy0w5bzy1xdcv1wnxbmxrn1j6x03h3y2af7qmjggph2a09")))) + "1ivhij7171wvrgcjn4wah84wxwpd21d0chh3zxab4pj067c8d0mh")))) (package (inherit template) (arguments @@ -7360,7 +7183,7 @@ The behaviour in standalone mode may adjusted using a configuration file (list "/source/latex/siunitx/siunitx.dtx" "/doc/latex/siunitx/README.md") (base32 - "0dmljnxgv2bwl3mi74iil41q03swvrm1b0ziwxlhc4m9lx31b1q1"))) + "11kf6znkgw7y5qmw75qk6px6pqf57bwr53q0673zaiyq20lif96c"))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/siunitx" -- cgit v1.2.3 From 0bcc1b14fc3e2382406b97577c56e2292b96b8d4 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 6 Jan 2020 19:58:20 +0100 Subject: gnu: glib: Fix g_app_info_get_default_for_type. Fixes . Reported by Reza Alizadeh Majd . * gnu/packages/glib.scm (glib)[arguments]<#:phases>[patch-gio-launch-desktop]: New phase. [move-executables]: Modify. --- gnu/packages/glib.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2e7f436560..4fe38b7f25 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -213,6 +213,15 @@ shared NFS home directories.") (string-append "command_line = g_strdup_printf (\"" dbus "/bin/dbus-launch"))) #t))) + (add-after 'unpack 'patch-gio-launch-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; See also + ;; for another future fix. + (substitute* "gio/gdesktopappinfo.c" + (("gio-launch-desktop") + (string-append out "/libexec/gio-launch-desktop"))) + #t))) (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. @@ -321,6 +330,13 @@ shared NFS home directories.") (mkdir-p bin) (rename-file (string-append out "/bin") (string-append bin "/bin")) + ;; This one is an implementation detail of glib. + ;; It is wrong that that's in "/bin" in the first place, + ;; but that's what upstream is doing right now. + ;; See . + (mkdir (string-append out "/libexec")) + (rename-file (string-append bin "/bin/gio-launch-desktop") + (string-append out "/libexec/gio-launch-desktop")) ;; Do not refer to "bindir", which points to "${prefix}/bin". ;; We don't patch "bindir" to point to "$bin/bin", because that ;; would create a reference cycle between the "out" and "bin" -- cgit v1.2.3 From f87b68a18627fe8bab960d45460dd2217fa85def Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 17:56:24 +0100 Subject: gnu: findutils: Fix bootstrap on aarch64-linux and armhf-linux. * gnu/packages/patches/findutils-test-rwlock-threads.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/base.scm (findutils)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/base.scm | 3 +- .../patches/findutils-test-rwlock-threads.patch | 38 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/findutils-test-rwlock-threads.patch diff --git a/gnu/local.mk b/gnu/local.mk index fd3d434d0c..0ba01efcc6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -854,6 +854,7 @@ dist_patch_DATA = \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ %D%/packages/patches/file-CVE-2019-18218.patch \ %D%/packages/patches/findutils-localstatedir.patch \ + %D%/packages/patches/findutils-test-rwlock-threads.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a336f5e6d0..52ca78fa70 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -261,7 +261,8 @@ interactive means to merge two files.") (sha256 (base32 "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5")) - (patches (search-patches "findutils-localstatedir.patch")))) + (patches (search-patches "findutils-localstatedir.patch" + "findutils-test-rwlock-threads.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list diff --git a/gnu/packages/patches/findutils-test-rwlock-threads.patch b/gnu/packages/patches/findutils-test-rwlock-threads.patch new file mode 100644 index 0000000000..3062577c21 --- /dev/null +++ b/gnu/packages/patches/findutils-test-rwlock-threads.patch @@ -0,0 +1,38 @@ +Skip "test-rwlock1" when multithreading is disabled, which is the case +during bootstrapping on architectures not supported by GNU Mes. + +Taken from upstream gnulib: +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=fdff8bd09a7f053381f8bdb107ab5280b7c95959 + +diff --git a/gnulib-tests/test-rwlock1.c b/gnulib-tests/test-rwlock1.c +--- a/gnulib-tests/test-rwlock1.c ++++ b/gnulib-tests/test-rwlock1.c +@@ -21,6 +21,8 @@ + + #include + ++#if USE_ISOC_THREADS || USE_POSIX_THREADS || USE_ISOC_AND_POSIX_THREADS || USE_WINDOWS_THREADS ++ + #include "glthread/lock.h" + + #include +@@ -151,3 +153,18 @@ main () + sleep (1); + } + } ++ ++#else ++ ++/* No multithreading available. */ ++ ++#include ++ ++int ++main () ++{ ++ fputs ("Skipping test: multithreading not enabled\n", stderr); ++ return 77; ++} ++ ++#endif + -- cgit v1.2.3 From 488c30437ca12ea6bf487180c1d28df381413e98 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 17:59:20 +0100 Subject: gnu: file: Update to 5.38. * gnu/packages/patches/file-CVE-2019-18218.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/file.scm (file): Update to 5.38. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/file.scm | 5 +-- gnu/packages/patches/file-CVE-2019-18218.patch | 55 -------------------------- 3 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 gnu/packages/patches/file-CVE-2019-18218.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0ba01efcc6..4677c42979 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -852,7 +852,6 @@ dist_patch_DATA = \ %D%/packages/patches/fbreader-curl-7.62.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ - %D%/packages/patches/file-CVE-2019-18218.patch \ %D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-test-rwlock-threads.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index cf770297c4..bac951f9c5 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -30,15 +30,14 @@ (define-public file (package (name "file") - (version "5.37") + (version "5.38") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.astron.com/pub/file/file-" version ".tar.gz")) - (patches (search-patches "file-CVE-2019-18218.patch")) (sha256 (base32 - "0zz0p9bqnswfx0c16j8k62ivjq1m16x10xqv4hy9lcyxyxkkkhg9")))) + "0d7s376b4xqymnrsjxi3nsv3f5v89pzfspzml2pcajdk5by2yg2r")))) (build-system gnu-build-system) ;; When cross-compiling, this package depends upon a native install of diff --git a/gnu/packages/patches/file-CVE-2019-18218.patch b/gnu/packages/patches/file-CVE-2019-18218.patch deleted file mode 100644 index 21069823b7..0000000000 --- a/gnu/packages/patches/file-CVE-2019-18218.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fix CVE-2019-18218: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-18218 - -Patch copied from upstream source repository: - -https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84 - -From 46a8443f76cec4b41ec736eca396984c74664f84 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Mon, 26 Aug 2019 14:31:39 +0000 -Subject: [PATCH] Limit the number of elements in a vector (found by oss-fuzz) - ---- - src/cdf.c | 9 ++++----- - src/cdf.h | 1 + - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/cdf.c b/src/cdf.c -index 9d6396742..bb81d6374 100644 ---- a/src/cdf.c -+++ b/src/cdf.c -@@ -1027,8 +1027,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - goto out; - } - nelements = CDF_GETUINT32(q, 1); -- if (nelements == 0) { -- DPRINTF(("CDF_VECTOR with nelements == 0\n")); -+ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) { -+ DPRINTF(("CDF_VECTOR with nelements == %" -+ SIZE_T_FORMAT "u\n", nelements)); - goto out; - } - slen = 2; -@@ -1070,8 +1071,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - goto out; - inp += nelem; - } -- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", -- nelements)); - for (j = 0; j < nelements && i < sh.sh_properties; - j++, i++) - { -diff --git a/src/cdf.h b/src/cdf.h -index 2f7e554b7..05056668f 100644 ---- a/src/cdf.h -+++ b/src/cdf.h -@@ -48,6 +48,7 @@ - typedef int32_t cdf_secid_t; - - #define CDF_LOOP_LIMIT 10000 -+#define CDF_ELEMENT_LIMIT 100000 - - #define CDF_SECID_NULL 0 - #define CDF_SECID_FREE -1 -- cgit v1.2.3 From 391ee9c3206656df00ae470b3b09729f28efe302 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:03:01 +0100 Subject: gnu: OpenSSL: Remove duplicate #:disallowed-references. * gnu/packages/tls.scm (openssl)[arguments]: Remove #:disallowed-references. --- gnu/packages/tls.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d01202c684..90f99ea49e 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -320,8 +320,7 @@ required structures.") "static")) ;6.4 MiB of .a files (native-inputs `(("perl" ,perl))) (arguments - `(#:disallowed-references (,perl) - #:parallel-build? #f + `(#:parallel-build? #f #:parallel-tests? #f #:test-target "test" -- cgit v1.2.3 From 88b525270d879b0fa32cf0a2a7902ee0a468c94a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:04:09 +0100 Subject: gnu: OpenSSL: Enable parallel build. * gnu/packages/tls.scm (openssl)[arguments]: Remove #:parallel-build?. --- gnu/packages/tls.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 90f99ea49e..1fe08720d1 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -320,8 +320,7 @@ required structures.") "static")) ;6.4 MiB of .a files (native-inputs `(("perl" ,perl))) (arguments - `(#:parallel-build? #f - #:parallel-tests? #f + `(#:parallel-tests? #f #:test-target "test" ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure, -- cgit v1.2.3 From e8b79cd9f449c0419f1d4f09d7b8e0712b6a961f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:08:30 +0100 Subject: gnu: grep: Update to 3.4. * gnu/packages/base.scm (grep): Update to 3.4. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 52ca78fa70..5c48db40a7 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -92,14 +92,14 @@ command-line arguments, multiple languages, and so on.") (define-public grep (package (name "grep") - (version "3.3") + (version "3.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grep/grep-" version ".tar.xz")) (sha256 (base32 - "055mqp6vrd0brkygmygb2673qwz409a7kyp1mzbfy6cn94f58q5r")) + "1yy33kiwrxrwj2nxa4fg15bvmwyghqbs8qwkdvy5phm784f7brjq")) (patches (search-patches "grep-timing-sensitive-test.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ;some of the tests require it -- cgit v1.2.3 From f63495d31bf5acad00b6ee5f44a0553a67ee91fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:09:50 +0100 Subject: gnu: guile: Apply Shepherd fix to the default Guile. * gnu/packages/guile.scm (guile-2.2/bug-fix): Remove variable. (guile-2.2)[source](patches): Add "guile-finalization-crash.patch". * gnu/packages/admin.scm (shepherd)[inputs, native-inputs]: Change from GUILE-2.2/BUG-FIX to GUILE-2.2. --- gnu/packages/admin.scm | 4 ++-- gnu/packages/guile.scm | 13 +------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0790925416..460228db61 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -211,10 +211,10 @@ and provides a \"top-like\" mode (monitoring).") `(("pkg-config" ,pkg-config) ;; This is the Guile we use as a cross-compiler... - ("guile" ,guile-2.2/bug-fix))) + ("guile" ,guile-2.2))) (inputs ;; ... and this is the one that appears in shebangs when cross-compiling. - `(("guile" ,guile-2.2/bug-fix) ;for + `(("guile" ,guile-2.2) ;for ;; The 'shepherd' command uses Readline when used interactively. It's ;; an unusual use case though, so we don't propagate it. diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c0743269fc..7b6009770d 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -230,6 +230,7 @@ without requiring the source code to be rewritten.") "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk")) (modules '((guix build utils))) (patches (search-patches + "guile-finalization-crash.patch" "guile-2.2-skip-oom-test.patch")) ;; Remove the pre-built object files. Instead, build everything @@ -250,18 +251,6 @@ without requiring the source code to be rewritten.") (variable "GUILE_LOAD_COMPILED_PATH") (files '("lib/guile/2.2/site-ccache"))))))) -(define-public guile-2.2/bug-fix - ;; This variant contains a bug fix for a relatively rare crash that could - ;; affect shepherd as PID 1: . - (package - (inherit guile-2.2) - (version (string-append (package-version guile-2.2) "-1")) - (source (origin - (inherit (package-source guile-2.2)) - (patches - (append (search-patches "guile-finalization-crash.patch") - (origin-patches (package-source guile-2.2)))))))) - (define-public guile-2.2/fixed ;; A package of Guile 2.2 that's rarely changed. It is the one used ;; in the `base' module, and thus changing it entails a full rebuild. -- cgit v1.2.3 From 404efac48bbb96ce6852df2059001cbfa22a3cfb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:10:33 +0100 Subject: gnu: python-boot0: Do not inherit source snippet from python. This is in preparation for Python 3.8 which requires changes. * gnu/packages/commencement.scm (python-boot0)[source]: Copy modules and snippet from PYTHON instead of inheriting. --- gnu/packages/commencement.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 928819db6e..0f7ca24865 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1885,13 +1885,21 @@ the bootstrap environment." (version "3.5.7") (source (bootstrap-origin (origin - (inherit (package-source python)) + (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) - (patches '()) (sha256 (base32 - "1p67pnp2ca5przx2s45r8m55dcn6f5hsm0l4s1zp7mglkf4r4n18"))))) + "1p67pnp2ca5przx2s45r8m55dcn6f5hsm0l4s1zp7mglkf4r4n18")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete the bundled copy of libexpat. + (delete-file-recursively "Modules/expat") + (substitute* "Modules/Setup.dist" + ;; Link Expat instead of embedding the bundled one. + (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) + #t))))) (inputs `(,@(%boot0-inputs) ("expat" ,expat-sans-tests))) ;remove OpenSSL, zlib, etc. -- cgit v1.2.3 From 73fec9ca1055199aaa4e39e977d17364c33c860c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:11:10 +0100 Subject: gnu: python-boot0: Update to 3.5.9. * gnu/packages/commencement.scm (python-boot0): Update to 3.5.9. --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 0f7ca24865..d173f5a19b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1882,7 +1882,7 @@ the bootstrap environment." ;; pthreads, which is missing on non-x86 platforms at this stage. ;; Python 3.6 technically supports being built without threading ;; support, but requires additional patches. - (version "3.5.7") + (version "3.5.9") (source (bootstrap-origin (origin (method url-fetch) @@ -1890,7 +1890,7 @@ the bootstrap environment." version "/Python-" version ".tar.xz")) (sha256 (base32 - "1p67pnp2ca5przx2s45r8m55dcn6f5hsm0l4s1zp7mglkf4r4n18")) + "0jdh9pvx6m6lfz2liwvvhn7vks7qrysqgwn517fkpxb77b33fjn2")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From ecfe153706b62714c9d0c2af347fca6e84f6f28a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:12:03 +0100 Subject: gnu: acl: Do not build the static library. * gnu/packages/acl.scm (acl)[arguments]: Add #:configure-flags. --- gnu/packages/acl.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index 0131adcac4..bcab125164 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -48,6 +48,7 @@ (arguments `(#:modules ((ice-9 ftw) ,@%gnu-build-system-modules) + #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases ;; XXX After repacking the sources the timestamps are reset to the -- cgit v1.2.3 From 1fabfd0ec9d28eeb6cfd4e3b33c208c42c059991 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:12:41 +0100 Subject: gnu: libev: Update to 4.31. * gnu/packages/libevent.scm (libev): Update to 4.31. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index b59efecbe1..85436c20c9 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -75,7 +75,7 @@ loop.") (define-public libev (package (name "libev") - (version "4.25") + (version "4.31") (source (origin (method url-fetch) (uri (string-append "http://dist.schmorp.de/libev/Attic/libev-" @@ -83,7 +83,7 @@ loop.") ".tar.gz")) (sha256 (base32 - "1295q0lkkbrlpd5dl5i48bh1rm8mjzh9y795jlvjz3bp4wf7wxbq")))) + "0nkfqv69wfyy2bpga4d53iqydycpik8jp8x6q70353hia8mmv1gd")))) (build-system gnu-build-system) (home-page "http://software.schmorp.de/pkg/libev.html") (synopsis "Event loop loosely modelled after libevent") -- cgit v1.2.3 From 295eaeebcb93a90113c4a377650aabcbd7d2753f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:13:07 +0100 Subject: gnu: libev: Do not build the static library. * gnu/packages/libevent.scm (libev)[arguments]: New field. --- gnu/packages/libevent.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 85436c20c9..c1a7353d44 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -85,6 +85,8 @@ loop.") (base32 "0nkfqv69wfyy2bpga4d53iqydycpik8jp8x6q70353hia8mmv1gd")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (home-page "http://software.schmorp.de/pkg/libev.html") (synopsis "Event loop loosely modelled after libevent") (description -- cgit v1.2.3 From dc73ea4195f9b368a6ed6917b91d70e1b88e7200 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:13:41 +0100 Subject: gnu: libuv: Update to 1.34.1. * gnu/packages/libevent.scm (libuv): Update to 1.34.1. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index c1a7353d44..bc2df4e744 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -101,14 +101,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.34.0") + (version "1.34.1") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0j416x38cp6gh5isn3fwv331aw6bpfmrk8xgm07rq5py47kyqg52")))) + "1kwgl7j9snmjicrszhynfyp4njckqaw6l90y71a0b0alp2m8asbn")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From f0136e4d18fe604e4e2f53c3b30f94ab00c3bf84 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:14:01 +0100 Subject: gnu: libuv: Do not build the static library. * gnu/packages/libevent.scm (libuv)[arguments]: Add #:configure-flags. --- gnu/packages/libevent.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index bc2df4e744..72bbddea00 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -111,7 +111,8 @@ limited support for fork events.") "1kwgl7j9snmjicrszhynfyp4njckqaw6l90y71a0b0alp2m8asbn")))) (build-system gnu-build-system) (arguments - '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. + '(#:configure-flags '("--disable-static") + ;; XXX: Some tests want /dev/tty, attempt to make connections, etc. #:tests? #f)) (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) -- cgit v1.2.3 From 2c854762cece1f1d49ab98e600dd4610b1aa05d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:15:20 +0100 Subject: gnu: python2: Update to 2.7.17. * gnu/packages/python.scm (python-2.7): Update to 2.7.17. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ef1c8e4a09..7aa170ffc0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -97,7 +97,7 @@ (define-public python-2.7 (package (name "python2") - (version "2.7.16") + (version "2.7.17") (source (origin (method url-fetch) @@ -105,7 +105,7 @@ version "/Python-" version ".tar.xz")) (sha256 (base32 - "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj")) + "0hds28cg226m8j8sr394nm9yc4gxhvlv109w0avsf2mxrlrz0hsd")) (patches (search-patches "python-2.7-search-paths.patch" "python-2-deterministic-build-info.patch" "python-2.7-site-prefixes.patch" -- cgit v1.2.3 From ec836b46bf52a5f86c61f50e3a2c3330a7ee3665 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:16:57 +0100 Subject: gnu: help2man: Update to 1.47.12. * gnu/packages/man.scm (help2man): Update to 1.47.12. (help2man/latest): Remove variable. --- gnu/packages/man.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index f396eeafa9..f63946c04f 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -198,7 +198,7 @@ Linux kernel and C library interfaces employed by user-space programs.") (define-public help2man (package (name "help2man") - (version "1.47.10") + (version "1.47.12") (source (origin (method url-fetch) @@ -206,7 +206,7 @@ Linux kernel and C library interfaces employed by user-space programs.") version ".tar.xz")) (sha256 (base32 - "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk")))) + "0q5ixbxz1v7wqnpg4bq7k7nbv9ssnmcvdbqsq5ycjvniz56ac2vx")))) (build-system gnu-build-system) (arguments `(;; There's no `check' target. #:tests? #f)) @@ -226,18 +226,6 @@ Linux kernel and C library interfaces employed by user-space programs.") automatically.") (license gpl3+))) -(define-public help2man/latest - (package - (inherit help2man) - (version "1.47.11") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/help2man/help2man-" - version ".tar.xz")) - (sha256 - (base32 - "123vsimgx8zq1h077sbyh3bd0hbmlc3wih2231wwh133z1bv51ar")))))) - (define-public scdoc (package (name "scdoc") -- cgit v1.2.3 From bb93042c8beb881ab907fa802eefb3c4091039a2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 00:24:28 +0100 Subject: gnu: util-linux: Move libraries to separate output. Fixes . Reported by Diego Nicola Barbato . * gnu/packages/linux.scm (util-linux)[outputs]: Add "lib". [arguments]: Update #:configure-flags and the "move-static-libraries" phase accordingly. Add phases "patch-build-scripts" and "adjust-pkg-config-files". (e2fsprogs, psm, mtd-utils, f2fs-tools, f2fs-tools-1.7, eudev, xfsprogs)[inputs]: Change to the "lib" output of UTIL-LINUX. (btrfs-progs)[inputs]: Remove duplicate UTIL-LINUX inputs and change to use the "lib" output. * gnu/packages/admin.scm (pam-mount)[inputs]: Add UTIL-LINUX:LIB. (testdisk)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/android.scm (abootimg)[inputs]: Likewise. * gnu/packages/audio.scm (jack-1)[propagated-inputs]: Likewise. * gnu/packages/bootloaders.scm (syslinux, vboot-utils)[inputs]: Likewise. * gnu/packages/chez.scm (chez-scheme)[inputs]: Likewise. * gnu/packages/cryptsetup.scm (cryptsetup, cryptsetup-static)[inputs]: Likewise. * gnu/packages/databases.scm (postgresql, 4store)[inputs]: Likewise. * gnu/packages/disk.scm (ndctl, gptfdisk, fdisk, gparted, rmlint, volume-key)[inputs]: Likewise. (parted)[inputs]: Likewise. [native-inputs]: Add UTIL-LINUX. * gnu/packages/efi.scm (sbsigntools)[inputs]: Add UTIL-LINUX:LIB. * gnu/packages/engineering.scm (lib3mf)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise. * gnu/packages/file-systems.scm (glusterfs, jfsutils, zfs)[inputs]: Likewise. * gnu/packages/firmware.scm (ovmf)[inputs]: Likewise. * gnu/packages/fontutils.scm (fontconfig)[propagated-inputs]: Likewise. * gnu/packages/freedesktop.scm (localed)[inputs]: Likewise. * gnu/packages/glib.scm (glib, appstream-glib)[propagated-inputs]: Likewise. * gnu/packages/gnome.scm (tracker, gnome-terminal)[inputs]: Likewise. * gnu/packages/jupyter.scm (xeus)[inputs]: Likewise. * gnu/packages/kde.scm (kpmcore)[inputs]: Likewise. * gnu/packages/kodi.scm (crossguid)[inputs]: Likewise. * gnu/packages/lighting.scm (ola)[inputs]: Likewise. * gnu/packages/music.scm (libgig)[inputs]: Likewise. * gnu/packages/nfs.scm (nfs-utils)[inputs]: Likewise. * gnu/packages/opencog.scm (opencog)[inputs]: Likewise. * gnu/packages/package-management.scm (msitools)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/password-utils.scm (pwsafe)[inputs]: Likewise. * gnu/packages/telephony.scm (pjproject)[propagated-inputs]: Likewise. * gnu/packages/rdf.scm (rasqal)[inputs]: Likewise. * gnu/packages/search.scm (xapian)[inputs]: Likewise. * gnu/packages/sssd.scm (sssd)[native-inputs]: Likewise. * gnu/packages/storage.scm (ceph)[inputs]: Add UTIL-LINUX:LIB. * gnu/packages/task-management.scm (taskwarrior)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/virtualization.scm (libvirt, xen)[inputs]: Likewise. * gnu/packages/xorg.scm (libsm)[inputs]: Likewise. --- gnu/packages/admin.scm | 3 +- gnu/packages/android.scm | 2 +- gnu/packages/audio.scm | 2 +- gnu/packages/bootloaders.scm | 4 +-- gnu/packages/chez.scm | 2 +- gnu/packages/cryptsetup.scm | 4 +-- gnu/packages/databases.scm | 4 +-- gnu/packages/disk.scm | 18 ++++++------ gnu/packages/efi.scm | 1 + gnu/packages/engineering.scm | 2 +- gnu/packages/enlightenment.scm | 2 +- gnu/packages/file-systems.scm | 6 ++-- gnu/packages/firmware.scm | 2 +- gnu/packages/fontutils.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/glib.scm | 4 +-- gnu/packages/gnome.scm | 4 +-- gnu/packages/jupyter.scm | 2 +- gnu/packages/kde.scm | 2 +- gnu/packages/kodi.scm | 2 +- gnu/packages/lighting.scm | 2 +- gnu/packages/linux.scm | 55 ++++++++++++++++++++++++++----------- gnu/packages/music.scm | 2 +- gnu/packages/nfs.scm | 2 +- gnu/packages/opencog.scm | 2 +- gnu/packages/package-management.scm | 2 +- gnu/packages/password-utils.scm | 2 +- gnu/packages/rdf.scm | 2 +- gnu/packages/search.scm | 2 +- gnu/packages/sssd.scm | 2 +- gnu/packages/storage.scm | 1 + gnu/packages/task-management.scm | 2 +- gnu/packages/telephony.scm | 2 +- gnu/packages/virtualization.scm | 4 +-- gnu/packages/xorg.scm | 2 +- 35 files changed, 91 insertions(+), 63 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 460228db61..2b7cac7c16 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1717,7 +1717,7 @@ characters can be replaced as well, as can UTF-8 characters.") (build-system gnu-build-system) (inputs `(("ntfs-3g" ,ntfs-3g) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("openssl" ,openssl) ;; FIXME: add reiserfs. ("zlib" ,zlib) @@ -3561,6 +3561,7 @@ tcpdump and snoop.") ("lvm2" ,lvm2) ("openssl" ,openssl) ("pcre" ,pcre) + ("libmount" ,util-linux "lib") ("util-linux" ,util-linux))) (arguments `(#:configure-flags diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 30dd8925a4..62a5466ed0 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -835,7 +835,7 @@ script that you can put anywhere in your path.") (install-file "abootimg" bin) #t)))))) (inputs - `(("libblkid" ,util-linux))) + `(("libblkid" ,util-linux "lib"))) (home-page "https://ac100.grandou.net/abootimg") (synopsis "Tool for manipulating Android Boot Images") (description "This package provides a tool for manipulating old Android diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2b0e68fdc4..e14516e8e8 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1584,7 +1584,7 @@ especially for creating reverb effects. It supports impulse responses with 1, ;; uuid.h is included in the JACK type headers ;; db.h is included in the libjack metadata headers (propagated-inputs - `(("libuuid" ,util-linux) + `(("libuuid" ,util-linux "lib") ("bdb" ,bdb))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c072ff8c8e..d3773bf6df 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -306,7 +306,7 @@ menu to select one of the installed operating systems.") ("perl" ,perl) ("python-2" ,python-2))) (inputs - `(("libuuid" ,util-linux) + `(("libuuid" ,util-linux "lib") ("mtools" ,mtools))) (arguments `(#:parallel-build? #f @@ -887,7 +887,7 @@ to Novena upstream, does not load u-boot.img from the first partition.") ("libyaml" ,libyaml) ("openssl" ,openssl) ("openssl:static" ,openssl "static") - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (home-page "https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot") (synopsis "ChromiumOS verified boot utilities") diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 3330f91dfc..d08363a8dc 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -77,7 +77,7 @@ (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("libx11" ,libx11) ("xorg-rgb" ,xorg-rgb) ("nanopass" ,nanopass) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 2a824d416e..d4c039ac04 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -62,7 +62,7 @@ ("libgcrypt" ,libgcrypt) ("lvm2" ,lvm2) ; device-mapper ("popt" ,popt) - ("util-linux" ,util-linux))) ; libuuid + ("util-linux" ,util-linux "lib"))) ;libuuid (synopsis "Hard disk encryption tool") (description "LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk @@ -142,6 +142,6 @@ files). This assumes LIBRARY uses Libtool." ("libgcrypt" ,libgcrypt-static) ("lvm2" ,lvm2-static) ("util-linux" ,util-linux "static") - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("popt" ,popt)))) (synopsis "Hard disk encryption tool (statically linked)"))) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5d770f46e5..7607c01391 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -165,7 +165,7 @@ ("avahi" ,avahi) ("cyrus-sasl" ,cyrus-sasl) ("openssl" ,openssl) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) ;; http://www.4store.org has been down for a while now. (home-page "https://github.com/4store/4store") (synopsis "Clustered RDF storage and query engine") @@ -974,7 +974,7 @@ as a drop-in replacement of MySQL.") (invoke "make" "-C" "contrib" "install")))))) (inputs `(("readline" ,readline) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("openssl" ,openssl) ("zlib" ,zlib))) (home-page "https://www.postgresql.org/") diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 8a17e8ddbb..d63ba3e58d 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -100,13 +100,15 @@ (inputs `(("lvm2" ,lvm2) ("readline" ,readline) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (native-inputs `(("gettext" ,gettext-minimal) + ;; For the tests. ("e2fsprogs" ,e2fsprogs) ("perl" ,perl) - ("python" ,python-2))) + ("python" ,python-2) + ("util-linux" ,util-linux))) (home-page "https://www.gnu.org/software/parted/") (synopsis "Disk partition editor") (description @@ -130,7 +132,7 @@ tables. It includes a library and command-line utility.") (inputs `(("gettext" ,gettext-minimal) ("guile" ,guile-1.8) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("parted" ,parted))) ;; The build neglects to look for its own headers in its own tree. A next ;; release should fix this, but may never come: GNU fdisk looks abandoned. @@ -171,7 +173,7 @@ tables, and it understands a variety of different formats.") `(("gettext" ,gettext-minimal) ("ncurses" ,ncurses) ("popt" ,popt) - ("util-linux" ,util-linux))) ; libuuid + ("util-linux" ,util-linux "lib"))) ;libuuid (arguments `(#:test-target "test" #:phases @@ -359,7 +361,7 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") ;; as '/dev/disk/by-id' `(#:tests? #f)) (inputs - `(("util-linux" ,util-linux) + `(("util-linux" ,util-linux "lib") ("parted" ,parted) ("glib" ,glib) ("gtkmm" ,gtkmm) @@ -587,7 +589,7 @@ automatically finding out which program to use for what file type.") (inputs `(("cryptsetup" ,cryptsetup) ("nss" ,nss) - ("libblkid" ,util-linux) + ("libblkid" ,util-linux "lib") ("lvm2" ,lvm2) ; for "-ldevmapper" ("glib" ,glib) ("gpgme" ,gpgme))) @@ -640,7 +642,7 @@ passphrases.") ("json-c" ,json-c) ("keyutils" ,keyutils) ("kmod" ,kmod) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (arguments `(#:configure-flags (list "--disable-asciidoctor" ; use docbook-xsl instead @@ -809,7 +811,7 @@ LVM D-Bus API).") ("libelf" ,libelf) ("elfutils" ,elfutils) ("json-glib" ,json-glib) - ("libblkid" ,util-linux))) + ("libblkid" ,util-linux "lib"))) (home-page "https://rmlint.rtfd.org") (synopsis "Remove duplicates and other lint from the file system") (description "@command{rmlint} finds space waste and other broken things diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index b6e93dd618..2bfebfdbc2 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -113,6 +113,7 @@ environment presented by Intel's EFI.") ("util-linux" ,util-linux))) ; getopt (inputs `(("gnu-efi" ,gnu-efi) + ("libuuid" ,util-linux "lib") ("openssl" ,openssl))) (synopsis "EFI signing tools") (description "This package provides tools for signing EFI binaries.") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3f4cdbd172..bd611f01f2 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2149,7 +2149,7 @@ engineers for reverse engineers.") (native-inputs `(("googletest-source" ,(package-source googletest)))) (inputs - `(("libuuid" ,util-linux))) + `(("libuuid" ,util-linux "lib"))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index d79ca949f2..121627dd88 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -134,7 +134,7 @@ ("lz4" ,lz4) ("openssl" ,openssl) ("pulseaudio" ,pulseaudio) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("wayland" ,wayland) ("zlib" ,zlib))) (arguments diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index a3dc993055..50afe29c77 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -127,7 +127,7 @@ single file can be mounted.") "jfsutils-include-systypes.patch")))) (build-system gnu-build-system) (inputs - `(("util-linux" ,util-linux))) + `(("util-linux" ,util-linux "lib"))) (home-page "http://jfs.sourceforge.net/home.html") (synopsis "Utilities for managing JFS file systems") (description @@ -271,7 +271,7 @@ non-determinism in the build process.") ("fuse", fuse) ("openssl" ,openssl) ("liburcu" ,liburcu) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("libxml2" ,libxml2) ("readline" ,readline) ("zlib" ,zlib) @@ -503,7 +503,7 @@ APFS.") ("openssl" ,openssl) ("python" ,python) ("python-cffi" ,python-cffi) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("zlib" ,zlib))) (home-page "https://zfsonlinux.org/") (synopsis "Native ZFS on Linux") diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 0156a4e9fa..ab03bc32fd 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -253,7 +253,7 @@ coreboot.") ("gcc" ,gcc-5) ("nasm" ,nasm) ("python-2" ,python-2) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (arguments `(#:tests? #f ; No check target. #:phases diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index b5c8d27c7e..107967bb5d 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -308,7 +308,7 @@ fonts to/from the WOFF2 format.") ;; In Requires or Requires.private of fontconfig.pc. (propagated-inputs `(("expat" ,expat) ("freetype" ,freetype) - ("libuuid" ,util-linux))) + ("libuuid" ,util-linux "lib"))) (inputs `(("gs-fonts" ,gs-fonts))) (native-inputs `(("gperf" ,gperf) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ed221439b4..79363f5662 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -476,7 +476,7 @@ of a the system to know what users are logged in, and where.") (find-files ".." "^(kbd-model-map|language-fallback-map)$")) #t))))))) (native-inputs (package-native-inputs elogind)) - (inputs `(("libmount" ,util-linux) + (inputs `(("libmount" ,util-linux "lib") ("xkeyboard-config" ,xkeyboard-config) ("kbd" ,kbd) ,@(package-inputs elogind))) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 4fe38b7f25..2b8700f6da 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -188,7 +188,7 @@ shared NFS home directories.") `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc ;; These are in the Requires.private field of gio-2.0.pc - ("util-linux" ,util-linux) ; for libmount + ("util-linux" ,util-linux "lib") ;for libmount ("libselinux" ,libselinux) ("zlib" ,zlib))) (inputs @@ -931,7 +931,7 @@ programming language. It also contains the utility (propagated-inputs `(("gcab" ,gcab) ; for .pc file ("gdk-pixbuf" ,gdk-pixbuf) ; for .pc file - ("util-linux" ,util-linux))) ; for .pc file + ("libuuid" ,util-linux "lib"))) ; for .pc file (inputs `(("glib" ,glib) ("gperf" ,gperf) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ac566b8647..b841a72c3b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3832,7 +3832,7 @@ more fun.") ("vte" ,vte) ("gnutls" ,gnutls) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("vala" ,vala))) (home-page "https://wiki.gnome.org/Apps/Terminal") (synopsis "Terminal emulator") @@ -7291,7 +7291,7 @@ easy, safe, and automatic.") ("openjpeg" ,openjpeg-1) ("libseccomp" ,libseccomp) ("libsoup" ,libsoup) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("network-manager" ,network-manager))) (synopsis "Metadata database, indexer and search tool") (home-page "https://wiki.gnome.org/Projects/Tracker") diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index e65a8bd6c9..3f16bc27f1 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -171,7 +171,7 @@ Messaging Protocol}.") ("cppzmq" ,cppzmq) ("zeromq" ,zeromq) ("openssl" ,openssl) - ("util-linux" ,util-linux))) ;libuuid + ("util-linux" ,util-linux "lib"))) ;libuuid (home-page "https://quantstack.net/xeus") (synopsis "C++ implementation of the Jupyter Kernel protocol") (description diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index bb5c25014e..924ca752d9 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -472,7 +472,7 @@ cards.") ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase) ("qca" ,qca) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (home-page "https://community.kde.org/Frameworks") (synopsis "Library for managing partitions") (description "Library for managing partitions.") diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 23afd138a3..bc61e96d19 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -121,7 +121,7 @@ (string-append out "/lib")) #t)))))) (inputs - `(("util-linux" ,util-linux))) + `(("libuuid" ,util-linux "lib"))) (synopsis "Lightweight universal identifier library") (description "CrossGuid is a minimal GUID/UUID generator library for C++.") diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm index b91f5c8834..18110420de 100644 --- a/gnu/packages/lighting.scm +++ b/gnu/packages/lighting.scm @@ -57,7 +57,7 @@ `(("libftdi" ,libftdi) ("libmicrohttpd" ,libmicrohttpd) ("libusb" ,libusb) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("zlib" ,zlib))) (propagated-inputs ;; Ola 0.10.5 only supports protobuf 2.x, and building it with 3.x breaks. diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7e2d04e53e..e91d4c2c21 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1118,19 +1118,33 @@ providing the system administrator with some help in common tasks.") (("build_kill=yes") "build_kill=no")) #t)))) (build-system gnu-build-system) - (outputs '("out" - "static")) ;>2 MiB of static .a libraries + (outputs '("out" ;6.4 MiB executables and documentation + "lib" ;8.8 MiB shared libraries, headers and locales + "static")) ;2.9 MiB static .a libraries (arguments `(#:configure-flags (list "--disable-use-tty-group" "--enable-fs-paths-default=/run/current-system/profile/sbin" ;; Don't try to chown root:root mount and umount "--disable-makeinstall-chown" + "--localstatedir=/var" + (string-append "--localedir=" + (assoc-ref %outputs "lib") + "/share/locale") ;; Install completions where our ;; bash-completion package expects them. (string-append "--with-bashcompletiondir=" (assoc-ref %outputs "out") "/etc/bash_completion.d")) #:phases (modify-phases %standard-phases + (add-before 'configure 'patch-build-scripts + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "configure" + ;; The build system assumes that we want to install + ;; libraries below $exec_prefix when $libdir does not + ;; match any of the "usual" locations. Fix that. + (("usrlib_execdir='\\$\\{exec_prefix\\}'\\$libdir") + "usrlib_execdir=$libdir")) + #t)) (add-before 'build 'set-umount-file-name (lambda* (#:key outputs #:allow-other-keys) ;; Tell 'eject' the right file name of 'umount'. @@ -1150,10 +1164,12 @@ providing the system administrator with some help in common tasks.") #t))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) + (let ((lib (assoc-ref outputs "lib")) (static (assoc-ref outputs "static"))) + + ;; Move static libraries to the "static" output. (mkdir-p (string-append static "/lib")) - (with-directory-excursion out + (with-directory-excursion lib (for-each (lambda (file) (rename-file file (string-append static "/" @@ -1166,7 +1182,16 @@ providing the system administrator with some help in common tasks.") (substitute* (find-files "lib" "\\.la$") (("old_library=.*") "old_library=''\n"))) - #t)))))) + #t))) + (add-after 'install 'adjust-pkg-config-files + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (assoc-ref outputs "lib"))) + ;; Drop the unused "prefix=" and "exec_prefix=" variables from + ;; the pkg-config files to avoid a cyclic reference on "out". + (substitute* (find-files (string-append lib "/lib/pkgconfig") + "\\.pc$") + (("^(exec_)?prefix=.*") ""))) + #t))))) (inputs `(("zlib" ,zlib) ("ncurses" ,ncurses) @@ -1333,7 +1358,7 @@ slabtop, and skill.") (base32 "00nwl1ppjalxbnx40dsm895r3q793p8nni6n81saj7faj2szdyk5")))) (build-system gnu-build-system) - (inputs `(("util-linux" ,util-linux))) + (inputs `(("util-linux" ,util-linux "lib"))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo) ;for the libext2fs Info manual @@ -2746,7 +2771,7 @@ from the module-init-tools project.") ;; When linked against libblkid, eudev can populate /dev/disk/by-label ;; and similar; it also installs the '60-persistent-storage.rules' file, ;; which contains the rules to do that. - `(("util-linux" ,util-linux) ;for blkid + `(("util-linux" ,util-linux "lib") ;for blkid ("kmod" ,kmod))) (home-page "https://wiki.gentoo.org/wiki/Project:Eudev") (synopsis "Userspace device management") @@ -4048,11 +4073,9 @@ and copy/paste text in the console and in xterm.") #:test-target "test" #:parallel-tests? #f)) ; tests fail when run in parallel (inputs `(("e2fsprogs" ,e2fsprogs) - ("libblkid" ,util-linux) - ("libblkid:static" ,util-linux "static") - ("libuuid" ,util-linux) - ("libuuid:static" ,util-linux "static") ("lzo" ,lzo) + ("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid + ("util-linux:static" ,util-linux "static") ;ditto ("zlib" ,zlib) ("zlib:static" ,zlib "static") ("zstd" ,zstd "lib") @@ -4182,7 +4205,7 @@ obviously it can be shared with files outside our set).") ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (inputs - `(("libuuid" ,util-linux) + `(("libuuid" ,util-linux "lib") ("libselinux" ,libselinux))) (home-page "https://f2fs.wiki.kernel.org/") (synopsis "Userland tools for f2fs") @@ -4208,7 +4231,7 @@ disks and SD cards. This package provides the userland utilities.") (base32 "0z9c0y3qq75iyqknl5k0v7v46l8c3pcifpqb0yqalrs24blkm7dk")))) (inputs - `(("libuuid" ,util-linux))))) + `(("libuuid" ,util-linux "lib"))))) (define-public freefall (package @@ -4877,7 +4900,7 @@ are exceeded.") ("pkg-config" ,pkg-config))) (inputs `(("acl" ,acl) ; extended attributes (xattr) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("lzo" ,lzo) ("openssl" ,openssl) ; optional crypto support ("zlib" ,zlib) @@ -5655,7 +5678,7 @@ libraries, which are often integrated directly into libfabric.") "psm-disable-memory-stats.patch")))) (build-system gnu-build-system) (outputs '("out" "debug")) - (inputs `(("libuuid" ,util-linux))) + (inputs `(("libuuid" ,util-linux "lib"))) (arguments '(#:make-flags `("PSM_USE_SYS_UUID=1" "CC=gcc" "WERROR=" ,(string-append "INSTALL_PREFIX=" %output) @@ -6032,7 +6055,7 @@ IP addresses and routes, and configure IPsec.") (native-inputs `(("gettext" ,gettext-minimal))) (inputs - `(("libuuid" ,util-linux) + `(("libuuid" ,util-linux "lib") ("python" ,python-wrapper))) (home-page "https://xfs.wiki.kernel.org/") (synopsis "XFS file system tools") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2583191f33..4a4d870ac5 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2252,7 +2252,7 @@ improves on support for JACK features, such as JACK MIDI.") "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn")))) (build-system gnu-build-system) (inputs - `(("libuuid" ,util-linux) + `(("libuuid" ,util-linux "lib") ("libsndfile" ,libsndfile))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index b81623fd07..7efee9360a 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -113,7 +113,7 @@ ("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen' ("sqlite" ,sqlite) ("lvm2" ,lvm2) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("mit-krb5" ,mit-krb5) ("libtirpc" ,libtirpc))) (native-inputs diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index c6828d6603..6484c10dce 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -235,7 +235,7 @@ tasks.") ("cogutil" ,cogutil) ("gmp" ,gmp) ("guile" ,guile-2.2) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("link-grammar" ,link-grammar))) (native-inputs `(("cxxtest" ,cxxtest) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6becdb22a9..009dfba85c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -939,7 +939,7 @@ Microsoft cabinet (.@dfn{CAB}) files.") ("glib" ,glib) ("libgsf" ,libgsf) ("libxml2" ,libxml2) - ("uuid" ,util-linux))) + ("uuid" ,util-linux "lib"))) (home-page "https://wiki.gnome.org/msitools") (synopsis "Windows Installer file manipulation tool") (description diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index db5f54e1d9..bef32e8d29 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -209,7 +209,7 @@ algorithms AES or Twofish.") ("zip" ,zip))) (inputs `(("curl" ,curl) ("file" ,file) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("libxt" ,libxt) ("libxtst" ,libxtst) ("openssl" ,openssl) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index b086d2f00f..c69e9cb892 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -217,7 +217,7 @@ taxonomic inference capability.") ("libxml2" ,libxml2) ("mpfr" ,mpfr) ("pcre" ,pcre) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (propagated-inputs `(("raptor2" ,raptor2))) ; stipulated by rasqal.pc (arguments diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 3b7bc36889..5410263d5b 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -59,7 +59,7 @@ (base32 "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm index 7bb71dce13..905f0b11ca 100644 --- a/gnu/packages/sssd.scm +++ b/gnu/packages/sssd.scm @@ -164,7 +164,7 @@ fundamental object types for C.") ("libxml2" ,libxml2) ; for xmllint ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) - ("util-linux" ,util-linux))) ; for uuid.h, reqired for KCM + ("util-linux" ,util-linux "lib"))) ;for uuid.h, reqired for KCM (home-page "https://pagure.io/SSSD/sssd/") (synopsis "System security services daemon") (description "SSSD is a system daemon. Its primary function is to provide diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index a5614777fa..e3a883a535 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -231,6 +231,7 @@ ("snappy" ,snappy) ("udev" ,eudev) ("util-linux" ,util-linux) + ("util-linux:lib" ,util-linux "lib") ("xfsprogs" ,xfsprogs) ("zlib" ,zlib))) (home-page "https://ceph.com/") diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 701e14a5e2..a0313c17c2 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -40,7 +40,7 @@ (inputs `(("gnutls" ,gnutls) ("lua" ,lua) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (arguments `(#:tests? #f ; No tests implemented. #:phases diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 1ae0724ba2..8a84cbc2cd 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -624,7 +624,7 @@ calls and messages") ("libsrtp" ,libsrtp) ("gnutls" ,gnutls) ("resample", resample) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 51ba3c602a..a3db8e813d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -480,7 +480,7 @@ manage system or application containers.") ("libpcap" ,libpcap) ("libnl" ,libnl) ("libtirpc" ,libtirpc) ;for - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("lvm2" ,lvm2) ;for libdevmapper ("curl" ,curl) ("openssl" ,openssl) @@ -1336,7 +1336,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) ("pixman" ,pixman) ("qemu" ,qemu-minimal) ("seabios" ,seabios) - ("util-linux" ,util-linux) ; uuid + ("util-linux" ,util-linux "lib") ; uuid ; TODO: ocaml-findlib, ocaml-nox. ("xz" ,xz) ; for liblzma ("zlib" ,zlib))) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9127d38c3a..c7b4c8299b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1233,7 +1233,7 @@ hit when running single-threaded.") `(("libice" ,libice))) ; SMlib.h includes ICElib.h (inputs `(("xtrans" ,xtrans) - ("util-linux" ,util-linux))) + ("libuuid" ,util-linux "lib"))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") -- cgit v1.2.3 From a76a343082d61d5303b61a9e4cbde4ab8515a1e7 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Tue, 14 Jan 2020 17:59:21 +0100 Subject: gnu: curl: Make libcurl respect SSL_CERT_DIR and SSL_CERT_FILE. * gnu/packages/patches/curl-use-ssl-cert-env.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/curl.scm (curl)[source]: Use the patch. [native-search-paths]: Add the new variables. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 + gnu/packages/curl.scm | 20 ++++++-- gnu/packages/patches/curl-use-ssl-cert-env.patch | 64 ++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/curl-use-ssl-cert-env.patch diff --git a/gnu/local.mk b/gnu/local.mk index 62ea29cdbb..659098deb5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -789,6 +789,7 @@ dist_patch_DATA = \ %D%/packages/patches/csvkit-fix-tests.patch \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ + %D%/packages/patches/curl-use-ssl-cert-env.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index ee1cca449b..3d230dc1f0 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Roel Janssen ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,8 @@ version ".tar.xz")) (sha256 (base32 - "0nh3j90w6b97wqcgxjfq55qhkz9s38955fbhwzv2fsi7483j895p")))) + "0nh3j90w6b97wqcgxjfq55qhkz9s38955fbhwzv2fsi7483j895p")) + (patches (search-patches "curl-use-ssl-cert-env.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -74,10 +76,20 @@ ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (native-search-paths - ;; Note: This search path is respected by the `curl` command-line tool only. - ;; Ideally we would bake this into libcurl itself so other users can benefit, - ;; but it's not supported upstream due to thread safety concerns. + ;; These variables are introduced by libcurl-use-ssl-cert-env.patch. (list (search-path-specification + (variable "SSL_CERT_DIR") + (separator #f) ;single entry + (files '("etc/ssl/certs"))) + (search-path-specification + (variable "SSL_CERT_FILE") + (file-type 'regular) + (separator #f) ;single entry + (files '("etc/ssl/certs/ca-certificates.crt"))) + ;; Note: This search path is respected by the `curl` command-line + ;; tool only. Patching libcurl to read it too would bring no + ;; advantages and require maintaining a more complex patch. + (search-path-specification (variable "CURL_CA_BUNDLE") (file-type 'regular) (separator #f) ;single entry diff --git a/gnu/packages/patches/curl-use-ssl-cert-env.patch b/gnu/packages/patches/curl-use-ssl-cert-env.patch new file mode 100644 index 0000000000..c8e80b4445 --- /dev/null +++ b/gnu/packages/patches/curl-use-ssl-cert-env.patch @@ -0,0 +1,64 @@ +Make libcurl respect the SSL_CERT_{DIR,FILE} variables by default. The variables +are fetched during initialization to preserve thread-safety (curl_global_init(3) +must be called when no other threads exist). + +This fixes network functionality in rust:cargo, and probably removes the need +for other future workarounds. +=================================================================== +--- curl-7.66.0.orig/lib/easy.c 2020-01-02 15:43:11.883921171 +0100 ++++ curl-7.66.0/lib/easy.c 2020-01-02 16:18:54.691882797 +0100 +@@ -134,6 +134,9 @@ + # pragma warning(default:4232) /* MSVC extension, dllimport identity */ + #endif + ++char * Curl_ssl_cert_dir = NULL; ++char * Curl_ssl_cert_file = NULL; ++ + /** + * curl_global_init() globally initializes curl given a bitwise set of the + * different features of what to initialize. +@@ -155,6 +158,9 @@ + #endif + } + ++ Curl_ssl_cert_dir = curl_getenv("SSL_CERT_DIR"); ++ Curl_ssl_cert_file = curl_getenv("SSL_CERT_FILE"); ++ + if(!Curl_ssl_init()) { + DEBUGF(fprintf(stderr, "Error: Curl_ssl_init failed\n")); + return CURLE_FAILED_INIT; +@@ -260,6 +266,9 @@ + Curl_ssl_cleanup(); + Curl_resolver_global_cleanup(); + ++ free(Curl_ssl_cert_dir); ++ free(Curl_ssl_cert_file); ++ + #ifdef WIN32 + Curl_win32_cleanup(init_flags); + #endif +diff -ur curl-7.66.0.orig/lib/url.c curl-7.66.0/lib/url.c +--- curl-7.66.0.orig/lib/url.c 2020-01-02 15:43:11.883921171 +0100 ++++ curl-7.66.0/lib/url.c 2020-01-02 16:21:11.563880346 +0100 +@@ -524,6 +524,21 @@ + if(result) + return result; + #endif ++ extern char * Curl_ssl_cert_dir; ++ extern char * Curl_ssl_cert_file; ++ if(Curl_ssl_cert_dir) { ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_ORIG], Curl_ssl_cert_dir)) ++ return result; ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], Curl_ssl_cert_dir)) ++ return result; ++ } ++ ++ if(Curl_ssl_cert_file) { ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_ORIG], Curl_ssl_cert_file)) ++ return result; ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], Curl_ssl_cert_file)) ++ return result; ++ } + } + + set->wildcard_enabled = FALSE; -- cgit v1.2.3 From 12341d344a91b073b210a72bde30f6781fe6d9cd Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:57:54 +0000 Subject: gnu: ruby-listen: Update to 3.2.0. This avoids some test failures when updating Ruby to 2.6. * gnu/packages/ruby.scm (ruby-listen): Update to 3.2.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 969fc95a00..cc3510b98d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4584,7 +4584,7 @@ a native C extension.") (define-public ruby-listen (package (name "ruby-listen") - (version "3.1.5") + (version "3.2.0") (source (origin ;; The gem does not include a Rakefile, so fetch from the Git @@ -4596,7 +4596,7 @@ a native C extension.") (file-name (git-file-name name version)) (sha256 (base32 - "1hqmkfa9f2xb5jlvqbafdxjd5ax75jm8gqj5nh3k22xq0kacsvgg")))) + "1hkp1g6hk5clsmbd001gkc12ma6s459x820piajyasv61m87if24")))) (build-system ruby-build-system) (arguments `(#:test-target "spec" -- cgit v1.2.3 From cf7201c4cc8be4b66f16da1670edee8fe6e1fd72 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:02 +0000 Subject: gnu: ruby-aruba: Update to 0.14.14. Stop patching out the use of simplecov, it's used throughout the tests now, so it's not as simple to avoid using it. * gnu/packages/ruby.scm (ruby-aruba): Update to 0.14.14. [arguments]: Stop patching out the use of simplecov. [native-inputs]: Add ruby-simplecov. --- gnu/packages/ruby.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cc3510b98d..b11dc8a138 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5441,14 +5441,14 @@ It is intended be used by all Cucumber implementations to parse (define-public ruby-aruba (package (name "ruby-aruba") - (version "0.14.8") + (version "0.14.14") (source (origin (method url-fetch) (uri (rubygems-uri "aruba" version)) (sha256 (base32 - "0zdd81l1lp0x78sxa6kkfqclpj5il3xl70nz05wqv2sfzzhqydxh")))) + "0l2mfpdxc03gdrbwc2hv4vdhjhqhfcdp6d02j05j64ncpi9srlqn")))) (build-system ruby-build-system) (arguments '(#:test-target "spec" @@ -5480,11 +5480,7 @@ It is intended be used by all Cucumber implementations to parse ((".*cucumber.*") "\n") ((".*license_finder.*") "\n") ((".*rake.*") "gem 'rake'\n") - ((".*simplecov.*") "\n") ((".*relish.*") "\n")) - (substitute* "spec/spec_helper.rb" - ((".*simplecov.*") "") - (("^SimpleCov.*") "")) (substitute* "aruba.gemspec" (("spec\\.add\\_runtime\\_dependency 'cucumber'.*") "spec.add_runtime_dependency 'cucumber'")) @@ -5494,7 +5490,8 @@ It is intended be used by all Cucumber implementations to parse (native-inputs `(("bundler" ,bundler) ("ruby-rspec" ,ruby-rspec) - ("ruby-fuubar" ,ruby-fuubar))) + ("ruby-fuubar" ,ruby-fuubar) + ("ruby-simplecov" ,ruby-simplecov))) (propagated-inputs `(("ruby-childprocess" ,ruby-childprocess) ("ruby-contracts" ,ruby-contracts) -- cgit v1.2.3 From 5142012471867818f18574dc1202a52ce8eedfb7 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:13 +0000 Subject: gnu: ruby-childprocess-0.6: Remove version 0.6.3. As it is unused. * gnu/packages/ruby.scm (ruby-childprocess-0.6): Rename to ruby-childprocess. [version, source]: Copy from ruby-childprocess. --- gnu/packages/ruby.scm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b11dc8a138..ae40be29a2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7460,17 +7460,17 @@ in standard Ruby syntax.") (home-page "https://github.com/ruby/rake") (license license:expat))) -(define-public ruby-childprocess-0.6 +(define-public ruby-childprocess (package (name "ruby-childprocess") - (version "0.6.3") + (version "0.9.0") (source (origin (method url-fetch) (uri (rubygems-uri "childprocess" version)) (sha256 (base32 - "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv")))) + "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p")))) (build-system ruby-build-system) (arguments `(#:tests? #f)) @@ -7485,19 +7485,6 @@ programs running in the background, in Ruby.") (home-page "http://github.com/enkessler/childprocess") (license license:expat))) -(define-public ruby-childprocess - (package - (inherit ruby-childprocess-0.6) - (name "ruby-childprocess") - (version "0.9.0") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "childprocess" version)) - (sha256 - (base32 - "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p")))))) - (define-public ruby-public-suffix (package (name "ruby-public-suffix") -- cgit v1.2.3 From 459e4a1aa184ad863eec4374ca7683de92b4aa06 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:17 +0000 Subject: gnu: ruby-childprocess: Update to 3.0.0. * gnu/packages/ruby.scm (ruby-childprocess): Update to 3.0.0. [home-page]: Switch to https, as it's supported by github.com. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ae40be29a2..140d9f5fd2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7463,14 +7463,14 @@ in standard Ruby syntax.") (define-public ruby-childprocess (package (name "ruby-childprocess") - (version "0.9.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (rubygems-uri "childprocess" version)) (sha256 (base32 - "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p")))) + "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5")))) (build-system ruby-build-system) (arguments `(#:tests? #f)) @@ -7482,7 +7482,7 @@ in standard Ruby syntax.") (synopsis "Control external programs running in the background, in Ruby") (description "@code{childprocess} provides a gem to control external programs running in the background, in Ruby.") - (home-page "http://github.com/enkessler/childprocess") + (home-page "https://github.com/enkessler/childprocess") (license license:expat))) (define-public ruby-public-suffix -- cgit v1.2.3 From f321380fb3fa5921dcbe77df4329af8b242a2dcb Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:22 +0000 Subject: gnu: ruby-yard: Update to 0.9.20. * gnu/packages/ruby.scm (ruby-yard): Update to 0.9.20. [arguments]: Delete the Gemfile before running the tests. [native-inputs]: Add ruby-redcloth and ruby-asciidoctor. --- gnu/packages/ruby.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 140d9f5fd2..eec20b088f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5783,7 +5783,7 @@ A modified copy of yajl is used, and included in the package.") (define-public ruby-yard (package (name "ruby-yard") - (version "0.9.16") + (version "0.9.20") (source (origin (method git-fetch) @@ -5794,20 +5794,24 @@ A modified copy of yajl is used, and included in the package.") (file-name (git-file-name name version)) (sha256 (base32 - "0a4r1pfs0ms4vlccsf1x2jckx35lqm8b8lh6rdjxqfr5fia5izpf")))) + "1v48zz8hzazrg79jksj9siys21d2axvzijvkxw2j42zh86syi1wi")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ + ;; Delete the Gemfile to avoid errors relating to it + (delete-file "Gemfile") ;; $HOME needs to be set to somewhere writeable for tests to run (setenv "HOME" "/tmp") ;; Run tests without using 'rake' to avoid dependencies. (invoke "rspec")))))) (native-inputs `(("ruby-rspec" ,ruby-rspec) - ("ruby-rack" ,ruby-rack))) + ("ruby-rack" ,ruby-rack) + ("ruby-redcloth" ,ruby-redcloth) + ("ruby-asciidoc" ,ruby-asciidoctor))) (synopsis "Documentation generation tool for Ruby") (description "YARD is a documentation generation tool for the Ruby programming -- cgit v1.2.3 From d0d2dd24de81a90116008863b2a868de43d3663f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:28 +0000 Subject: gnu: ruby-hoe: Update to 3.21.0. * gnu/packages/ruby.scm (ruby-hoe): Update to 3.21.0. [arguments]: Avoid having SOURCE_DATE_EPOCH set while the tests are running. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index eec20b088f..48cbf427d5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -299,14 +299,32 @@ a menu system for providing multiple options to the user.") (define-public ruby-hoe (package (name "ruby-hoe") - (version "3.16.2") + (version "3.21.0") (source (origin (method url-fetch) (uri (rubygems-uri "hoe" version)) (sha256 (base32 - "12q6dn2irsfamdbjpqvs0dwl4i1vl7wflxrcg972h9jw0ds38f3a")))) + "0qid0n56mgsjvq5ksxajv0gb92akky8imwgvw22ajms5g4fd6nf4")))) (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; One of the tests fails if the SOURCE_DATE_EPOCH environment + ;; variable is set, so unset it for the duration of the tests. + ;; + ;; TestHoe#test_possibly_better + ;; [/tmp/guix-build-ruby-hoe-3.20.0.drv-0/gem/test/test_hoe.rb:250]: + ;; Expected: 2019-11-12 00:00:00 UTC + ;; Actual: 1970-01-01 00:00:00 UTC + (add-before 'check 'unset-SOURCE-DATE-EPOCH + (lambda _ + (unsetenv "SOURCE_DATE_EPOCH") + #t)) + (add-after 'check 'set-SOURCE-DATE-EPOCH-again + (lambda _ + (setenv "SOURCE_DATE_EPOCH" "1") + #t))))) (synopsis "Ruby project management helper") (description "Hoe is a rake/rubygems helper for project Rakefiles. It helps manage, -- cgit v1.2.3 From 6754323bd865d3b58c5049c55fb9744ff1a41893 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:37 +0000 Subject: gnu: ruby-power-assert: Update to 1.1.5. * gnu/packages/ruby.scm (ruby-power-assert): Update to 1.1.5. [arguments]: Disable running the tests. --- gnu/packages/ruby.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 48cbf427d5..5db3d3b2ef 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2292,14 +2292,16 @@ using Net::HTTP, supporting reconnection and retry according to RFC 2616.") (define-public ruby-power-assert (package (name "ruby-power-assert") - (version "0.2.7") + (version "1.1.5") (source (origin (method url-fetch) (uri (rubygems-uri "power_assert" version)) (sha256 (base32 - "0ka6w71lcan4wgf111xi3pcn9ma9lhakv31jg8w007nwzi0xfjbi")))) + "1dii0wkfa0jm8sk9b20zl1z4980dmrjh0zqnii058485pp3ws10s")))) (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests (native-inputs `(("bundler" ,bundler))) (synopsis "Assert library with descriptive assertion messages") -- cgit v1.2.3 From 1c65d99f1b455ac06c6e30594aa4d8243d36b8b6 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:41 +0000 Subject: gnu: ruby-json-pure: Update to 2.2.0. * gnu/packages/ruby.scm (ruby-json-pure): Update to 2.2.0. [home-page]: Add trailing /, due to a redirect. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5db3d3b2ef..34c7b9c157 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4498,13 +4498,13 @@ a native C extension.") (define-public ruby-json-pure (package (name "ruby-json-pure") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (rubygems-uri "json_pure" version)) (sha256 (base32 - "12yf9fmhr4c2jm3xl20vf1qyz5i63vc8a6ngz9j0f86nqwhmi2as")))) + "0m0j1mfwv0mvw72kzqisb26xjl236ivqypw1741dkis7s63b8439")))) (build-system ruby-build-system) (arguments `(#:phases @@ -4538,7 +4538,7 @@ a native C extension.") (synopsis "JSON implementation in pure Ruby") (description "This package provides a JSON implementation written in pure Ruby.") - (home-page "https://flori.github.com/json") + (home-page "https://flori.github.com/json/") (license license:ruby))) (define-public ruby-jwt -- cgit v1.2.3 From 740fea08727fc300f530e00fab49a57e984387cb Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:56 +0000 Subject: gnu: ruby-tzinfo: Skip safe tests. The safe tests attempt to run with Ruby 2.6, but these tests fail if the build takes place within /tmp, as the Ruby LOAD_PATH then includes /tmp, which is world writable. * gnu/packages/ruby.scm (ruby-tzinfo)[arguments]: Add skip-safe-tests phase. --- gnu/packages/ruby.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 34c7b9c157..95d29850b5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4108,6 +4108,16 @@ utilities for Ruby.") (base32 "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp")))) (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-safe-tests + (lambda _ + (substitute* "test/test_utils.rb" + (("def safe_test\\(options = \\{\\}\\)") + "def safe_test(options = {}) + skip('The Guix build environment has an unsafe load path')")) + #t))))) (propagated-inputs `(("ruby-thread-safe" ,ruby-thread-safe))) (synopsis "Time zone library for Ruby") -- cgit v1.2.3 From f6d7df3ceea04187023cabfab402d7891cd9b81f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:59:01 +0000 Subject: gnu: ruby-2.4: Update to 2.4.9. * gnu/packages/ruby.scm (ruby-2.4): Update to 2.4.9. --- gnu/packages/ruby.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 95d29850b5..79a36e9c19 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -133,7 +133,7 @@ a focus on simplicity and productivity.") (define-public ruby-2.4 (package (inherit ruby) - (version "2.4.3") + (version "2.4.9") (source (origin (method url-fetch) @@ -142,8 +142,7 @@ a focus on simplicity and productivity.") "/ruby-" version ".tar.xz")) (sha256 (base32 - "0l9bv67dgsphk42lmiskhrnh47hbyj6rfg2rcjx22xivpx07srr3")) - (patches (search-patches "ruby-rubygems-276-for-ruby24.patch")) + "0546ymj2h3iai679fvx17bb2hksrqyhh22llxgz8fwggac100khc")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi -- cgit v1.2.3 From 4914c157fd3380dd25a1b00f5b44638943f6353b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:59:05 +0000 Subject: gnu: ruby: Update to 2.6.5. Make zlib a propagated-input, as the pkgconfig configuration includes linking against zlib as default, which means that gems with native components will fail to build without zlib. * gnu/packages/ruby.scm (ruby): Update to 2.6.5. --- gnu/packages/ruby.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 79a36e9c19..ff1b63785c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -78,7 +78,7 @@ (define-public ruby (package (name "ruby") - (version "2.5.3") + (version "2.6.5") (source (origin (method url-fetch) @@ -87,7 +87,7 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "0vrhrw7kcz9mg0jkqnihkcxqy5k05v8k1j0y2735z8wfk8sx1j8w")) + "0qhsw2mr04f3lqinkh557msr35pb5rdaqy4vdxcj91flgxqxmmnm")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi @@ -118,8 +118,9 @@ `(("readline" ,readline) ("openssl" ,openssl) ("libffi" ,libffi) - ("gdbm" ,gdbm) - ("zlib" ,zlib))) + ("gdbm" ,gdbm))) + (propagated-inputs + `(("zlib" ,zlib))) (native-search-paths (list (search-path-specification (variable "GEM_PATH") -- cgit v1.2.3 From 227fab3ed8842b22337196ee21c79143fc093855 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:59:11 +0000 Subject: gnu: Add ruby-2.5. * gnu/packages/ruby.scm (ruby-2.5): New variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ff1b63785c..50758d204b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -131,6 +131,25 @@ a focus on simplicity and productivity.") (home-page "https://www.ruby-lang.org") (license license:ruby))) +(define-public ruby-2.5 + (package + (inherit ruby) + (version "2.5.7") + (source + (origin + (method url-fetch) + (uri (string-append "http://cache.ruby-lang.org/pub/ruby/" + (version-major+minor version) + "/ruby-" version ".tar.xz")) + (sha256 + (base32 + "159zka4sbx1p4ayxqi7a5ybbzxvn3n5mivrz4d1damw9ypl70610")) + (modules '((guix build utils))) + (snippet `(begin + ;; Remove bundled libffi + (delete-file-recursively "ext/fiddle/libffi-3.2.1") + #t)))))) + (define-public ruby-2.4 (package (inherit ruby) -- cgit v1.2.3 From aded68b30083d2042c543c0a1d7685b2147c2b83 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 10:32:07 +0200 Subject: gnu: sed: Update to 4.8. * gnu/packages/base.scm (sed): Update to 4.8. [source]: Download gzip tarball. --- gnu/packages/base.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5c48db40a7..bb7ab350b4 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra @@ -133,14 +133,14 @@ including, for example, recursive directory searching.") (define-public sed (package (name "sed") - (version "4.7") + (version "4.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/sed/sed-" version - ".tar.xz")) + ".tar.gz")) (sha256 (base32 - "0smxcx66vx29djzb542nxcynl7qnzxqa5032ibazi7x2s267d198")))) + "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk")))) (build-system gnu-build-system) (synopsis "Stream editor") (native-inputs -- cgit v1.2.3 From 8bd2b15b06f6306e37cc72995b76a7f0754cf1a6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 3 Jan 2020 15:20:18 +0100 Subject: gnu: make-bootstrap: Add cross-libc:static to the inputs. This is a follow-up of 4610ab7c9a5327df0d475262817bc081a5891aa8. 'getpw' & co fail with a cross-compiled statically-linked guile. * gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc)[inputs]: Add "cross-libc:static". --- gnu/packages/make-bootstrap.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d149a7ec1a..0144a6e9a2 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019 Mark H Weaver ;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -137,7 +138,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define (inputs) (if (%current-target-system) ; is this package cross built? `(("cross-libc" - ,(cross-bootstrap-libc (%current-target-system)))) + ,(cross-bootstrap-libc (%current-target-system))) + ("cross-libc:static" + ,(cross-bootstrap-libc (%current-target-system)) + "static")) '())) (define (native-inputs) -- cgit v1.2.3 From 4798554038271f1a6d1319313ca68ea99ddaabbe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Dec 2019 18:29:57 +0100 Subject: gnu: mit-krb5: Set localstatedir to /var. * gnu/packages/kerberos.scm (mit-krb5)[arguments]: Set localstatedir. --- gnu/packages/kerberos.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 7435566c06..2b8ebbac77 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2012, 2017 Ludovic Courtès -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2019 Mathieu Othacehe @@ -76,14 +76,16 @@ ,@(if (%current-target-system) '(#:configure-flags - (list "krb5_cv_attr_constructor_destructor=yes" + (list "--localstatedir=/var" + "krb5_cv_attr_constructor_destructor=yes" "ac_cv_func_regcomp=yes" "ac_cv_printf_positional=yes" "ac_cv_file__etc_environment=yes" "ac_cv_file__etc_TIMEZONE=no") #:make-flags (list "CFLAGS+=-DDESTRUCTOR_ATTR_WORKS=1")) - '()) + '(#:configure-flags + (list "--localstatedir=/var"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source-directory -- cgit v1.2.3 From 201015b10eb6988ea15ab8aacd7944b48a5549a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Jan 2020 12:56:34 +0100 Subject: gnu: texlive-latex-base: Fix syntax error in Lua file. * gnu/packages/tex.scm (texlive-latex-base)[arguments]: Patch ltluatex.dtx. --- gnu/packages/tex.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a31e2695e7..d95434aa8f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2402,6 +2402,13 @@ formats.") (srfi srfi-26))) ((#:phases phases) `(modify-phases ,phases + ;; The literal tab in the dtx file is translated to the string + ;; "^^I" in the generated Lua file, which causes a syntax error. + (add-after 'unpack 'fix-lua-sources + (lambda _ + (substitute* "source/latex/base/ltluatex.dtx" + ((" ") " ")) + #t)) (replace 'build (lambda* (#:key inputs #:allow-other-keys) ;; Find required fonts -- cgit v1.2.3 From 36930b2463fc933e7c5580f49413dbd14cf1df48 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 21:21:07 +0100 Subject: packages: 'patch-and-repack' sets the mtime to 1, not 0. * guix/packages.scm (patch-and-repack)[build]: Pass "--mtime=@1" instead of "--mtime=@0". --- guix/packages.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 5ecb97f946..d925e754a3 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2017, 2018 Mark H Weaver ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Alex Kost @@ -637,8 +637,10 @@ specifies modules in scope when evaluating SNIPPET." (apply invoke (string-append #+tar "/bin/tar") "cvfa" #$output - ;; avoid non-determinism in the archive - "--mtime=@0" + ;; Avoid non-determinism in the archive. Set the mtime + ;; to 1 as is the case in the store (software like gzip + ;; behaves differently when it stumbles upon mtime = 0). + "--mtime=@1" "--owner=root:0" "--group=root:0" (if tar-supports-sort? -- cgit v1.2.3 From 64b39d6e42ab349507ed495edf26c48c426b5a1a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 20:17:46 +0100 Subject: gnu: Remove texinfo@6.6 * gnu/packages/texinfo.scm (texinfo): Update to 6.7. (texinfo-6.7): Remove variable. --- gnu/packages/texinfo.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index ae8ecc868b..04f63dafa7 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -42,14 +42,14 @@ (define-public texinfo (package (name "texinfo") - (version "6.6") + (version "6.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) (sha256 (base32 - "0rixv4c301djr0d0cnsxs8c1wjndi6bf9vi5axz6mwjkv80cmfcv")))) + "1aicn1v3czqii08wc91jw089n1x3gfchkf808q2as59dak0h714q")))) (build-system gnu-build-system) (arguments ;; When cross-compiling, the package is configured twice: once with the @@ -91,18 +91,6 @@ their source and the command-line Info reader. The emphasis of the language is on expressing the content semantically, avoiding physical markup commands.") (license gpl3+))) -(define-public texinfo-6.7 - (package - (inherit texinfo) - (version "6.7") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/texinfo/texinfo-" - version ".tar.xz")) - (sha256 - (base32 - "1aicn1v3czqii08wc91jw089n1x3gfchkf808q2as59dak0h714q")))))) - (define-public texinfo-5 (package (inherit texinfo) (version "5.2") -- cgit v1.2.3 From e21b70acccedb3758ef124543fb522795d219608 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 11:00:26 +0100 Subject: gnu: libcap: Update to 2.31. * gnu/packages/linux.scm (libcap): Update to 2.31. [inputs]: Remove ATTR. --- gnu/packages/linux.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3fd70306eb..02b3c021b5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1956,7 +1956,7 @@ configuration (iptunnel, ipmaddr).") (define-public libcap (package (name "libcap") - (version "2.27") + (version "2.31") (source (origin (method url-fetch) (uri (string-append @@ -1964,7 +1964,7 @@ configuration (iptunnel, ipmaddr).") "libcap2/libcap-" version ".tar.xz")) (sha256 (base32 - "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs")))) + "0ikwm0kngrqa4ci80lqnrkk17kg09q7dxrz28y0gm5qw3vj8s266")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -1982,7 +1982,6 @@ configuration (iptunnel, ipmaddr).") (assoc-ref %outputs "out")) "RAISE_SETFCAP=no"))) (native-inputs `(("perl" ,perl))) - (inputs `(("attr" ,attr))) (home-page "https://sites.google.com/site/fullycapable/") (synopsis "Library for working with POSIX capabilities") (description -- cgit v1.2.3 From 2a65cd8c05633c00589918878a15370c6397e593 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 18:06:58 +0100 Subject: gnu: libcap: Enable tests. * gnu/packages/linux.scm (libcap)[arguments]: Remove #:tests?. Add #:test-target. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 02b3c021b5..60f217ba95 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1976,7 +1976,7 @@ configuration (iptunnel, ipmaddr).") (string-append "LDFLAGS := -Wl,-rpath=" %output "/lib"))) #t))) - #:tests? #f ; no 'check' target + #:test-target "test" #:make-flags (list "lib=lib" (string-append "prefix=" (assoc-ref %outputs "out")) -- cgit v1.2.3 From 76feb6e74ba2aa57ab7d5e61d7b64c0d2a1fb557 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 11:03:49 +0100 Subject: gnu: gmp: Update to 6.2.0. * gnu/packages/multiprecision.scm (gmp): Update to 6.2.0. --- gnu/packages/multiprecision.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 36d035ada0..4d8c3d3fdf 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -37,7 +37,7 @@ (define-public gmp (package (name "gmp") - (version "6.1.2") + (version "6.2.0") (source (origin (method url-fetch) (uri @@ -45,7 +45,7 @@ version ".tar.xz")) (sha256 (base32 - "04hrwahdxyqdik559604r7wrj9ffklwvipgfxgj4ys4skbl6bdc7")) + "09hmg8k63mbfrx1x3yy6y1yzbbq85kw5avbibhcgrg9z3ganr3i5")) (patches (search-patches "gmp-faulty-test.patch")))) (build-system gnu-build-system) (native-inputs `(("m4" ,m4))) -- cgit v1.2.3 From 14ab0249783a4df8fb405d54a138f42677e9dfa0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 18:05:47 +0100 Subject: gnu: guile@3.0: Do not inherit all patches from guile@2.2. * gnu/packages/guile.scm (guile-3.0)[source](patches): New field. --- gnu/packages/guile.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index cba4d363e1..223104610c 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -284,7 +284,8 @@ without requiring the source code to be rewritten.") version ".tar.xz")) (sha256 (base32 - "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9")))) + "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9")) + (patches (search-patches "guile-2.2-skip-oom-test.patch")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") -- cgit v1.2.3 From e3ca10aba12cb953f79ab7518d7478010ad69140 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 18:08:09 +0100 Subject: gnu: tzdata-for-tests: Update to 2019c. * gnu/packages/base.scm (tzdata-for-tests): Inherit all of TZDATA. --- gnu/packages/base.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index bb7ab350b4..9f8130be50 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1278,26 +1278,7 @@ and daylight-saving rules.") ;;; package. (define-public tzdata-for-tests (hidden-package - (package - (inherit tzdata) - (version "2019b") - (source (origin - (method url-fetch) - (uri (string-append - "https://data.iana.org/time-zones/releases/tzdata" - version ".tar.gz")) - (sha256 - (base32 - "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85")))) - (inputs - `(("tzcode" ,(origin - (method url-fetch) - (uri (string-append - "https://data.iana.org/time-zones/releases/tzcode" - version ".tar.gz")) - (sha256 - (base32 - "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf"))))))))) + (package/inherit tzdata))) (define-public libiconv (package -- cgit v1.2.3 From 84fd5d6feb7e234a32965a80dfdd66cfe0f4aea3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 18:10:09 +0100 Subject: gnu: xorg-server-for-tests: Update to 1.20.7. * gnu/packages/xorg.scm (xorg-server-for-tests): Inherit all of XORG-SERVER. --- gnu/packages/xorg.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 74eaccbc85..017a41203d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5282,16 +5282,7 @@ draggable titlebars and borders.") (define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server) - (version "1.20.5") - (source (origin - (inherit (package-source xorg-server)) - (uri (string-append - "mirror://xorg/individual/xserver/" - "xorg-server-" version ".tar.bz2")) - (sha256 - (base32 - "17dc3g8cc55nbkx3np64dsz04n621dnzjmcc9wys0xbyyd1q47d8"))))))) + (inherit xorg-server)))) (define-public xorg-server-xwayland (package -- cgit v1.2.3 From 99406d9b684ec60384dc29d850905dd517fb9790 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 18:11:38 +0100 Subject: gnu: ghostscript: Fix CVE-2019-14869. * gnu/packages/patches/ghostscript-CVE-2019-14869.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/ghostscript.scm (ghostscript)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/ghostscript.scm | 3 +- .../patches/ghostscript-CVE-2019-14869.patch | 48 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ghostscript-CVE-2019-14869.patch diff --git a/gnu/local.mk b/gnu/local.mk index b6a717820b..6958cc6af0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -910,6 +910,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-monad-par-fix-tests.patch \ %D%/packages/patches/ghc-pandoc-fix-html-tests.patch \ %D%/packages/patches/ghc-pandoc-fix-latex-test.patch \ + %D%/packages/patches/ghostscript-CVE-2019-14869.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index c63fc2f9f9..84c6985bde 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -170,7 +170,8 @@ printing, and psresize, for adjusting page sizes.") (sha256 (base32 "1m770dwc82afdgzgq2kar3120r1lbybm3mssdm79f8kggf0v16yv")) - (patches (search-patches "ghostscript-no-header-creationdate.patch" + (patches (search-patches "ghostscript-CVE-2019-14869.patch" + "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) (modules '((guix build utils))) diff --git a/gnu/packages/patches/ghostscript-CVE-2019-14869.patch b/gnu/packages/patches/ghostscript-CVE-2019-14869.patch new file mode 100644 index 0000000000..d80fba0594 --- /dev/null +++ b/gnu/packages/patches/ghostscript-CVE-2019-14869.patch @@ -0,0 +1,48 @@ +Fix CVE-2019-14869: + +https://nvd.nist.gov/vuln/detail/CVE-2019-14869 + +Patch taken from upstream: + +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=485904772c5f0aa1140032746e5a0abfc40f4cef + +diff --git a/Resource/Init/gs_ttf.ps b/Resource/Init/gs_ttf.ps +index 74043d1..6be8fe9 100644 +--- a/Resource/Init/gs_ttf.ps ++++ b/Resource/Init/gs_ttf.ps +@@ -1304,7 +1304,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef + TTFDEBUG { (\n1 setting alias: ) print dup ==only + ( to be the same as ) print 2 index //== exec } if + +- 7 index 2 index 3 -1 roll exch .forceput ++ 7 index 2 index 3 -1 roll exch put + } forall + pop pop pop + } +@@ -1322,7 +1322,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef + exch pop + TTFDEBUG { (\n2 setting alias: ) print 1 index ==only + ( to use glyph index: ) print dup //== exec } if +- 5 index 3 1 roll .forceput ++ 5 index 3 1 roll put + //false + } + { +@@ -1339,7 +1339,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef + { % CharStrings(dict) isunicode(boolean) cmap(dict) RAGL(dict) gname(name) codep(integer) gindex(integer) + TTFDEBUG { (\3 nsetting alias: ) print 1 index ==only + ( to be index: ) print dup //== exec } if +- exch pop 5 index 3 1 roll .forceput ++ exch pop 5 index 3 1 roll put + } + { + pop pop +@@ -1369,7 +1369,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef + } ifelse + ] + TTFDEBUG { (Encoding: ) print dup === flush } if +-} .bind executeonly odef % hides .forceput ++} .bind odef + + % ---------------- CIDFontType 2 font loading ---------------- % + -- cgit v1.2.3 From cdba91486a60bbba727d843707322f98f8286124 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 18:13:53 +0100 Subject: gnu: make: Update to 4.3. * gnu/packages/patches/make-impure-dirs.patch: Adjust for renamed files. * gnu/packages/patches/make-glibc-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/base.scm (gnu-make): Update to 4.3. [source](uri): Change to ".gz" tarball. [source](patches): Remove obsolete. [arguments]: Remove #:configure-flags. Adjust for renamed files. [inputs]: Change from GUILE-2.0 to GUILE-3.0. * gnu/packages/commencement.scm (gnu-make-boot0)[arguments]: Add #:configure-flags. --- gnu/local.mk | 1 - gnu/packages/base.scm | 18 ++++------ gnu/packages/commencement.scm | 5 +++ gnu/packages/patches/make-glibc-compat.patch | 52 ---------------------------- gnu/packages/patches/make-impure-dirs.patch | 12 +++---- 5 files changed, 18 insertions(+), 70 deletions(-) delete mode 100644 gnu/packages/patches/make-glibc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6958cc6af0..fb9f506f31 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1152,7 +1152,6 @@ dist_patch_DATA = \ %D%/packages/patches/luminance-hdr-qt-printer.patch \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/lxsession-use-gapplication.patch \ - %D%/packages/patches/make-glibc-compat.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9f8130be50..45f6cf79ba 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -360,31 +360,27 @@ functionality beyond that which is outlined in the POSIX standard.") (define-public gnu-make (package (name "make") - (version "4.2.1") + (version "4.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/make/make-" version - ".tar.bz2")) + ".tar.gz")) (sha256 (base32 - "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn")) - (patches (search-patches "make-impure-dirs.patch" - "make-glibc-compat.patch")))) + "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0")) + (patches (search-patches "make-impure-dirs.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) ; to detect Guile - (inputs `(("guile" ,guile-2.0))) + (inputs `(("guile" ,guile-3.0))) (outputs '("out" "debug")) (arguments - '(;; Work around faulty glob detection with glibc 2.27. See - ;; . - #:configure-flags '("make_cv_sys_gnu_glob=yes") - #:phases + '(#:phases (modify-phases %standard-phases (add-before 'build 'set-default-shell (lambda* (#:key inputs #:allow-other-keys) ;; Change the default shell from /bin/sh. (let ((bash (assoc-ref inputs "bash"))) - (substitute* "job.c" + (substitute* "src/job.c" (("default_shell =.*$") (format #f "default_shell = \"~a/bin/sh\";\n" bash))) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d173f5a19b..851bb02163 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1412,6 +1412,11 @@ exec " gcc "/bin/" program #:implicit-inputs? #f #:tests? #f ; cannot run "make check" ,@(substitute-keyword-arguments (package-arguments gnu-make) + ((#:configure-flags flags ''()) + ;; The generated config.status has some problems due to the + ;; bootstrap environment. Disable dependency tracking to work + ;; around it. + `(cons "--disable-dependency-tracking" ,flags)) ((#:phases phases) `(modify-phases ,phases (replace 'build diff --git a/gnu/packages/patches/make-glibc-compat.patch b/gnu/packages/patches/make-glibc-compat.patch deleted file mode 100644 index 9ce7f2b5bf..0000000000 --- a/gnu/packages/patches/make-glibc-compat.patch +++ /dev/null @@ -1,52 +0,0 @@ -Work with the new glob interface in glibc 2.27. - -Taken from this upstream commit: -https://git.savannah.gnu.org/cgit/make.git/commit/?id=193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 - -diff --git a/dir.c b/dir.c -index adbb8a9..c343e4c 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void diff --git a/gnu/packages/patches/make-impure-dirs.patch b/gnu/packages/patches/make-impure-dirs.patch index 83a5fbe3a5..89595b06ec 100644 --- a/gnu/packages/patches/make-impure-dirs.patch +++ b/gnu/packages/patches/make-impure-dirs.patch @@ -4,9 +4,9 @@ don't look in /usr/include and friends. Patch from Nixpkgs, by Eelco Dolstra. -diff -rc make-3.81-orig/read.c make-3.81/read.c -*** make-3.81-orig/read.c 2006-03-17 15:24:20.000000000 +0100 ---- make-3.81/read.c 2007-05-24 17:16:31.000000000 +0200 +diff -rc make-3.81-orig/src/read.c make-3.81/src/read.c +*** make-3.81-orig/src/read.c 2006-03-17 15:24:20.000000000 +0100 +--- make-3.81/src/read.c 2007-05-24 17:16:31.000000000 +0200 *************** *** 99,107 **** --- 99,109 ---- @@ -21,9 +21,9 @@ diff -rc make-3.81-orig/read.c make-3.81/read.c #endif 0 }; -diff -rc make-3.81-orig/remake.c make-3.81/remake.c -*** make-3.81-orig/remake.c 2006-03-20 03:36:37.000000000 +0100 ---- make-3.81/remake.c 2007-05-24 17:06:54.000000000 +0200 +diff -rc make-3.81-orig/src/remake.c make-3.81/src/remake.c +*** make-3.81-orig/src/remake.c 2006-03-20 03:36:37.000000000 +0100 +--- make-3.81/src/remake.c 2007-05-24 17:06:54.000000000 +0200 *************** *** 1452,1460 **** --- 1452,1462 ---- -- cgit v1.2.3 From c2d837b943e522d6da350421283e7670c9b88da2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 19:15:40 +0100 Subject: gnu: orbit2: Disable parallel tests. * gnu/packages/gnome.scm (orbit2)[arguments]: Add #:parallel-tests?. --- gnu/packages/gnome.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4d92f58eb5..5a813f6854 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2468,7 +2468,9 @@ functionality was designed to be as reusable and portable as possible.") "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam")))) (build-system gnu-build-system) (arguments - `(#:configure-flags + `(;; The "timeout-server" test hangs when run in parallel. + #:parallel-tests? #f + #:configure-flags '(;; We don't need static libraries, plus they don't build reproducibly ;; (non-deterministic ordering of .o files in the archive.) "--disable-static" -- cgit v1.2.3 From 848a3cdb4f5e214c28c520b2b4ce63a247996ce1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 18:53:28 +0100 Subject: gnu: cmake: Update to 3.16.3. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.16.3. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e24b6dea7d..21f11ac4f0 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -52,7 +52,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.16.2") + (version "3.16.3") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -60,7 +60,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1ag65ignli58kpmji6gjhj8xw4w1qdr910i99hsvx8hcqrp7h2cc")) + "0s06wrp0jnw2l4yq94skj53hwnz7lqrmhh96sq7w7njkkggickz5")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 03d66a84f7fd817aeef3e4838b70ad913ced3586 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 20:43:22 +0100 Subject: gnu: Add deprecation notice for 'boost-with-python3'. * gnu/packages/boost.scm (boost-with-python3): New public variable. --- gnu/packages/boost.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index e44087dcb5..ded4db0586 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -201,6 +201,9 @@ across a broad spectrum of applications.") `(("python" ,python-2) ,@(alist-delete "python" (package-native-inputs boost)))))) +(define-public boost-with-python3 + (deprecated-package "boost-with-python3" boost)) + (define-public boost-static (package (inherit boost) -- cgit v1.2.3 From 2bb84b8efe9195549cfd2c30a7b861d33041232d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 20:44:49 +0100 Subject: gnu: Add deprecation notice for 'sqlite-with-column-metadata'. * gnu/packages/sqlite.scm (sqlite-with-column-metadata): New public variable. --- gnu/packages/sqlite.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 195146aca2..445c1606cf 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -102,3 +102,8 @@ zero-configuration, transactional SQL database engine. SQLite is the most widely deployed SQL database engine in the world. The source code for SQLite is in the public domain.") (license license:public-domain))) + +;; Column metadata support was added to the regular 'sqlite' package with +;; commit fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7. +(define-public sqlite-with-column-metadata + (deprecated-package "sqlite-with-column-metadata" sqlite)) -- cgit v1.2.3 From 6ab31af7c7fae218388b624af6c092d72b12c5b3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 20:46:34 +0100 Subject: gnu: curl: Remove unused input. Groff is only needed to build the PDF manual, which we currently do not. * gnu/packages/curl.scm (curl)[native-inputs]: Remove GROFF. --- gnu/packages/curl.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 3d230dc1f0..b2884ddd82 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -71,12 +71,10 @@ ("zlib" ,zlib))) (native-inputs `(("perl" ,perl) - ;; to enable the --manual option and make test 1026 pass - ("groff" ,groff) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (native-search-paths - ;; These variables are introduced by libcurl-use-ssl-cert-env.patch. + ;; These variables are introduced by curl-use-ssl-cert-env.patch. (list (search-path-specification (variable "SSL_CERT_DIR") (separator #f) ;single entry -- cgit v1.2.3 From f5fa1a77c76376d2cfe5af13578bb74b2f2a67af Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 21:11:24 +0100 Subject: gnu: curl: Remove unnecessary reference to the "doc" output. * gnu/packages/curl.scm (curl)[arguments]: Add #:disallowed-references. Add phase to prevent configure flags from being stored in the output. --- gnu/packages/curl.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index b2884ddd82..b06d01c7d7 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2015 Ludovic Courtès ;;; Copyright © 2016, 2017, 2019 Leo Famulari -;;; Copyright © 2017, 2019 Marius Bakke +;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Roel Janssen @@ -93,13 +93,20 @@ (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))))) (arguments - `(#:configure-flags (list "--with-gnutls" + `(#:disallowed-references ("doc") + #:configure-flags (list "--with-gnutls" (string-append "--with-gssapi=" (assoc-ref %build-inputs "mit-krb5")) "--disable-static") - ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl #:phases (modify-phases %standard-phases + (add-after 'unpack 'do-not-record-configure-flags + (lambda _ + ;; Do not save the configure options to avoid unnecessary references. + (substitute* "curl-config.in" + (("@CONFIGURE_OPTIONS@") + "\"not available\"")) + #t)) (add-after 'install 'move-man3-pages (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 26edcd9b8db553bed324149bc039c306a804a2a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 18 Jan 2020 21:16:26 +0100 Subject: gnu: RHash: Download tarball from SourceForge instead of a git checkout. * gnu/packages/crypto.scm (rhash)[source]: Change to URL-FETCH. --- gnu/packages/crypto.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 276612f887..fde3ba286d 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -711,14 +711,13 @@ BLAKE.") (version "1.3.9") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rhash/RHash") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "mirror://sourceforge/rhash/rhash/" version + "/rhash-" version "-src.tar.gz")) + (file-name (string-append "rhash-" version ".tar.gz")) (sha256 (base32 - "06i49x1l21h2q7pfnf4crbmjyg8b9ad0qs10ywyyn5sjpi0c21wq")))) + "1xn9fqa6rlnhsbgami45g82dlw9i1skg2sri3ydiinwak5ph1ca2")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From ff5733d186839f32d1558a9e1f049d218613fa1a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Jan 2020 19:18:04 +0100 Subject: gnu: libjpeg-turbo: Build with a minimal variant of CMake. This is necessary to avoid a circular dependency in the next commit. * gnu/packages/curl.scm (curl-minimal): New public variable. * gnu/packages/cmake.scm (cmake-minimal-bootstrap): New public variable. * gnu/packages/image.scm (libjpeg-turbo)[arguments]: Add #:cmake. --- gnu/packages/cmake.scm | 14 +++++++++++++- gnu/packages/curl.scm | 12 +++++++++++- gnu/packages/image.scm | 10 ++++++++-- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 21f11ac4f0..cf542f12e4 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer @@ -232,6 +232,18 @@ and workspaces that can be used in the compiler environment of your choice.") (search-paths (package-native-search-paths cmake-minimal)))) +;; The purpose of this package is to solve a circular dependency between +;; packages that use cmake-build-system and CMakes own dependencies. +(define-public cmake-minimal-bootstrap + (package + (inherit cmake-minimal) + (name "cmake-minimal-bootstrap") + (native-inputs + `(;; cURL depends on ghostscript (via groff and OpenLDAP), which depends on + ;; 'cmake-build-system' through libtiff and ultimately libjpeg-turbo. + ("curl" ,curl-minimal) + ,@(alist-delete "curl" (package-native-inputs cmake-minimal)))))) + (define-public emacs-cmake-mode (package (inherit cmake) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index b06d01c7d7..9289e2ffd3 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -46,7 +46,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages tls) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (srfi srfi-1)) (define-public curl (package @@ -159,6 +160,15 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) +;; This package exists mainly to bootstrap CMake. It must not depend on +;; anything that uses cmake-build-system. +(define-public curl-minimal + (hidden-package + (package/inherit + curl + (name "curl-minimal") + (inputs (alist-delete "openldap" (package-inputs curl)))))) + (define-public kurly (package (name "kurly") diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 709599fb98..4fef6fe21e 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages curl) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) @@ -1504,8 +1505,13 @@ is hereby granted.")))) (native-inputs `(("nasm" ,nasm))) (arguments - '(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib" - "-DENABLE_STATIC=0"))) + `(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib" + "-DENABLE_STATIC=0") + ,@(if (%current-target-system) + '() + ;; Use a special "bootstrap" CMake for the native build to work + ;; around a circular dependency between CMake and this package. + `(#:cmake ,cmake-minimal-bootstrap)))) (home-page "https://libjpeg-turbo.org/") (synopsis "SIMD-accelerated JPEG image handling library") (description "libjpeg-turbo is a JPEG image codec that accelerates baseline -- cgit v1.2.3 From 4bd428a7ce382f623784a3ff8186aadc3cebca91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Jan 2020 19:27:01 +0100 Subject: gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo'. * gnu/packages/abiword.scm (abiword)[inputs]: Change from LIBJPEG to LIBJPEG-TURBO. * gnu/packages/admin.scm (testdisk)[inputs]: Likewise. * gnu/packages/algebra.scm (giac)[inputs]: Likewise. * gnu/packages/animation.scm (synfig)[inputs]: Likewise. * gnu/packages/astronomy.scm (gnuastro, celestia)[inputs]: Likewise. * gnu/packages/cdrom.scm (dvdstyler)[inputs]: Likewise. * gnu/packages/cran.scm (r-jpeg, r-tiff, r-readbitmap)[inputs]: Likewise. * gnu/packages/cups.scm (cups-filters, hplip)[inputs]: Likewise. * gnu/packages/display-managers.scm (slim)[inputs]: Likewise. * gnu/packages/ebook.scm (fbreader)[inputs]: Likewise. * gnu/packages/emacs.scm (emacs)[inputs]: Likewise. * gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise. * gnu/packages/fltk.scm (fltk, ntk)[inputs]: Likewise. * gnu/packages/fontutils.scm (fontforge)[inputs]: Likewise. * gnu/packages/freedesktop.scm (weston)[inputs]: Likewise. * gnu/packages/game-development.scm (sfml, allegro, aseprite, python-pygame, eureka, ioquake3)[inputs]: Likewise. * gnu/packages/games.scm (adanaxisgpl, freedroidrpg, irrlicht, minetest, fizmo, supertuxkart, gzdoom, xmoto, xonotic)[inputs]: Likewise. * gnu/packages/gd.scm (gd, perl-gd)[inputs]: Likewise. * gnu/packages/ghostscript.scm (lcms)[inputs]: Likewise. (ghostscript)[inputs, native-inputs]: Likewise. * gnu/packages/gimp.scm (gegl, gimp)[inputs]: Likewise. * gnu/packages/gnome.scm (libgnomeui, eog, tracker-miners, gthumb)[inputs]: Likewise. * gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise. * gnu/packages/gnustep.scm (windowmaker)[inputs]: Likewise. * gnu/packages/graphics.scm (blender, blender-2.79, openimageio, openscenegraph, openscenegraph-3.4, povray, fgallery)[inputs]: Likewise. * gnu/packages/graphviz.scm (graphviz)[inputs]: Likewise. * gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Likewise. * gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Likewise. * gnu/packages/image-processing.scm (dcmtk, mia, vtk, opencv, vips, nip2, vxl, insight-toolkit)[inputs]: Likewise. * gnu/packages/image-viewers.scm (gpicview, luminance-hdr)[inputs]: Likewise. * gnu/packages/image.scm (jpegoptim, libtiff, leptonica, imlib2, freeimage, vigra, libwebp, libmng, jasper, steghide, jp2a)[inputs]: Likewise. * gnu/packages/imagemagick.scm (imagemagick, graphicsmagick)[inputs]: Likewise. * gnu/packages/java.scm (icedtea-6, icedtea-7, openjdk9, openjdk11, openjdk12)[inputs]: Likewise. * gnu/packages/kde-frameworks.scm (khtml)[inputs]: Likewise. * gnu/packages/kodi.scm (kodi)[inputs]: Likewise. * gnu/packages/machine-learning.scm (dlib, tensorflow)[inputs]: Likewise. * gnu/packages/mate.scm (atril, eom)[inputs]: Likewise. * gnu/packages/maths.scm (hdf4, hdf-java, hdf-eos2, netcdf)[inputs]: Likewise. * gnu/packages/netpbm.scm (netpbm)[inputs]: Likewise. * gnu/packages/pdf.scm (zathura-pdf-mupdf, podofo, mupdf, fbida)[inputs]: Likewise. * gnu/packages/photo.scm (libraw, libpano13, enblend-enfuse, darktable, hugin, rawtherapee)[inputs]: Likewise. * gnu/packages/prolog.scm (swi-prolog)[native-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-hdf4, python-pillow)[inputs]: Likewise. * gnu/packages/qt.scm (qtbase, qtwebkit)[inputs]: Likewise. * gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise. * gnu/packages/scanner.scm (sane-backends, xsane)[inputs]: Likewise. * gnu/packages/scheme.scm (racket)[inputs]: Likewise. * gnu/packages/scribus.scm (scribus)[inputs]: Likewise. * gnu/packages/sdl.scm (sdl-image)[propagated-inputs]: Likewise. (guile-sdl)[native-inputs]: Likewise. * gnu/packages/spice.scm (spice-gtk)[inputs]: Likewise. * gnu/packages/statistics.scm (r-with-tests)[inputs]: Likewise. * gnu/packages/tcl.scm (perl-tk)[inputs]: Likewise. * gnu/packages/upnp.scm (readymedia)[inputs]: Likewise. * gnu/packages/video.scm (mplayer, mpv, v4l-utils, motion)[inputs]: Likewise. * gnu/packages/web-browsers.scm (dillo, links)[inputs]: Likewise. * gnu/packages/web.scm (netsurf)[inputs]: Likewise. * gnu/packages/webkit.scm (webkitgtk)[inputs]: Likewise. * gnu/packages/wine.scm (wine)[inputs]: Likewise. * gnu/packages/wv.scm (wv)[inputs]: Likewise. * gnu/packages/wxwidgets.scm (wxwidgets, wxwidgets-2)[inputs]: Likewise. * gnu/packages/xdisorg.scm (xscreensaver)[inputs]: Likewise. * gnu/packages/xfce.scm (tumbler)[inputs]: Likewise. * gnu/packages/xfig.scm (xfig, transfig)[inputs]: Likewise. * gnu/packages/xorg.scm (xpra)[inputs]: Likewise. --- gnu/packages/abiword.scm | 2 +- gnu/packages/admin.scm | 2 +- gnu/packages/algebra.scm | 2 +- gnu/packages/animation.scm | 2 +- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/cdrom.scm | 2 +- gnu/packages/cran.scm | 6 +++--- gnu/packages/cups.scm | 4 ++-- gnu/packages/display-managers.scm | 2 +- gnu/packages/ebook.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/enlightenment.scm | 2 +- gnu/packages/fltk.scm | 4 ++-- gnu/packages/fontutils.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/game-development.scm | 12 ++++++------ gnu/packages/games.scm | 18 +++++++++--------- gnu/packages/gd.scm | 4 ++-- gnu/packages/ghostscript.scm | 6 +++--- gnu/packages/gimp.scm | 4 ++-- gnu/packages/gnome.scm | 8 ++++---- gnu/packages/gnunet.scm | 2 +- gnu/packages/gnustep.scm | 2 +- gnu/packages/graphics.scm | 14 +++++++------- gnu/packages/graphviz.scm | 2 +- gnu/packages/gstreamer.scm | 2 +- gnu/packages/gtk.scm | 2 +- gnu/packages/image-processing.scm | 16 ++++++++-------- gnu/packages/image-viewers.scm | 4 ++-- gnu/packages/image.scm | 22 +++++++++++----------- gnu/packages/imagemagick.scm | 4 ++-- gnu/packages/java.scm | 10 +++++----- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kodi.scm | 2 +- gnu/packages/machine-learning.scm | 4 ++-- gnu/packages/mate.scm | 4 ++-- gnu/packages/maths.scm | 8 ++++---- gnu/packages/netpbm.scm | 2 +- gnu/packages/pdf.scm | 8 ++++---- gnu/packages/photo.scm | 12 ++++++------ gnu/packages/prolog.scm | 2 +- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/qt.scm | 4 ++-- gnu/packages/rdesktop.scm | 2 +- gnu/packages/scanner.scm | 4 ++-- gnu/packages/scheme.scm | 2 +- gnu/packages/scribus.scm | 2 +- gnu/packages/sdl.scm | 4 ++-- gnu/packages/spice.scm | 2 +- gnu/packages/statistics.scm | 2 +- gnu/packages/tcl.scm | 2 +- gnu/packages/upnp.scm | 2 +- gnu/packages/video.scm | 8 ++++---- gnu/packages/web-browsers.scm | 4 ++-- gnu/packages/web.scm | 2 +- gnu/packages/webkit.scm | 2 +- gnu/packages/wine.scm | 2 +- gnu/packages/wv.scm | 2 +- gnu/packages/wxwidgets.scm | 4 ++-- gnu/packages/xdisorg.scm | 2 +- gnu/packages/xfce.scm | 2 +- gnu/packages/xfig.scm | 4 ++-- gnu/packages/xorg.scm | 2 +- 63 files changed, 140 insertions(+), 140 deletions(-) diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index 2b65a02242..9cfd12a1e6 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -95,7 +95,7 @@ ("libchamplain" ,libchamplain) ("libglade" ,libglade) ("libgsf" ,libgsf) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("librsvg" ,librsvg) ("libxml2" ,libxml2) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2b7cac7c16..c40529f817 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1722,7 +1722,7 @@ characters can be replaced as well, as can UTF-8 characters.") ;; FIXME: add reiserfs. ("zlib" ,zlib) ("e2fsprogs" ,e2fsprogs) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("ncurses" ,ncurses))) (home-page "https://www.cgsecurity.org/wiki/TestDisk") (synopsis "Data recovery tool") diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index a31ac8dab0..d3e4dfbd86 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -405,7 +405,7 @@ precision.") ("gsl" ,gsl) ("lapack" ,lapack) ("libao" ,ao) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libsamplerate" ,libsamplerate) ("libx11" ,libx11) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 08bf4eb1de..0357ac1190 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -112,7 +112,7 @@ C++ @dfn{Standard Template Library} (STL).") `(("boost" ,boost) ("ffmpeg" ,ffmpeg) ("libdv" ,libdv) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libmng" ,libmng) ("zlib" ,zlib))) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 3bb236fde9..2ac41e17a0 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -132,7 +132,7 @@ header.") (inputs `(("cfitsio" ,cfitsio) ("gsl" ,gsl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("wcslib" ,wcslib) ("zlib" ,zlib))) @@ -218,7 +218,7 @@ objects.") `(("glu" ,glu) ("glew" ,glew) ("libtheora" ,libtheora) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ;; maybe required? ("mesa" ,mesa) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index b6bdf33eef..64aa38d785 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -459,7 +459,7 @@ capacity is user-selectable.") ("eudev" ,eudev) ("fontconfig" ,fontconfig) ("libexif" ,libexif) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ff2490bc31..3368d60042 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1347,7 +1347,7 @@ applications. That is, compute distances and related measures for angular (base32 "1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x")))) (build-system r-build-system) - (inputs `(("libjpeg" ,libjpeg))) + (inputs `(("libjpeg" ,libjpeg-turbo))) (home-page "http://www.rforge.net/jpeg/") (synopsis "Read and write JPEG images with R") (description "This package provides a way to read, write and display @@ -9704,7 +9704,7 @@ redundant complex conjugate when the input is real data.") (build-system r-build-system) (inputs `(("libtiff" ,libtiff) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) (home-page "http://www.rforge.net/tiff/") (synopsis "Read and write TIFF images") @@ -18295,7 +18295,7 @@ currently limited to 8 bit greyscale images and 24, 32 bit (A)RGB images.") (properties `((upstream-name . "readbitmap"))) (build-system r-build-system) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng))) (propagated-inputs `(("r-bmp" ,r-bmp) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8fbb2ee4f6..d8c1d11944 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -158,7 +158,7 @@ ("ijs" ,ijs) ("dbus" ,dbus) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("glib" ,glib) @@ -585,7 +585,7 @@ should only be used as part of the Guix cups-pk-helper service.") (inputs `(("cups-minimal" ,cups-minimal) ("dbus" ,dbus) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libusb" ,libusb) ("python" ,python) ("python-dbus" ,python-dbus) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index bfe1a8f6dd..70caeab06d 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -244,7 +244,7 @@ GTK+, lets you select a desktop session and log in to it.") (build-system cmake-build-system) (inputs `(("linux-pam" ,linux-pam) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("freeglut" ,freeglut) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 7f8aa42e95..683be7927a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -290,7 +290,7 @@ designed to be used in a generic text renderer.") ("fribidi" ,fribidi) ("glib" ,glib) ("gtk+-2" ,gtk+-2) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("liblinebreak" ,liblinebreak) ("libxft" ,libxft) ("sqlite" ,sqlite) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b26c928e87..cfbcb83872 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -173,7 +173,7 @@ ("libxft" ,libxft) ("libtiff" ,libtiff) ("giflib" ,giflib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("imagemagick" ,imagemagick) ("acl" ,acl) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 121627dd88..3fc9d522f4 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -124,7 +124,7 @@ ("harfbuzz" ,harfbuzz) ("luajit" ,luajit) ("libinput" ,libinput-minimal) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libsndfile" ,libsndfile) ("libtiff" ,libtiff) diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index 40d5e7e513..204d2f8483 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -56,7 +56,7 @@ (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("libxft" ,libxft) @@ -129,7 +129,7 @@ UI builder called FLUID that can be used to create applications in minutes.") (assoc-ref outputs "out") "/lib")) #t))))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("glu" ,glu) ("waf" ,python-waf))) ;; ntk.pc lists "x11" and "xft" in Requires.private, and "cairo" in diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 107967bb5d..34e17fdf67 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -594,7 +594,7 @@ definitions.") ("libSM" ,libsm) ("libX11" ,libx11) ("libXi" ,libxi) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libltdl" ,libltdl) ("libpng" ,libpng) ("libspiro" ,libspiro) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 1b61ea43dd..7a7eea2d67 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -687,7 +687,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") ("lcms" ,lcms) ("libevdev" ,libevdev) ("libinput" ,libinput-minimal) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libunwind" ,libunwind) ("libva" ,libva) ("libwebp" ,libwebp) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ee8dea23b5..54703cf846 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -527,7 +527,7 @@ clone.") ("xcb-util-image" ,xcb-util-image) ("libxrandr" ,libxrandr) ("eudev" ,eudev) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libsndfile" ,libsndfile) ("stb-image" ,stb-image) ("stb-image-write" ,stb-image-write))) @@ -746,7 +746,7 @@ etc.") ("freetype" ,freetype) ("glu" ,glu) ("gtk" ,gtk+-2) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) @@ -828,7 +828,7 @@ etc.") ("curl" ,curl) ("freetype" ,freetype) ("giflib" ,giflib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libwebp" ,libwebp) ("libx11" ,libx11) @@ -980,7 +980,7 @@ interface (API).") ("sdl-mixer" ,sdl-mixer) ("sdl-ttf" ,sdl-ttf) ("sdl-gfx" ,sdl-gfx) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libX11" ,libx11) ("libsmpeg" ,libsmpeg) @@ -1663,7 +1663,7 @@ scripted in a Python-like language.") ("libxft" ,libxft) ("libxinerama" ,libxinerama) ("libfontconfig" ,fontconfig) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("fltk" ,fltk) ("zlib" ,zlib))) @@ -1835,7 +1835,7 @@ of the others") (build-system gnu-build-system) (inputs `(("sdl2" ,sdl2) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("openal" ,openal) ("curl" ,curl) ("opusfile" ,opusfile) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index eb703d114a..49a2bde6eb 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -235,7 +235,7 @@ `(("expat" ,expat) ("freeglut" ,freeglut) ("glu" ,glu) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libogg" ,libogg) ("libtiff" ,libtiff) ("libvorbis" ,libvorbis) @@ -683,7 +683,7 @@ effects and music to make a completely free game.") `(("pkg-config" ,pkg-config))) (inputs `(("glu" ,glu) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libogg" ,libogg) ("libpng" ,libpng) ("libvorbis" ,libvorbis) @@ -1925,7 +1925,7 @@ are primarily in English, however some in other languages are provided.") #:make-flags '("CC=gcc" "sharedlib"))) (inputs `(("bzip2" ,bzip2) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("libxxf86vm" ,libxxf86vm) @@ -2072,7 +2072,7 @@ match, cannon keep, and grave-itation pit.") ("gmp" ,gmp) ("irrlicht" ,irrlicht) ("jsoncpp" ,jsoncpp) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libogg" ,libogg) ("libvorbis" ,libvorbis) @@ -2314,7 +2314,7 @@ games using Python as well as C++.") `(("pkg-config" ,pkg-config))) (inputs `(("freetype" ,freetype) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libsndfile" ,libsndfile) ("libxml2" ,libxml2) @@ -2443,7 +2443,7 @@ This game is based on the GPL version of the famous game TuxRacer.") ("curl" ,curl) ;; The following input is needed to build the bundled and modified ;; version of irrlicht. - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("openssl" ,openssl) ("enet" ,enet))) (native-inputs @@ -5772,7 +5772,7 @@ You can save humanity and get programming skills!") ("fluidsynth" ,fluidsynth) ("gtk+3" ,gtk+) ("libgme" ,libgme) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libsndfile" ,libsndfile) ("mesa" ,mesa) ("mpg123" ,mpg123) @@ -6229,7 +6229,7 @@ quotation from a collection of quotes.") `(("xonotic-data" ,xonotic-data) ("alsa-lib" ,alsa-lib) ("curl" ,curl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmodplug" ,libmodplug) ("libvorbis" ,libvorbis) ("libogg" ,libogg) @@ -9634,7 +9634,7 @@ This package is part of the KDE games module.") `(("curl" ,curl) ("font-dejavu" ,font-dejavu) ("glu" ,glu) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxdg-basedir" ,libxdg-basedir) ("libxml2" ,libxml2) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 6afccb7b0c..e336282546 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -83,7 +83,7 @@ ("zlib" ,zlib))) (propagated-inputs `(("fontconfig" ,fontconfig) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (home-page "http://www.libgd.org/") (synopsis "Library for the dynamic creation of images by programmers") (description @@ -114,7 +114,7 @@ most common applications of GD involve website development.") ("freetype" ,freetype) ("gd" ,gd) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) (arguments `(#:make-maker-flags diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 84c6985bde..3cd1e4af8d 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -60,7 +60,7 @@ (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) - (inputs `(("libjpeg" ,libjpeg) + (inputs `(("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("zlib" ,zlib))) (synopsis "Little CMS, a small-footprint colour management engine") @@ -278,14 +278,14 @@ printing, and psresize, for adjusting page sizes.") ;; these libraries. ,@(if (%current-target-system) `(("zlib/native" ,zlib) - ("libjpeg/native" ,libjpeg)) + ("libjpeg/native" ,libjpeg-turbo)) '()))) (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) ("gs-fonts" ,gs-fonts) ("jbig2dec" ,jbig2dec) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpaper" ,libpaper) ("libpng" ,libpng) ("libtiff" ,libtiff) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 42a55cff33..e95251cc79 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -117,7 +117,7 @@ provided, as well as a framework to add new color models and data types.") `(("cairo" ,cairo) ("pango" ,pango) ("libpng" ,libpng) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ; for gtester @@ -174,7 +174,7 @@ buffers.") ("glib" ,glib) ("glib-networking" ,glib-networking) ("libtiff" ,libtiff) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("atk" ,atk) ("gexiv2" ,gexiv2) ("gtk+" ,gtk+-2) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5a813f6854..0be8fcc49e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2803,7 +2803,7 @@ creating interactive structured graphics.") ("libgnome" ,libgnome) ("libgnomecanvas" ,libgnomecanvas) ("libgnome-keyring" ,libgnome-keyring))) - (inputs `(("libjpeg" ,libjpeg) + (inputs `(("libjpeg" ,libjpeg-turbo) ("popt" ,popt) ("libbonobo" ,libbonobo) ("libxml2" ,libxml2) @@ -5150,7 +5150,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") ("lcms" ,lcms) ("libexif" ,libexif) ("libpeas" ,libpeas) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("librsvg" ,librsvg) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+))) @@ -7518,7 +7518,7 @@ shared object databases, search tools and indexing.") ("libgsf" ,libgsf) ("libgxps" ,libgxps) ("libiptcdata" ,libiptcdata) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libosinfo" ,libosinfo) ("libpng" ,libpng) ("libseccomp" ,libseccomp) @@ -9444,7 +9444,7 @@ functionality.") ("clutter" ,clutter) ("clutter-gst" ,clutter-gst) ("clutter-gtk" ,clutter-gtk) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libraw" ,libraw))) (home-page "https://wiki.gnome.org/Apps/Gthumb") diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 43605dfc86..d026c67992 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -101,7 +101,7 @@ ("gtk+" ,gtk+) ("libarchive" ,libarchive) ("libgsf" ,libgsf) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libltdl" ,libltdl) ("libmpeg2" ,libmpeg2) ("libmp4v2" ,libmp4v2) diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index dd7c67d553..ff2145a25e 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -139,7 +139,7 @@ to easily create cross-compiled binaries.") ("libx11" ,libx11) ("libxinerama" ,libxinerama) ("fontconfig" ,fontconfig) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("giflib" ,giflib) ("libpng" ,libpng) ("libtiff" ,libtiff))) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 217ccb4ece..8091afaf0a 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -153,7 +153,7 @@ ("opensubdiv" ,opensubdiv) ("ilmbase" ,ilmbase) ("openjpeg" ,openjpeg) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("ffmpeg" ,ffmpeg) @@ -241,7 +241,7 @@ application can be customized via its API for Python scripting.") ("openexr" ,openexr) ("ilmbase" ,ilmbase) ("openjpeg" ,openjpeg-1) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("ffmpeg" ,ffmpeg) @@ -495,7 +495,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (inputs `(("boost" ,boost) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("giflib" ,giflib) ("openexr" ,openexr) @@ -558,7 +558,7 @@ visual effects work for film.") ("unzip" ,unzip))) (inputs `(("giflib" ,giflib) - ("libjpeg" ,libjpeg) ; Required for the JPEG texture plugin. + ("libjpeg" ,libjpeg-turbo) ; Required for the JPEG texture plugin. ("jasper" ,jasper) ("librsvg" ,librsvg) ("libxrandr" ,libxrandr) @@ -597,7 +597,7 @@ virtual reality, scientific visualization and modeling.") "-DCMAKE_CXX_FLAGS=-fpermissive" ,flags)))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ,@(package-inputs openscenegraph))))) @@ -662,7 +662,7 @@ virtual reality, scientific visualization and modeling.") ("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("openexr" ,openexr) @@ -1014,7 +1014,7 @@ your terminal.") `(("imagemagick" ,imagemagick) ("lcms" ,lcms) ("fbida" ,fbida) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zip" ,zip) ("perl" ,perl) ("perl-cpanel-json-xs" ,perl-cpanel-json-xs) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 5ef0fd0344..406375b3d6 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -104,7 +104,7 @@ ("libltdl" ,libltdl) ("libXaw" ,libxaw) ("expat" ,expat) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng))) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 1e26a3ce3e..2854945d78 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -264,7 +264,7 @@ for the GStreamer multimedia library.") ("libcaca" ,libcaca) ("libdv" ,libdv) ("libiec61883" ,libiec61883) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libshout" ,libshout) ("libsoup" ,libsoup) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b136449f7e..f0068dbe05 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -531,7 +531,7 @@ highlighting and other features typical of a source code editor.") ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libx11" ,libx11))) (native-inputs diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index f5d67c8917..cdaf8e86e2 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -89,7 +89,7 @@ (inputs `(;; Our ICU is too recent: “error: ‘UChar’ does not name a type“. ;; ("icu4c" ,icu4c) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libxml2" ,libxml2) @@ -137,7 +137,7 @@ licences similar to the Modified BSD licence.")))) ("gts" ,gts) ("hdf5" ,hdf5) ("itpp" ,itpp) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libxml" ,libxml2) @@ -198,7 +198,7 @@ of external libraries that provide additional functionality.") ("expat" ,expat) ("freetype" ,freetype) ("hdf5" ,hdf5) - ("jpeg" ,libjpeg) + ("jpeg" ,libjpeg-turbo) ("jsoncpp" ,jsoncpp) ("libogg" ,libogg) ("libtheora" ,libtheora) @@ -393,7 +393,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") (patches (search-patches "opencv-rgbd-aarch64-test-fix.patch")) (sha256 (base32 "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2")))))) - (inputs `(("libjpeg" ,libjpeg) + (inputs `(("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("jasper" ,jasper) ;; ffmpeg 4.0 causes core dumps in tests. @@ -454,7 +454,7 @@ vision algorithms. It can be used to do things like: ("gobject-introspection" ,gobject-introspection))) (inputs `(("glib" ,glib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("librsvg" ,librsvg) ("libtiff" ,libtiff) @@ -516,7 +516,7 @@ due to its architecture which automatically parallelises the image workflows.") ("gtk+-2" ,gtk+-2) ("libxml2" ,libxml2) ("libexif" ,libexif) - ("libjpeg" ,libjpeg) ; required by vips.pc + ("libjpeg" ,libjpeg-turbo) ;required by vips.pc ("librsvg" ,librsvg) ("fftw" ,fftw) ("libgsf" ,libgsf) @@ -573,7 +573,7 @@ recalculates.") (inputs `(("libgeotiff" ,libgeotiff) ("libtiff" ,libtiff) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("zlib" ,zlib))) (home-page "https://github.com/vxl/vxl/") @@ -650,7 +650,7 @@ libraries designed for computer vision research and implementation.") ("fftw" ,fftw) ("fftwf" ,fftwf) ("hdf5" ,hdf5) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("mesa" ,mesa-opencl) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 85d3a153e7..8589130822 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -204,7 +204,7 @@ collection. Geeqie was initially based on GQview.") "0hi9v0rdx47nys0wvm9xasdrafa34r5kq6crb074a0ipwmc60iiq")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (synopsis "Simple and fast image viewer for X") @@ -382,7 +382,7 @@ It supports JPEG, PNG and GIF formats.") ("zlib" ,zlib) ("exiv2" ,exiv2) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("lcms" ,lcms) ("openexr" ,openexr) ("fftw" ,fftwf) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 4fef6fe21e..6bb0b47cb3 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -500,7 +500,7 @@ official designation is ISO/IEC 29199-2). This library is an implementation of t (sha256 (base32 "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8")))) (build-system gnu-build-system) - (inputs `(("libjpeg" ,libjpeg))) + (inputs `(("libjpeg" ,libjpeg-turbo))) (arguments '(#:tests? #f)) ; no tests (synopsis "Optimize JPEG images") @@ -565,7 +565,7 @@ extracting icontainer icon files.") ,name "-" ,version) "--disable-static"))) (inputs `(("zlib" ,zlib) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (synopsis "Library for handling TIFF files") (description "Libtiff provides support for the Tag Image File Format (TIFF), a format @@ -598,7 +598,7 @@ collection of tools for doing simple manipulations of TIFF images.") ("pkg-config" ,pkg-config))) (inputs `(("giflib" ,giflib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) @@ -872,7 +872,7 @@ compose, and analyze GIF images.") ("freetype" ,freetype) ("giflib" ,giflib) ("libid3tag" ,libid3tag) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libx11" ,libx11) @@ -983,7 +983,7 @@ supplies a generic doubly-linked list and some string functions.") `(("pkg-config" ,pkg-config) ("unzip" ,unzip))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libjxr" ,libjxr) ("libpng" ,libpng) ("libraw" ,libraw) @@ -1020,7 +1020,7 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") ("hdf5" ,hdf5) ("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly ; to create a configure-flag - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("openexr" ,openexr) @@ -1124,7 +1124,7 @@ language bindings to VIGRA.") (inputs `(("freeglut" ,freeglut) ("giflib" ,giflib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff))) (native-inputs @@ -1164,7 +1164,7 @@ channels.") (propagated-inputs ;; These are all in the 'Libs.private' field of libmng.pc. `(("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) (home-page "http://www.libmng.com/") (synopsis "Library for handling MNG files") @@ -1280,7 +1280,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (base32 "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6")))) (build-system cmake-build-system) - (inputs `(("libjpeg" ,libjpeg))) + (inputs `(("libjpeg" ,libjpeg-turbo))) (synopsis "JPEG-2000 library") (description "The JasPer Project is an initiative to provide a reference implementation of the codec specified in the JPEG-2000 Part-1 standard (i.e., @@ -1368,7 +1368,7 @@ differences in file encoding, image quality, and other small variations.") (inputs `(("libmhash" ,libmhash) ("libmcrypt" ,libmcrypt) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) (arguments `(#:make-flags '("CXXFLAGS=-fpermissive") ;required for MHashPP.cc @@ -1739,7 +1739,7 @@ identical visual appearance.") (build-system gnu-build-system) (inputs `(("curl" ,curl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("ncurses" ,ncurses))) (home-page "https://csl.name/jp2a/") (synopsis "Convert JPEG images to ASCII") diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 2b4bc5680d..f75dd795f1 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -101,7 +101,7 @@ ("libxml2" ,libxml2) ("libtiff" ,libtiff) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("pango" ,pango) ("freetype" ,freetype) ("bzip2" ,bzip2) @@ -203,7 +203,7 @@ script.") ("libxml2" ,libxml2) ("libtiff" ,libtiff) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("freetype" ,freetype) ("bzip2" ,bzip2) ("xz" ,xz) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6abd0c8360..96d14c3988 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -949,7 +949,7 @@ machine."))) ("grep" ,grep) ("jamvm" ,jamvm) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libnsl" ,libnsl) ("libpng" ,libpng) ("libtool" ,libtool) @@ -1569,7 +1569,7 @@ bootstrapping purposes.") ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("libxrender" ,libxrender) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("mit-krb5" ,mit-krb5) ("nss" ,nss) @@ -1866,7 +1866,7 @@ new Date();")) ("giflib" ,giflib) ("lcms" ,lcms) ("libelf" ,libelf) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libice" ,libice) ("libpng" ,libpng) ("libx11" ,libx11) @@ -2144,7 +2144,7 @@ new Date();")) ("freetype" ,freetype) ("giflib" ,giflib) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("libxext" ,libxext) @@ -2191,7 +2191,7 @@ new Date();")) ("freetype" ,freetype) ("giflib" ,giflib) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("libxext" ,libxext) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 9230bb71c0..fd1b6ec7ca 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3768,7 +3768,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("openssl" ,openssl) ("phonon" ,phonon) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index bc61e96d19..c74d4e0532 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -419,7 +419,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") ("libcdio" ,libcdio) ("libdrm" ,libdrm) ("libgcrypt" ,libgcrypt) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libltdl" ,libltdl) ("libmad" ,libmad) ("libmicrohttpd" ,libmicrohttpd) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 719401d69a..d92a74efa8 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -778,7 +778,7 @@ than 8 bits, and at the end only some significant 8 bits are kept.") (inputs `(("giflib" ,giflib) ("lapack" ,lapack) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("openblas" ,openblas) @@ -1746,7 +1746,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) ("eigen" ,eigen-for-tensorflow) ("gemmlowp" ,gemmlowp-for-tensorflow) ("lmdb" ,lmdb) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("giflib" ,giflib) ("grpc" ,grpc) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index fa95d0bf66..5c9da6d72b 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -808,7 +808,7 @@ infamous 'Wanda the Fish'.") ("libice" ,libice) ("libsm" ,libsm) ("libgxps" ,libgxps) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libxml2" ,libxml2) ("dogtail" ,python2-dogtail) ("shared-mime-info" ,shared-mime-info) @@ -1344,7 +1344,7 @@ can be used as backgrounds in the MATE Desktop environment.") ("libpeas" ,libpeas) ("libxml2" ,libxml2) ("libexif" ,libexif) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("librsvg" ,librsvg) ("lcms" ,lcms) ("mate-desktop" ,mate-desktop) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 003e8c0286..1d5a9edc5f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -725,7 +725,7 @@ computations.") ("flex" ,flex))) (inputs `(("zlib" ,zlib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtirpc" ,libtirpc))) (arguments `(#:parallel-tests? #f @@ -965,7 +965,7 @@ extremely large and complex data collections.") `(("hdf4" ,hdf4) ("hdf5" ,hdf5) ("zlib" ,zlib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("slf4j-api" ,java-slf4j-api))) (arguments `(#:configure-flags @@ -1082,7 +1082,7 @@ implemented in C.") `(("hdf4" ,hdf4-alt) ; assume most HDF-EOS2 users won't use the HDF4 netCDF API ;; XXX: These inputs are really dependencies of hdf4. ("zlib" ,zlib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtirpc" ,libtirpc) ("gctp" ,gctp))) @@ -1242,7 +1242,7 @@ similar to MATLAB, GNU Octave or SciPy.") `(("hdf4" ,hdf4-alt) ("hdf5" ,hdf5) ("zlib" ,zlib) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (arguments `(#:configure-flags '("--enable-doxygen" "--enable-dot" "--enable-hdf4") diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index 7fe0503d6f..aac6f13379 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -102,7 +102,7 @@ (build-system gnu-build-system) (inputs `(("ghostscript" ,ghostscript) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libxml2" ,libxml2) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 32a45ed4d5..8451390647 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -433,7 +433,7 @@ using the DjVuLibre library.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("jbig2dec" ,jbig2dec) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("mujs" ,mujs) ("mupdf" ,mupdf) ("openjpeg" ,openjpeg) @@ -573,7 +573,7 @@ interaction.") `(("cppunit" ,cppunit) ("pkg-config" ,pkg-config))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -632,7 +632,7 @@ extracting content or merging files.") ("freetype" ,freetype) ("harfbuzz" ,harfbuzz) ("jbig2dec" ,jbig2dec) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libx11" ,libx11) ("libxext" ,libxext) ("mujs" ,mujs) @@ -859,7 +859,7 @@ the PDF pages.") #:tests? #f #:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))))) - (inputs `(("libjpeg" ,libjpeg) + (inputs `(("libjpeg" ,libjpeg-turbo) ("curl" ,curl) ("libtiff" ,libtiff) ("libudev" ,eudev) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 0867433245..0dfc442883 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -82,7 +82,7 @@ (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("libjpeg" ,libjpeg))) ;for lossy DNGs and old Kodak cameras + `(("libjpeg" ,libjpeg-turbo))) ;for lossy DNGs and old Kodak cameras (propagated-inputs `(("lcms" ,lcms))) ;for color profiles (home-page "https://www.libraw.org") @@ -258,7 +258,7 @@ and a wide variety of other metadata.") "1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3")))) (build-system cmake-build-system) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("zlib" ,zlib))) @@ -300,7 +300,7 @@ overlapping images, as well as some command line tools.") `(("boost" ,boost) ("gsl" ,gsl) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("openexr" ,openexr) @@ -394,7 +394,7 @@ photographic equipment.") ("pugixml" ,pugixml) ("gtk+" ,gtk+) ("sqlite" ,sqlite) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("cairo" ,cairo) ("lcms" ,lcms) @@ -450,7 +450,7 @@ and enhance them.") ("freeglut" ,freeglut) ("glew" ,glew) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpano13" ,libpano13) ("libpng" ,libpng) ("libtiff" ,libtiff) @@ -535,7 +535,7 @@ a complete panorama and stitch any series of overlapping pictures.") ("lensfun" ,lensfun) ("libcanberra" ,libcanberra) ("libiptcdata" ,libiptcdata) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("librsvg" ,librsvg) ("libsigc++" ,libsigc++) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index ca280f77fa..f8ea6194c6 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -137,7 +137,7 @@ manner. It also features an interactive interpreter.") ("texinfo" ,texinfo) ("libarchive" ,libarchive) ("libunwind" ,libunwind) - ("libjpeg", libjpeg) + ("libjpeg", libjpeg-turbo) ("libxft" ,libxft) ("fontconfig" ,fontconfig) ("perl" ,perl) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c00b1c7ed0..4dfe6ee612 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -441,7 +441,7 @@ Expressions are constructed from parsed strings or directly in Python.") (propagated-inputs `(("numpy" ,python-numpy))) (inputs `(("hdf4" ,hdf4) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) (arguments `(#:phases @@ -4460,7 +4460,7 @@ the OleFileIO module from PIL, the Python Image Library.") (inputs `(("freetype" ,freetype) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libwebp" ,libwebp) ("openjpeg" ,openjpeg) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 435bdbd518..675720288a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -380,7 +380,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") ("harfbuzz" ,harfbuzz) ("icu4c" ,icu4c) ("libinput" ,libinput-minimal) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmng" ,libmng) ("libpng" ,libpng) ("libx11" ,libx11) @@ -2396,7 +2396,7 @@ different kinds of sliders, and much more.") `(("icu" ,icu4c) ("glib" ,glib) ("gst-plugins-base" ,gst-plugins-base) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libwebp" ,libwebp) ("sqlite" ,sqlite) diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 71464237f4..2e364b2b8e 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -103,7 +103,7 @@ to remotely control a user's Windows desktop.") `(("alsa-lib" ,alsa-lib) ("cups" ,cups) ("ffmpeg" ,ffmpeg) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libx11" ,libx11) ("libxkbcommon" ,libxkbcommon) ("libxkbfile" ,libxkbfile) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 98f7fd203a..8e57cb20eb 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -123,7 +123,7 @@ package contains the library, but no drivers.") (name "sane-backends") (inputs `(("hplip" ,(@ (gnu packages cups) hplip-minimal)) - ("libjpeg" ,libjpeg) ; wanted by pixma, epsonds, others + ("libjpeg" ,libjpeg-turbo) ; wanted by pixma, epsonds, others ("libpng" ,libpng) ; support ‘scanimage --format=png’ ,@(package-inputs sane-backends-minimal))) (arguments @@ -219,7 +219,7 @@ package contains the library and drivers."))) (inputs `(("gtk+" ,gtk+-2) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("sane-backends" ,sane-backends) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index b0da2ac36b..44eab98fba 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -533,7 +533,7 @@ implementation techniques and as an expository tool.") ("glu" ,glu) ("gmp" ,gmp) ("gtk+" ,gtk+) ; propagates gdk-pixbuf+svg - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("mesa" ,mesa) diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index e9c998c7b6..385017f2c2 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -87,7 +87,7 @@ ("lcms" ,lcms) ("libcdr" ,libcdr) ("libfreehand" ,libfreehand) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmspub" ,libmspub) ("libpagemaker" ,libpagemaker) ("librevenge" ,librevenge) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index a01cafb34a..b133227629 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -238,7 +238,7 @@ other supporting functions for SDL.") ;; propagated input because the pkg-config file refers to SDL's pkg-config ;; file. (propagated-inputs `(("sdl" ,sdl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) @@ -507,7 +507,7 @@ directory.") `(("pkg-config" ,pkg-config) ;; Required by test suite. ("xorg-server" ,xorg-server) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (inputs `(("guile" ,guile-2.2) ("sdl-union" ,(sdl-union)))) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index a57e0151ca..12461914bc 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -146,7 +146,7 @@ which allows users to view a desktop computing environment.") ("gobject-introspection" ,gobject-introspection) ("json-glib" ,json-glib) ("libepoxy" ,libepoxy) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libxcb" ,libxcb) ("lz4" ,lz4) ("mesa" ,mesa) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ec2994dc33..a9e17ff2e5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -343,7 +343,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ ("openblas" ,openblas) ("gfortran" ,gfortran) ("icu4c" ,icu4c) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libxt" ,libxt) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index c88d0338cb..f17e138bdb 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -232,7 +232,7 @@ interfaces (GUIs) in the Tcl language.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libx11" ,libx11) ("libpng" ,libpng) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (arguments `(#:make-maker-flags `(,(string-append "X11=" (assoc-ref %build-inputs "libx11"))) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 8f3c887a68..c7ad33c17b 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -144,7 +144,7 @@ and others.") ("gettext" ,gettext-minimal))) (inputs `(("libexif" ,libexif) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libid3tag" ,libid3tag) ("flac" ,flac) ("libvorbis" ,libvorbis) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 730d5a408f..370994c9d6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1281,7 +1281,7 @@ streaming protocols.") ("libass" ,libass) ("libdvdcss" ,libdvdcss) ("libdvdnav" ,libdvdnav) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmpeg2" ,libmpeg2) ("libmpg123" ,mpg123) ; audio codec for MP3 ("libpng" ,libpng) @@ -1379,7 +1379,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ("libcdio-paranoia" ,libcdio-paranoia) ("libdvdread" ,libdvdread) ("libdvdnav" ,libdvdnav) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libva" ,libva) ("libvdpau" ,libvdpau) ("libx11" ,libx11) @@ -2334,7 +2334,7 @@ tools, XML authoring components, and an extensible plug-in based API.") (inputs `(("alsa-lib" ,alsa-lib) ("glu" ,glu) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libx11" ,libx11) ("qtbase" ,qtbase) ("eudev" ,eudev))) @@ -3336,7 +3336,7 @@ It counts more than 100 plugins.") ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("ffmpeg" ,ffmpeg-3.4) ("libmicrohttpd" ,libmicrohttpd) ("sqlite" ,sqlite))) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 0c18191cc7..1a492cab30 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -78,7 +78,7 @@ (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("fltk" ,fltk) ("fontconfig" ,fontconfig) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxcursor" ,libxcursor) ("libxft" ,libxft) @@ -126,7 +126,7 @@ older or slower computers and embedded systems.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("zlib" ,zlib) ("openssl" ,openssl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libevent" ,libevent) ("libpng" ,libpng) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3568cf0a7f..18ee158be5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5001,7 +5001,7 @@ w3c webidl files and a binding configuration file.") ("openssl" ,openssl) ("utf8proc" ,utf8proc) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libcss" ,libcss) ("libdom" ,libdom) ("libnsbmp" ,libnsbmp) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 5101ceb2ea..3d367aa54f 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -207,7 +207,7 @@ engine that uses Wayland for graphics output.") ("hyphen" ,hyphen) ("icu4c" ,icu4c) ("libgcrypt" ,libgcrypt) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libnotify" ,libnotify) ("libpng" ,libpng) ("libseccomp" ,libseccomp) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 258980803a..0700fdce20 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -111,7 +111,7 @@ ("libsane" ,sane-backends) ("libpcap" ,libpcap) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libICE" ,libice) ("libX11" ,libx11) diff --git a/gnu/packages/wv.scm b/gnu/packages/wv.scm index 866cfee222..37881a4d0f 100644 --- a/gnu/packages/wv.scm +++ b/gnu/packages/wv.scm @@ -45,7 +45,7 @@ (inputs `(("glib" ,glib) ("libgsf" ,libgsf) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("zlib" ,zlib))) (native-inputs diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 48e6c31f6c..c2eedad5cb 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -67,7 +67,7 @@ ;; XXX gstreamer-0.10 builds fail ;; ("gstreamer" ,gstreamer-0.10) ("gtk" ,gtk+) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmspack" ,libmspack) ("libsm" ,libsm) ("libtiff" ,libtiff) @@ -114,7 +114,7 @@ and many other languages.") (base32 "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk")))) (inputs `(("gtk" ,gtk+-2) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libmspack" ,libmspack) ("sdl" ,sdl) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d5c375e046..baf03e012f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1239,7 +1239,7 @@ protocol.") ("libglade" ,libglade) ("libxml2" ,libxml2) ("libsm" ,libsm) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("linux-pam" ,linux-pam) ("pango" ,pango) ("gtk+" ,gtk+) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 7489624646..ff3d6c9ece 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -289,7 +289,7 @@ merging features essential for loading menus modified with menu editors.") ("gdk-pixbuf" ,gdk-pixbuf) ("cairo" ,cairo) ;; Needed for pdf thumbnails (poppler-glibc.pc) ("freetype" ,freetype) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libgsf" ,libgsf) ("poppler" ,poppler) ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 09c7597761..c3d02619b4 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -47,7 +47,7 @@ `(("desktop-file-utils" ,desktop-file-utils))) (inputs `(("libxaw3d" ,libxaw3d) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxpm" ,libxpm) ("libx11" ,libx11) @@ -90,7 +90,7 @@ selected in various ways. For text, 35 fonts are available.") ("makedepend" ,makedepend))) (inputs `(("xfig" ,xfig) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxpm" ,libxpm) ("libx11" ,libx11) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 017a41203d..ab86b228bb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6120,7 +6120,7 @@ basic eye-candy effects.") (inputs `(("ffmpeg" ,ffmpeg) ("flac" ,flac) ("gtk+-2" ,gtk+-2) ;; no full GTK3 support yet - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libvpx" ,libvpx) ("libx264" ,libx264) -- cgit v1.2.3 From a1552f52aa1b54e78eaa933a243fed2e99c6ba81 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Jan 2020 19:27:36 +0100 Subject: gnu: Deprecate the 'libjpeg' variable. * gnu/packages/image.scm (libjpeg, libjpeg-8): Rename to ... (ijg-libjpeg, ijg-libjpeg-8): ... this. (libjpeg): Define as deprecated by LIBJPEG-TURBO. --- gnu/packages/image.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 6bb0b47cb3..1b86f700e4 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -83,6 +83,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system scons) + #:use-module (guix deprecation) #:use-module (srfi srfi-1)) (define-public libpng @@ -364,7 +365,7 @@ Features: @end enumerate") (license license:gpl3+))) -(define-public libjpeg +(define-public ijg-libjpeg (package (name "libjpeg") (version "9c") @@ -393,8 +394,8 @@ lossless JPEG manipulations such as rotation, scaling or cropping: (license license:ijg) (home-page "https://www.ijg.org/"))) -(define-public libjpeg-8 - (package (inherit libjpeg) +(define-public ijg-libjpeg-8 + (package (inherit ijg-libjpeg) (version "8d") (source (origin (method url-fetch) @@ -1528,6 +1529,8 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") license:ijg ;the libjpeg library and associated tools license:zlib)))) ;the libjpeg-turbo SIMD extensions +(define-deprecated libjpeg libjpeg-turbo) + (define-public niftilib (package (name "niftilib") -- cgit v1.2.3 From bd0f5f24913b52df29f1f26321ed1095d08877b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 23:50:17 +0100 Subject: gnu: Remove unused module imports. This is a follow-up to commits 6ab31af7c7fae218388b624af6c092d72b12c5b3 and e21b70acccedb3758ef124543fb522795d219608. * gnu/packages/curl.scm: Do not import (gnu packages groff). * gnu/packages/linux.scm: Do not import (gnu packages attr). --- gnu/packages/curl.scm | 1 - gnu/packages/linux.scm | 1 - 2 files changed, 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 9289e2ffd3..2c0390a3ef 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -37,7 +37,6 @@ #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages golang) - #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages kerberos) #:use-module (gnu packages libidn) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 60f217ba95..3be93e77dc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -60,7 +60,6 @@ #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages algebra) - #:use-module (gnu packages attr) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) -- cgit v1.2.3 From f2821deb9682e9bb4fa8a5caa7992701f05dcd8d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:17:47 +0100 Subject: gnu: glib: Remove redundant input. * gnu/packages/glib.scm (glib)[inputs]: Remove. --- gnu/packages/glib.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2b8700f6da..c54051a156 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -191,8 +191,6 @@ shared NFS home directories.") ("util-linux" ,util-linux "lib") ;for libmount ("libselinux" ,libselinux) ("zlib" ,zlib))) - (inputs - `(("coreutils" ,coreutils))) (native-inputs `(("gettext" ,gettext-minimal) ("m4" ,m4) ; for installing m4 macros -- cgit v1.2.3 From 23572ded7081aa6117fe0004a49d7ad37354bbcb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:18:36 +0100 Subject: gnu: glib: Update to 2.62.4. * gnu/packages/glib.scm (glib): Update to 2.62.4. [arguments]: Adjust for renamed file. --- gnu/packages/glib.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index c54051a156..2bcd9fbec2 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -165,7 +165,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.60.6") + (version "2.62.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -173,7 +173,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz")) + "1g2vj9lyh032kcwij7avx5d6a99rcsnkd07sbl9i55zsfw6h712c")) (patches (search-patches "glib-tests-timer.patch")) (modules '((guix build utils))) (snippet @@ -300,7 +300,7 @@ shared NFS home directories.") (;; Requires /etc/machine-id. "/gdbus/codegen-peer-to-peer")) - ("gio/tests/gdbus-unix-addresses.c" + ("gio/tests/gdbus-address-get-session.c" (;; Requires /etc/machine-id. "/gdbus/x11-autolaunch")) -- cgit v1.2.3 From c8257208264321b42bdf1d2bb99128ae6c3ed489 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:19:52 +0100 Subject: gnu: glibmm: Update to 2.62.0. * gnu/packages/glib.scm (glibmm): Update to 2.62.0. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2bcd9fbec2..ba806566c6 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -610,7 +610,7 @@ has an ease of use unmatched by other C++ callback libraries.") (define glibmm (package (name "glibmm") - (version "2.60.0") + (version "2.62.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glibmm/" @@ -618,7 +618,7 @@ has an ease of use unmatched by other C++ callback libraries.") "/glibmm-" version ".tar.xz")) (sha256 (base32 - "1g7jxqd270dv2d83r7pf5893mwpz7d5xib0q01na2yalh34v38d3")))) + "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 632a9b32c560606dc7061027683c10c9b16be29f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:20:21 +0100 Subject: gnu: yelp-xsl: Update to 3.34.2. * gnu/packages/gnome.scm (yelp-xsl): Update to 3.34.2. [native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index abcc485b79..5a29b9a733 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5574,7 +5574,7 @@ of running programs and invoke methods on those interfaces.") (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.32.1") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5582,10 +5582,10 @@ of running programs and invoke methods on those interfaces.") name "-" version ".tar.xz")) (sha256 (base32 - "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya")))) + "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) (build-system gnu-build-system) (native-inputs - `(("intltool" ,intltool) + `(("gettext-minimal" ,gettext-minimal) ("itstool" ,itstool) ("xmllint" ,libxml2))) (home-page "https://wiki.gnome.org/Apps/Yelp") -- cgit v1.2.3 From 8fe8a42a906ad1996806739b8826b8188a1046cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:20:48 +0100 Subject: gnu: yelp-tools: Update to 3.32.2. * gnu/packages/gnome.scm (yelp-tools): Update to 3.32.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5a29b9a733..c817be3e28 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5632,7 +5632,7 @@ freedesktop.org help system specification.") (define-public yelp-tools (package (name "yelp-tools") - (version "3.28.0") + (version "3.32.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5640,7 +5640,7 @@ freedesktop.org help system specification.") name "-" version ".tar.xz")) (sha256 (base32 - "1b61dmlb1sd50fgq6zgnkcpx2s1py33q0x9cx67fzpsr4gmgxnw2")))) + "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From b92a36dbc825472c5b8159e4b78e31e4e06b5ded Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:24:06 +0100 Subject: gnu: vala: Update to 0.46.5. * gnu/packages/gnome.scm (vala): Update to 0.46.5. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c817be3e28..6e6239a978 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3220,7 +3220,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.44.5") + (version "0.46.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3228,7 +3228,7 @@ passwords in the GNOME keyring.") name "-" version ".tar.xz")) (sha256 (base32 - "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv")))) + "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 404e386ed01a7a84565e4b49b71d456fbcc506c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:24:53 +0100 Subject: gnu: shared-mime-info: Update to 1.15. * gnu/packages/gnome.scm (shared-mime-info): Update to 1.15. [native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL and ITSTOOL. --- gnu/packages/gnome.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6e6239a978..960ff24148 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1709,14 +1709,16 @@ guidelines.") (define-public shared-mime-info (package (name "shared-mime-info") - (version "1.10") + (version "1.15") (source (origin (method url-fetch) - (uri (string-append "https://freedesktop.org/~hadess/" - "shared-mime-info-" version ".tar.xz")) + (uri (string-append + "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" + "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version + ".tar.xz")) (sha256 (base32 - "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6")))) + "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) (build-system gnu-build-system) (arguments ;; The build system appears not to be parallel-safe. @@ -1725,7 +1727,8 @@ guidelines.") `(("glib" ,glib) ("libxml2" ,libxml2))) (native-inputs - `(("intltool" ,intltool) + `(("gettext" ,gettext-minimal) + ("itstool" ,itstool) ("pkg-config" ,pkg-config))) (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") -- cgit v1.2.3 From 4cb09502f2b4b0970a9525a0fb0f615b83c3657a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:26:25 +0100 Subject: gnu: gnome-calculator: Update to 3.34.1. * gnu/packages/gnome.scm (gnome-calculator): Update to 3.34.1. [native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL. [inputs]: Add LIBGEE. --- gnu/packages/gnome.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 960ff24148..5301ceee69 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8550,7 +8550,7 @@ handling the startup notification side.") (define-public gnome-calculator (package (name "gnome-calculator") - (version "3.32.2") + (version "3.34.1") (source (origin (method url-fetch) @@ -8559,19 +8559,20 @@ handling the startup notification side.") name "-" version ".tar.xz")) (sha256 (base32 - "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41")))) + "0lbh87255zzggqzai6543qg920y52bl4vs5m5h5087ghzg14hlsd")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache - ("intltool" ,intltool) ("itstool" ,itstool) ("vala" ,vala) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) ("gtksourceview" ,gtksourceview) + ("libgee" ,libgee) ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("mpc" ,mpc) -- cgit v1.2.3 From 1de804da52d172865f6b04d1dd041f2e15965f35 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:27:45 +0100 Subject: gnu: gcr: Update to 3.34.0. * gnu/packages/gnome.scm (gcr): Update to 3.34.0. [source](patches): Remove. [arguments]: Disable D-Bus tests differently. [native-inputs]: Remove PYTHON-2 and INTLTOOL. Add PYTHON-WRAPPER and GETTEXT-MINIMAL. --- gnu/packages/gnome.scm | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5301ceee69..631f048d98 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1316,7 +1316,7 @@ the font would look under various sizes.") (define-public gcr (package (name "gcr") - (version "3.28.1") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1324,20 +1324,7 @@ the font would look under various sizes.") name "-" version ".tar.xz")) (sha256 (base32 - "12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m")) - (patches - (list - ;; This patch solves an ordering issue that showed up when - ;; running the test suite against newer Glib 2.60. See - ;; . - (origin - (method url-fetch) - (uri (string-append "https://gitlab.gnome.org/GNOME/gcr/commit/" - "45d637578d7643ff96c0183ac267497a0b4c6344.diff")) - (file-name "gcr-hashtable-ordering.patch") - (sha256 - (base32 - "1vsqiys8fsm1f1vvds783wwf7zwi5v282rhsai8jrsm6x7h79gbi"))))))) + "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1346,9 +1333,9 @@ the font would look under various sizes.") ;; build environment. (add-after 'unpack 'disable-failing-tests (lambda _ - (substitute* "gcr/test-system-prompt.c" - (("g_test_add") "//") - (("return.*") "return 0;")) + (substitute* "Makefile.in" + (("[[:blank:]]+test-system-prompt\\$\\(EXEEXT\\)") + "")) #t)) (add-before 'check 'pre-check (lambda _ @@ -1360,11 +1347,11 @@ the font would look under various sizes.") ("gnupg" ,gnupg) ;called as a child process during tests ("libgcrypt" ,libgcrypt))) (native-inputs - `(("python" ,python-2) ;for tests + `(("python" ,python-wrapper) ;for tests ("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool) ("libxml2" ,libxml2) ("vala" ,vala) ("xsltproc" ,libxslt))) -- cgit v1.2.3 From 3440fecd4eff3bde98a4ffe7ad241f2b23ba1f5f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:28:57 +0100 Subject: gnu: nvi: Fix build with glibc 2.30. * gnu/packages/nvi.scm (nvi)[source](modules): New field. [source](snippet): Add substitution to prevent including code that relies on obsolete glibc functions. --- gnu/packages/nvi.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/nvi.scm b/gnu/packages/nvi.scm index 187de31720..c34b1cad72 100644 --- a/gnu/packages/nvi.scm +++ b/gnu/packages/nvi.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Marek Benc +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ (patches (search-patches "nvi-assume-preserve-path.patch" "nvi-dbpagesize-binpower.patch" "nvi-db4.patch")) + (modules '((guix build utils))) (snippet ;; Create a wrapper for the configure script, make it executable. '(let ((conf-wrap (open-output-file "configure"))) @@ -51,6 +53,12 @@ (newline conf-wrap) (close-output-port conf-wrap) (chmod "configure" #o0755) + + ;; Glibc 2.30 removed the deprecated , so fall back + ;; to the internal PTY allocation logic. + (substitute* "ex/ex_script.c" + (("#ifdef HAVE_SYS5_PTY") + "#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)")) #t)))) (build-system gnu-build-system) -- cgit v1.2.3 From 49d7167328aa1a1f6408f220b1864094d1630a06 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:21:44 +0100 Subject: gnu: gobject-introspection: Update to 1.62.0. * gnu/packages/glib.scm (gobject-introspection): Update to 1.62.0. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ba806566c6..08c7811809 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -403,14 +403,14 @@ dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.60.2") + (version "1.62.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "172ymc1vbg2rclq1rszx4y32vm900nn1mc4qg1a4mqxjiwvf5pzz")) + (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" -- cgit v1.2.3 From b15d1c467fd5de9724c3a47c4d0d9c26246e8dc9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 19:52:58 +0100 Subject: gnu: Python: Update to 3.8.1. * gnu/packages/python.scm (python-3.7): Rename to ... (python-3.8): ... this. Update to 3.8.1. [source](patches): Add "python-3.8-fix-tests.patch". [source](snippet): Adjust for renamed file. (python-3): Alias to PYTHON-3.8. * gnu/packages/patches/python-3-search-paths.patch: Adjust for 3.8. * gnu/packages/patches/python-3.8-search-paths.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/patches/python-3-search-paths.patch | 28 ++++++++--------- gnu/packages/patches/python-3.8-search-paths.patch | 17 ---------- gnu/packages/python.scm | 36 ++++------------------ 4 files changed, 20 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/patches/python-3.8-search-paths.patch diff --git a/gnu/local.mk b/gnu/local.mk index 63a3fcffbe..4f1385d73b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1307,7 +1307,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-deterministic-build-info.patch \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ - %D%/packages/patches/python-3.8-search-paths.patch \ %D%/packages/patches/python-3.8-fix-tests.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index cf1647207b..aaf7236631 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -3,23 +3,23 @@ looking for headers and libraries. --- a/setup.py 2015-10-07 23:32:58.891329173 +0200 +++ b/setup.py 2015-10-07 23:46:29.653349924 +0200 -@@ -575,15 +575,15 @@ +@@ -676,15 +676,15 @@ # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. - if not cross_compiling: -- lib_dirs = self.compiler.library_dirs + system_lib_dirs -- inc_dirs = self.compiler.include_dirs + system_include_dirs -+ lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs = os.getenv('CPATH', '').split(os.pathsep) + if not CROSS_COMPILING: +- self.lib_dirs = self.compiler.library_dirs + system_lib_dirs +- self.inc_dirs = self.compiler.include_dirs + system_include_dirs ++ self.lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) ++ self.inc_dirs = os.getenv('CPATH', '').split(os.pathsep) else: # Add the sysroot paths. 'sysroot' is a compiler option used to # set the logical path of the standard system headers and # libraries. -- lib_dirs = (self.compiler.library_dirs + -+ lib_dirs = (os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep) + - sysroot_paths(('LDFLAGS', 'CC'), system_lib_dirs)) -- inc_dirs = (self.compiler.include_dirs + -+ inc_dirs = (os.getenv('CROSS_CPATH', '').split(os.pathsep) + - sysroot_paths(('CPPFLAGS', 'CFLAGS', 'CC'), - system_include_dirs)) - exts = [] +- self.lib_dirs = (self.compiler.library_dirs + ++ self.lib_dirs = (os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep) + + sysroot_paths(('LDFLAGS', 'CC'), system_lib_dirs)) +- self.inc_dirs = (self.compiler.include_dirs + ++ self.inc_dirs = (os.getenv('CROSS_CPATH', '').split(os.pathsep) + + sysroot_paths(('CPPFLAGS', 'CFLAGS', 'CC'), + system_include_dirs)) + diff --git a/gnu/packages/patches/python-3.8-search-paths.patch b/gnu/packages/patches/python-3.8-search-paths.patch deleted file mode 100644 index 88f19850bf..0000000000 --- a/gnu/packages/patches/python-3.8-search-paths.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/setup.py b/setup.py -index 20d7f35..5751083 100644 ---- a/setup.py -+++ b/setup.py -@@ -676,8 +676,8 @@ class PyBuildExt(build_ext): - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. - if not CROSS_COMPILING: -- self.lib_dirs = self.compiler.library_dirs + system_lib_dirs -- self.inc_dirs = self.compiler.include_dirs + system_include_dirs -+ self.lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ self.inc_dirs = os.getenv('CPATH', '').split(os.pathsep) - else: - # Add the sysroot paths. 'sysroot' is a compiler option used to - # set the logical path of the standard system headers and --- -2.23.0 diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7aa170ffc0..96caaae0b3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -344,27 +344,28 @@ data types.") (name "python") (properties `((superseded . ,python-2))))) -(define-public python-3.7 +(define-public python-3.8 (package (inherit python-2) (name "python") - (version "3.7.4") + (version "3.8.1") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) (patches (search-patches "python-3-fix-tests.patch" + "python-3.8-fix-tests.patch" "python-3-deterministic-build-info.patch" "python-3-search-paths.patch")) (sha256 (base32 - "0gxiv5617zd7dnqm5k9r4q2188lk327nf9jznwq9j6b8p0s92ygv")) + "1s4lwn5vzsajlc88m6hkghsvnjw4d00l2dsgng0m2w6vyqbl32bm")) (modules '((guix build utils))) (snippet '(begin ;; Delete the bundled copy of libexpat. (delete-file-recursively "Modules/expat") - (substitute* "Modules/Setup.dist" + (substitute* "Modules/Setup" ;; Link Expat instead of embedding the bundled one. (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) #t)))) @@ -432,33 +433,8 @@ data types.") (version-major+minor version) "/site-packages")))))))) -(define-public python-3.8 - (package - (inherit python-3.7) - (name "python-next") - (version "3.8.0") - (source - (origin - (inherit (package-source python-3.7)) - (uri (string-append "https://www.python.org/ftp/python/" - version "/Python-" version ".tar.xz")) - (sha256 (base32 "110d0did9rxn7rg85kf2fwli5hqq44xv2d8bi7d92m7v2d728mmk")) - (patches (search-patches - "python-3.8-search-paths.patch" - "python-3-fix-tests.patch" - "python-3.8-fix-tests.patch" - "python-3-deterministic-build-info.patch")) - (snippet - '(begin - ;; Delete the bundled copy of libexpat. - (delete-file-recursively "Modules/expat") - (substitute* "Modules/Setup" - ;; Link Expat instead of embedding the bundled one. - (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) - #t)))))) - ;; Current 3.x version. -(define-public python-3 python-3.7) +(define-public python-3 python-3.8) ;; Current major version. (define-public python python-3) -- cgit v1.2.3 From 1cc3971242fe28835b57e3e480c2336db04ca024 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 07:42:13 +0100 Subject: gnu: boost: Fix build with Python 3.8. * gnu/packages/boost.scm (boost)[arguments]: Drop "m" suffix of Python 3 header location. --- gnu/packages/boost.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index ded4db0586..16a08bde44 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -137,11 +137,6 @@ ,(%current-target-system))))) '()) - (when (which "python3") - (substitute* "tools/build/src/tools/python.jam" - (("include/python\\$\\(version\\)") - "include/python$(version)m"))) - (invoke "./bootstrap.sh" (string-append "--prefix=" out) ;; Auto-detection looks for ICU only in traditional -- cgit v1.2.3 From 6e3cbafb60dd55c41dd5cab1f2ccf4077c7cc27a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 08:11:08 +0100 Subject: gnu: fontforge: Fix build with Python 3.8. * gnu/packages/fontutils.scm (fontforge)[native-inputs]: Add AUTOCONF, AUTOMAKE, and LIBTOOL. [arguments]: Add phase 'fix-linking-with-python-3.8'. --- gnu/packages/fontutils.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 34e17fdf67..1e5ebea868 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018, 2019 Ludovic Courtès -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -585,7 +585,13 @@ definitions.") (base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + + ;; TODO: Remove these inputs and the 'fix-linking-with-python-3.8' phase + ;; below when updating fontforge. + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("cairo" ,cairo) ("fontconfig" ,fontconfig) ;dlopen'd ("freetype" ,freetype) @@ -610,6 +616,17 @@ definitions.") (arguments '(#:phases (modify-phases %standard-phases + (add-before 'bootstrap 'fix-linking-with-python-3.8 + (lambda _ + ;; Applications that embed the Python interpreter are supposed to + ;; use the new "python-3.8-embed.pc" pkg-config file starting with + ;; Python 3.8. Adjust the build system accordingly. + (substitute* "m4/fontforge_arg_enable.m4" + (("python-\"\\$\\{PYTHON_VERSION\\}\"" all) + (string-append all "-embed"))) + ;; Delete the configure script in order to force autoreconf. + (delete-file "configure") + #t)) (add-after 'install 'set-library-path (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From b8f5aa6fa024805247f7d4b3dddf7551541bee54 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:26:53 +0100 Subject: gnu: python-scandir: Update to 1.10.0. * gnu/packages/python-xyz.scm (python-scandir): Update to 1.10.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4dfe6ee612..47da29627a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12963,13 +12963,13 @@ It supports both normal and Unicode strings.") (define-public python-scandir (package (name "python-scandir") - (version "1.9.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (pypi-uri "scandir" version)) (sha256 - (base32 "0r3hvf1a9jm1rkqgx40gxkmccknkaiqjavs8lccgq9s8khh5x5s4")))) + (base32 "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 5e1d6787f2b11c28e861de9314f4a76d50b935be Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:27:27 +0100 Subject: gnu: python-coverage: Update to 5.0.3. * gnu/packages/check.scm (python-coverage): Update to 5.0.3. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 17d5fa6ba8..f6654e4e3b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1348,14 +1348,14 @@ have failed since the last commit or what tests are currently failing."))) (define-public python-coverage (package (name "python-coverage") - (version "4.5.3") + (version "5.0.3") (source (origin (method url-fetch) (uri (pypi-uri "coverage" version)) (sha256 (base32 - "02f6m073qdispn96rc616hg0rnmw1pgqzw3bgxwiwza4zf9hirlx")))) + "1vrg8panqw79pswg52ygbrff3wdnxarrd9qz6c64ah0c4h2cmbvp")))) (build-system python-build-system) (arguments ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. -- cgit v1.2.3 From 1c4746ee6926861543d28a4cd5e0fd60ea01938d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:30:18 +0100 Subject: gnu: python-setuptools-scm: Update to 3.3.3. * gnu/packages/python-xyz.scm (python-setuptools-scm): Update to 3.3.3. (python-setuptools-scm-3.3): Remove variable. (python-lazy-object-proxy)[native-inputs]: Change from PYTHON-SETUPTOOLS-SCM-3.3 to PYTHON-SETUPTOOLS-SCM. --- gnu/packages/python-xyz.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 47da29627a..62c407c65e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4930,13 +4930,13 @@ child application and control it as if a human were typing commands.") (define-public python-setuptools-scm (package (name "python-setuptools-scm") - (version "3.2.0") + (version "3.3.3") (source (origin (method url-fetch) (uri (pypi-uri "setuptools_scm" version)) (sha256 (base32 - "0n3knn3p1sqlx31k2lahn7z9bacvlv8nhlfidj77vz50bxqlgasj")))) + "19cyndx23xmpbhz4qrwmfwsmnnaczd0dw7qg977ksq2dbvxy29dx")))) (build-system python-build-system) (home-page "https://github.com/pypa/setuptools_scm/") (synopsis "Manage Python package versions in SCM metadata") @@ -4946,18 +4946,6 @@ child application and control it as if a human were typing commands.") them as the version argument or in a SCM managed file.") (license license:expat))) -;; Needed by python-lazy-object-proxy, remove on next update cycle. -(define-public python-setuptools-scm-3.3 - (package - (inherit python-setuptools-scm) - (version "3.3.3") - (source (origin - (method url-fetch) - (uri (pypi-uri "setuptools_scm" version)) - (sha256 - (base32 - "19cyndx23xmpbhz4qrwmfwsmnnaczd0dw7qg977ksq2dbvxy29dx")))))) - (define-public python2-setuptools-scm (package-with-python2 python-setuptools-scm)) @@ -10666,7 +10654,7 @@ it will manage (install/update) them for you.") (base32 "1w1aaay424ciz8fz3fkzxb0pxzfxn184f2whpyn4fx72bn50x47k")))) (native-inputs - `(("python-setuptools-scm" ,python-setuptools-scm-3.3))) + `(("python-setuptools-scm" ,python-setuptools-scm))) (build-system python-build-system) (home-page "https://github.com/ionelmc/python-lazy-object-proxy") (synopsis "Lazy object proxy for python") -- cgit v1.2.3 From 23d5d859a83d781e1e0873f6aa2b9093ee0cfc7a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:30:45 +0100 Subject: gnu: python-py: Update to 1.8.1. * gnu/packages/python-xyz.scm (python-py): Update to 1.8.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 62c407c65e..07886969d2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1704,14 +1704,14 @@ server.") (define-public python-py (package (name "python-py") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw")))) + "1ajjazg3913n0sp3vjyva9c2qh5anx8ziryng935f89604a0h9sy")))) (build-system python-build-system) (arguments ;; FIXME: "ImportError: 'test' module incorrectly imported from -- cgit v1.2.3 From 559f5799db26ad0db93335fd353302fd02bf69c1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:31:36 +0100 Subject: gnu: python-typing: Update to 3.7.4.1. * gnu/packages/python-xyz.scm (python-typing): Update to 3.7.4.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 07886969d2..95054f751e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14820,14 +14820,14 @@ based on the CPython 2.7 and 3.7 parsers.") (define-public python-typing (package (name "python-typing") - (version "3.6.6") + (version "3.7.4.1") (source (origin (method url-fetch) (uri (pypi-uri "typing" version)) (sha256 (base32 - "0ba9acs4awx15bf9v3nrs781msbd2nx826906nj6fqks2bvca9s0")))) + "08xs7s5pyq99hbrzw23inczmidz90krvpv9q5p1qrvh6yzrydpwi")))) (build-system python-build-system) (home-page "https://docs.python.org/3/library/typing.html") (synopsis "Type hints for Python") -- cgit v1.2.3 From c6bc3529a507a45637c4a061dfdb00b619e5f4f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:32:16 +0100 Subject: gnu: python-configparser: Update to 4.0.2. * gnu/packages/python-xyz.scm (python-configparser): Update to 4.0.2. [native-inputs]: Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 95054f751e..7296b9b2d7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12719,14 +12719,16 @@ of @code{functools.lru_cache} from python 3.3.") (define-public python-configparser (package (name "python-configparser") - (version "3.7.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (pypi-uri "configparser" version)) (sha256 (base32 - "0cnz213il9lhgda6x70fw7mfqr8da43s3wm343lwzhqx94mgmmav")))) + "1priacxym85yjcf68hh38w55nqswaxp71ryjyfdk222kg9l85ln7")))) + (native-inputs + `(("python-setuptools_scm" ,python-setuptools-scm))) (build-system python-build-system) (home-page "https://github.com/jaraco/configparser/") (synopsis "Backport of configparser from python 3.5") -- cgit v1.2.3 From f00722b40c9d302772020d8435e3eb6f4f0b683a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:32:46 +0100 Subject: gnu: python-six: Update to 1.13.0. * gnu/packages/python-xyz.scm (python-six): Update to 1.13.0. [native-inputs]: Remove PYTHON-PY. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7296b9b2d7..e3ff64677e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1091,14 +1091,14 @@ from the Python interpreter, or as a small part of a larger application.") (define-public python-six (package (name "python-six") - (version "1.12.0") + (version "1.13.0") (source (origin (method url-fetch) (uri (pypi-uri "six" version)) (sha256 (base32 - "0wxs1q74v07ssjywbbm7x6h5v9qx209ld2yfsif4060sxi0h2sni")))) + "0rkby0kxlxj0kk2m6q5mh73ka5rk608p886vnv57h9cbkqki1xih")))) (build-system python-build-system) (arguments `(#:phases @@ -1107,8 +1107,7 @@ from the Python interpreter, or as a small part of a larger application.") (lambda _ (invoke "py.test" "-v")))))) (native-inputs - `(("python-py" ,python-py) - ("python-pytest" ,python-pytest-bootstrap))) + `(("python-pytest" ,python-pytest-bootstrap))) (home-page "https://pypi.python.org/pypi/six/") (synopsis "Python 2 and 3 compatibility utilities") (description -- cgit v1.2.3 From 87a49025e9c6dec06f12df5f382fed5bf8906789 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:53:38 +0100 Subject: gnu: python2-pathlib2: Update to 2.3.5. * gnu/packages/python-xyz.scm (python2-pathlib2): Update to 2.3.5. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3ff64677e..5713bb359b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9455,13 +9455,13 @@ anymore.") (define-public python2-pathlib2 (package (name "python2-pathlib2") - (version "2.3.3") + (version "2.3.5") (source (origin (method url-fetch) (uri (pypi-uri "pathlib2" version)) (sha256 (base32 - "0hpp92vqqgcd8h92msm9slv161b1q160igjwnkf2ag6cx0c96695")))) + "0s4qa8c082fdkb17izh4mfgwrjd1n5pya18wvrbwqdvvb5xs9nbc")))) (build-system python-build-system) ;; We only need the the Python 2 variant, since for Python 3 our minimum ;; version is 3.4 which already includes this package as part of the -- cgit v1.2.3 From fb7686a9999109fa478c8a2f115e7e65c5e166d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:55:57 +0100 Subject: gnu: python-flake8: Update to 3.7.9. * gnu/packages/python-xyz.scm (python-flake8): Update to 3.7.9. [native-inputs]: Remove PYTHON-PYTEST-RUNNER. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5713bb359b..a0cc69d084 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6535,13 +6535,13 @@ complexity of Python source code.") (define-public python-flake8 (package (name "python-flake8") - (version "3.7.7") + (version "3.7.9") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0qg6zggqigrd4k3gv88shd1a27d0cwgfql8vfiq2c7rl7w3rd6c5")))) + "1yscj6avirm6m12bjh4fn2lfgxaamqsjh9pirdqfi0fcgq8ils25")))) (build-system python-build-system) (arguments `(#:phases @@ -6559,8 +6559,7 @@ complexity of Python source code.") ("python-mccabe" ,python-mccabe))) (native-inputs `(("python-mock" ,python-mock) - ("python-pytest" ,python-pytest-bootstrap) - ("python-pytest-runner" ,python-pytest-runner))) + ("python-pytest" ,python-pytest-bootstrap))) (home-page "https://gitlab.com/pycqa/flake8") (synopsis "The modular source code checker: pep8, pyflakes and co") -- cgit v1.2.3 From a9d1da178e5f10d5578de8be099fc79f9554fdfd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:56:34 +0100 Subject: gnu: python-more-itertools: Update to 8.1.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 8.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a0cc69d084..78ab4e98ee 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15048,14 +15048,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "7.1.0") + (version "8.1.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "16phg2f2dvm6ci5wr49ncha5lmc0m2in3bsl33c61vzca4gkvd4b")))) + "121j5nsz017r8ry2vabx4wb13srlvfjvhk0i38lbd043aznass64")))) (build-system python-build-system) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") -- cgit v1.2.3 From dab41b95fb56631fe61b9d04dba59de88c95fd7c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:57:07 +0100 Subject: gnu: python-mock: Update to 3.0.5. * gnu/packages/check.scm (python-mock): Update to 3.0.5. [propagated-inputs]: Remove PYTHON-PBR-MINIMAL. [native-inputs]: Remove. [arguments]: Remove #:phases. Add #:tests?. --- gnu/packages/check.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index f6654e4e3b..a8d679cc83 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -642,26 +642,20 @@ doctest.") (define-public python-mock (package (name "python-mock") - (version "2.0.0") + (version "3.0.5") (source (origin (method url-fetch) (uri (pypi-uri "mock" version)) (sha256 (base32 - "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i")))) + "1hrp6j0yrx2xzylfv02qa8kph661m6yq4p0mc8fnimch9j4psrc3")))) (propagated-inputs - `(("python-pbr" ,python-pbr-minimal) - ("python-six" ,python-six))) + `(("python-six" ,python-six))) (build-system python-build-system) - (native-inputs - `(("python-unittest2" ,python-unittest2))) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (zero? (system* "unit2"))))))) + ;; FIXME: Tests require "pytest", which depends on this package. + '(#:tests? #f)) (home-page "https://github.com/testing-cabal/mock") (synopsis "Python mocking and patching library for testing") (description -- cgit v1.2.3 From 4c2530afce2f7f43795c217d43f3d66069896257 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:57:42 +0100 Subject: gnu: python-sorted-containers: Disable tests. It did not actually run tests previously, because pytest was unavailable. * gnu/packages/python-xyz.scm (python-sortedcontainers)[arguments]: New field. [native-inputs]: Remove. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 78ab4e98ee..9ef3b8e234 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15811,8 +15811,10 @@ that is accessible to other projects developed in Cython.") (base32 "0fm0w5id2yhqld95hg2m636vjgkz377rvgdfqaxc25vbylr9lklp")))) (build-system python-build-system) - (native-inputs - `(("python-tox" ,python-tox))) + (arguments + ;; FIXME: Tests require many extra dependencies, and would introduce + ;; a circular dependency on hypothesis, which uses this package. + '(#:tests? #f)) (home-page "http://www.grantjenks.com/docs/sortedcontainers/") (synopsis "Sorted List, Sorted Dict, Sorted Set") (description -- cgit v1.2.3 From aadef9c8450f18b54f72f770e549541587641b18 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:58:41 +0100 Subject: gnu: python-sortedcontainers: Add python2 variant. * gnu/packages/python-xyz.scm (python2-sortedcontainers): New public variable. --- gnu/packages/python-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9ef3b8e234..96ae913b3d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15822,6 +15822,9 @@ that is accessible to other projects developed in Cython.") pure-Python.") (license license:asl2.0))) +(define-public python2-sortedcontainers + (package-with-python2 python-sortedcontainers)) + (define-public python-cloudpickle (package (name "python-cloudpickle") -- cgit v1.2.3 From 11c28af19a2462ae58623e452aed3bf3c7e66b2a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:59:48 +0100 Subject: gnu: python-pyparsing: Update to 2.4.6. * gnu/packages/python-xyz.scm (python-pyparsing): Update to 2.4.6. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 96ae913b3d..072f894731 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3724,13 +3724,13 @@ library, libgit2 implements Git plumbing.") (define-public python-pyparsing (package (name "python-pyparsing") - (version "2.3.1") + (version "2.4.6") (source (origin (method url-fetch) (uri (pypi-uri "pyparsing" version)) (sha256 - (base32 "0yk6xl885b91dmlhlsap7x78hk2rdr879fln9anbq6k4ca42djb6")))) + (base32 "17wn5zlijc9m9zj26gy3f541y7smpj8rfhl51d025c2gm210b0sc")))) (build-system python-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 8aed0895f1ddafd0333a15a8473ff5e1fe0751f8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 22:00:38 +0100 Subject: gnu: python-attrs: Update to 19.3.0. * gnu/packages/python-xyz.scm (python-attrs): Update to 19.3.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 072f894731..7ae650c7cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12369,13 +12369,13 @@ and bit flag values.") (define-public python-attrs (package (name "python-attrs") - (version "19.1.0") + (version "19.3.0") (source (origin (method url-fetch) (uri (pypi-uri "attrs" version)) (sha256 (base32 - "16g33zr5f449lqc5wgvzpknxryfzrfsxcr6kpgxwn7l5fkv71f7h")))) + "0wky4h28n7xnr6xv69p9z6kv8bzn50d10c3drmd9ds8gawbcxdzp")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 3b5378a87fd067dca07b35163e85056044d61cdf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 22:01:41 +0100 Subject: gnu: python-hypothesis: Update to 5.1.5. * gnu/packages/check.scm (python-hypothesis): Update to 5.1.5. [native-inputs]: Remove. [arguments]: New field. [propagated-inputs]: Remove PYTHON-COVERAGE. Add PYTHON-SORTEDCONTAINERS. (python2-hypothesis): Update to 4.57.1. --- gnu/packages/check.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index a8d679cc83..684721c6f2 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1612,20 +1612,20 @@ instantly.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "4.18.3") + (version "5.1.5") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0a35nwqyjnm4cphi43xracqpkws0ip61mndvqb1iqq7gkva83lb1")))) + "1ady8cjwpwsicpkhpjd6qwnipjr1lf488sv23psksbxsbgffg7sz")))) (build-system python-build-system) - (native-inputs - `(("python-flake8" ,python-flake8) - ("python-pytest" ,python-pytest-bootstrap))) + (arguments + ;; XXX: Tests are not distributed with the PyPI archive. + '(#:tests? #f)) (propagated-inputs `(("python-attrs" ,python-attrs-bootstrap) - ("python-coverage" ,python-coverage))) + ("python-sortedcontainers" ,python-sortedcontainers))) (synopsis "Library for property based testing") (description "Hypothesis is a library for testing your Python code against a much larger range of examples than you would ever want to write by hand. It’s @@ -1635,10 +1635,18 @@ seamlessly into your existing Python unit testing work flow.") (license license:mpl2.0) (properties `((python2-variant . ,(delay python2-hypothesis)))))) +;; This is the last version of Hypothesis that supports Python 2. (define-public python2-hypothesis (let ((hypothesis (package-with-python2 (strip-python2-variant python-hypothesis)))) (package (inherit hypothesis) + (version "4.57.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "hypothesis" version)) + (sha256 + (base32 + "183gpxbfcdhdqzlahkji5a71n6lmvgqsbkcb0ihqad51n2j6jhrw")))) (propagated-inputs `(("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs hypothesis)))))) -- cgit v1.2.3 From 17263ef5e84029ddaadef3ab40fcba7cbc9d6c43 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 22:02:22 +0100 Subject: gnu: python-pluggy: Update to 0.13.1. * gnu/packages/python-xyz.scm (python-pluggy): Update to 0.13.1. [properties]: New field. (python2-pluggy): Stay on 0.11.0. --- gnu/packages/python-xyz.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7ae650c7cc..9f37da99d5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8751,14 +8751,14 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.11.0") + (version "0.13.1") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "10511a54dvafw1jrk75mrhml53c7b7w4yaw7241696lc2hfvr895")))) + "1c35qyhvy27q9ih9n899f3h4sdnpgq027dbiilly2qb5cvgarchm")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) @@ -8766,10 +8766,21 @@ library as well as on the command line.") (description "Pluggy is an extraction of the plugin manager as used by Pytest but stripped of Pytest specific details.") (home-page "https://pypi.python.org/pypi/pluggy") + (properties `((python2-variant . ,(delay python2-pluggy)))) (license license:expat))) (define-public python2-pluggy - (package-with-python2 python-pluggy)) + (let ((base (package-with-python2 (strip-python2-variant + python-pluggy)))) + (package/inherit + base + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pluggy" version)) + (sha256 + (base32 + "10511a54dvafw1jrk75mrhml53c7b7w4yaw7241696lc2hfvr895"))))))) (define-public python-tox (package -- cgit v1.2.3 From c5d399090e2a3f5a742fcdf4e514f0f8ab6fe491 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 22:03:00 +0100 Subject: gnu: python-pytest: Update to 5.3.2. * gnu/packages/check.scm (python-pytest): Update to 5.3.2. [propagated-inputs]: Add PYTHON-WCWIDTH and PYTHON-PACKAGING-BOOTSTRAP. [native-inputs]: Add PYTHON-XMLSCHEMA. [arguments]: Support overriding check phase with #:tests?. (python2-pytest): Stay on version 4.4.2. (python2-pytest-bootstrap): Inherit from PYTHON2-PYTEST instead of PYTHON-PYTEST-BOOTSTRAP. * gnu/packages/python-xyz.scm (python-packaging-bootstrap): New public variable. --- gnu/packages/check.scm | 96 ++++++++++++++++++++++++++++++++------------- gnu/packages/python-xyz.scm | 11 ++++++ 2 files changed, 79 insertions(+), 28 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 684721c6f2..c28e488a14 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages time) + #:use-module (gnu packages xml) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -763,35 +764,40 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "4.4.2") + (version "5.3.2") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "18w38kjnffdcrlbw6ny6dksgxai6x9bxpjs2m6klqmb8hfzjkcb2")))) + "1yi51ckkiywszz0qp67jisxzcp54acf57wqr3ysgk457nlai4mvb")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest" "-vv" "-k" - (string-append - ;; These tests involve the /usr directory, and fails. - "not test_remove_dir_prefix" - " and not test_argcomplete" - ;; This test tries to override PYTHONPATH, and - ;; subsequently fails to locate the test libraries. - " and not test_collection"))))))) + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (invoke "pytest" "-vv" "-k" + (string-append + ;; These tests involve the /usr directory, and fails. + "not test_remove_dir_prefix" + " and not test_argcomplete" + ;; This test tries to override PYTHONPATH, and + ;; subsequently fails to locate the test libraries. + " and not test_collection")) + (format #t "test suite not run~%")) + #t))))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-attrs" ,python-attrs-bootstrap) ("python-more-itertools" ,python-more-itertools) + ("python-packaging" ,python-packaging-bootstrap) ("python-pluggy" ,python-pluggy) ("python-py" ,python-py) - ("python-six" ,python-six-bootstrap))) + ("python-six" ,python-six-bootstrap) + ("python-wcwidth" ,python-wcwidth))) (native-inputs `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. ("bash" ,bash) @@ -799,7 +805,8 @@ standard library.") ("python-nose" ,python-nose) ("python-mock" ,python-mock) ("python-pytest" ,python-pytest-bootstrap) - ("python-setuptools-scm" ,python-setuptools-scm))) + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-xmlschema" ,python-xmlschema))) (home-page "https://docs.pytest.org/en/latest/") (synopsis "Python testing library") (description @@ -809,15 +816,38 @@ and many external plugins.") (license license:expat) (properties `((python2-variant . ,(delay python2-pytest)))))) +;; Pytest 4.x are the last versions that support Python 2. (define-public python2-pytest - (let ((pytest (package-with-python2 - (strip-python2-variant python-pytest)))) - (package - (inherit pytest) - (propagated-inputs - `(("python2-funcsigs" ,python2-funcsigs) - ("python2-pathlib2" ,python2-pathlib2) - ,@(package-propagated-inputs pytest)))))) + (package + (inherit (strip-python2-variant python-pytest)) + (name "python2-pytest") + (version "4.4.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest" version)) + (sha256 + (base32 + "18w38kjnffdcrlbw6ny6dksgxai6x9bxpjs2m6klqmb8hfzjkcb2")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + ,@(package-arguments python-pytest))) + (propagated-inputs + `(("python-atomicwrites" ,python2-atomicwrites) + ("python-attrs" ,python2-attrs-bootstrap) + ("python-funcsigs" ,python2-funcsigs) + ("python-more-itertools" ,python2-more-itertools) + ("python-pathlib2" ,python2-pathlib2) + ("python-pluggy" ,python2-pluggy) + ("python-py" ,python2-py) + ("python-six" ,python2-six-bootstrap))) + (native-inputs + `(("bash" ,bash) ;tests require 'compgen' + ("python-hypothesis" ,python2-hypothesis) + ("python-nose" ,python2-nose) + ("python-mock" ,python2-mock) + ("python-pytest" ,python2-pytest-bootstrap) + ("python-setuptools-scm" ,python2-setuptools-scm))))) (define-public python-pytest-bootstrap (package @@ -828,13 +858,23 @@ and many external plugins.") (properties `((python2-variant . ,(delay python2-pytest-bootstrap)))))) (define-public python2-pytest-bootstrap - (let ((pytest (package-with-python2 - (strip-python2-variant python-pytest-bootstrap)))) - (package (inherit pytest) - (propagated-inputs - `(("python2-funcsigs" ,python2-funcsigs-bootstrap) - ("python2-pathlib2" ,python2-pathlib2-bootstrap) - ,@(package-propagated-inputs pytest)))))) + (hidden-package + (package/inherit + python2-pytest + (name "python2-pytest-bootstrap") + (arguments + (substitute-keyword-arguments (package-arguments python2-pytest) + ((#:tests? _ #f) #f))) + (native-inputs + `(("python-setuptools-scm" ,python2-setuptools-scm))) + (propagated-inputs + `(("python-atomicwrites" ,python2-atomicwrites) + ("python-attrs" ,python2-attrs-bootstrap) + ("python-funcsigs" ,python2-funcsigs-bootstrap) + ("python-more-itertools" ,python2-more-itertools) + ("python-pathlib2" ,python2-pathlib2-bootstrap) + ("python-pluggy" ,python2-pluggy) + ("python-py" ,python2-py)))))) (define-public python-pytest-cov (package diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9f37da99d5..618049e4bd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13121,6 +13121,17 @@ information.") ;; licenses. (license (list license:asl2.0 license:bsd-2)))) +;; A variant with minimal dependencies, for bootstrapping Pytest. +(define-public python-packaging-bootstrap + (hidden-package + (package/inherit + python-packaging + (name "python-packaging-bootstrap") + (native-inputs '()) + (propagated-inputs + `(("python-pyparsing" ,python-pyparsing))) + (arguments '(#:tests? #f))))) + (define-public python2-packaging (package-with-python2 python-packaging)) -- cgit v1.2.3 From 94fa51e17d23edbbdac2f66809b3c96315dd6781 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 22:15:59 +0100 Subject: gnu: python2-flake8: Add missing input. * gnu/packages/python-xyz.scm (python2-flake8)[propagated-inputs]: Add PYTHON2-FUNCTOOLS32. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 618049e4bd..d9b17fca32 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6574,6 +6574,7 @@ complexity of Python source code.") (propagated-inputs `(("python2-configparser" ,python2-configparser) ("python2-enum34" ,python2-enum34) + ("python2-functools32" ,python2-functools32) ("python2-typing" ,python2-typing) ,@(package-propagated-inputs base)))))) -- cgit v1.2.3 From 5e7202bbdf407470bbb72cf0a74dea6961c2507a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 23:23:00 +0100 Subject: gnu: python2-importlib-resources: Drop 'wheel' dependency. * gnu/packages/python-xyz.scm (python2-importlib-resources)[native-inputs]: Remove. [arguments]: Add #:phases. --- gnu/packages/python-xyz.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d9b17fca32..e44696e454 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4983,9 +4983,17 @@ older Python versions.") "0y3hg12iby1qyaspnbisz4s4vxax7syikk3skznwqizqyv89y9yk")))) (build-system python-build-system) (arguments - `(#:python ,python-2)) - (native-inputs - `(("python-wheel" ,python2-wheel))) + `(#:python ,python-2 + #:phases (modify-phases %standard-phases + ;; The build system tests for python-wheel, but it is + ;; not required for Guix nor the test suite. Just drop + ;; it to make bootstrapping pytest easier. + (add-after 'unpack 'drop-wheel-dependency + (lambda _ + (substitute* "setup.cfg" + (("^[[:blank:]]+wheel") + "")) + #t))))) (propagated-inputs `(("python-pathlib2" ,python2-pathlib2) ("python-typing" ,python2-typing))) -- cgit v1.2.3 From db6fb90a1fc29ab8a5fb61483e0e30d74c4eb8d8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 23:40:07 +0100 Subject: gnu: python2-pluggy: Update to 0.13.1. * gnu/packages/python-xyz.scm (python-pluggy)[source, version]: Remove. [propagated-inputs]: Add PYTHON2-IMPORTLIB-METADATA. --- gnu/packages/python-xyz.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e44696e454..ea67be17ef 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8783,13 +8783,8 @@ Pytest but stripped of Pytest specific details.") python-pluggy)))) (package/inherit base - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "pluggy" version)) - (sha256 - (base32 - "10511a54dvafw1jrk75mrhml53c7b7w4yaw7241696lc2hfvr895"))))))) + (propagated-inputs + `(("python-importlib-metadata" ,python2-importlib-metadata)))))) (define-public python-tox (package -- cgit v1.2.3 From 0ae97f5dd1c6cc2ad8e9f27f62e5a72e0d5fbb4c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 00:45:53 +0100 Subject: gnu: python2-pytest: Update to 4.6.9. * gnu/packages/check.scm (python2-pytest): Update to 4.6.9. (python2-pytest-bootstrap)[propagated-inputs]: Add PYTHON2-IMPORTLIB-METADATA-BOOTSTRAP, PYTHON2-PACKAGING-BOOTSTRAP, and PYTHON2-WCWIDTH. Replace PYTHON2-PLUGGY with PYTHON2-PLUGGY-BOOTSTRAP. * gnu/packages/python-compression.scm (python2-zipp-bootstrap): New public variable. * gnu/packages/python-xyz.scm (python2-importlib-resources-bootstrap): New public variable. (python-importlib-metadata)[native-inputs]: Change from PYTHON-PACKAGING to PYTHON-PACKAGING-BOOTSTRAP. [properties]: New field. (python2-importlib-metadata-bootstrap, python2-contextlib2-bootstrap, python2-pluggy-bootstrap): New public variables. (python-packaging)[arguments]: Allow overriding #:tests?. (python2-packaging-bootstrap): New public variable. --- gnu/packages/check.scm | 16 +++++--- gnu/packages/python-compression.scm | 12 ++++++ gnu/packages/python-xyz.scm | 78 ++++++++++++++++++++++++++++++++++--- 3 files changed, 96 insertions(+), 10 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c28e488a14..941b4547b6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -821,13 +821,13 @@ and many external plugins.") (package (inherit (strip-python2-variant python-pytest)) (name "python2-pytest") - (version "4.4.2") + (version "4.6.9") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "18w38kjnffdcrlbw6ny6dksgxai6x9bxpjs2m6klqmb8hfzjkcb2")))) + "0fgkmpc31nzy97fxfrkqbzycigdwxwwmninx3qhkzp81migggs0r")))) (build-system python-build-system) (arguments `(#:python ,python-2 @@ -836,11 +836,14 @@ and many external plugins.") `(("python-atomicwrites" ,python2-atomicwrites) ("python-attrs" ,python2-attrs-bootstrap) ("python-funcsigs" ,python2-funcsigs) + ("python-importlib-metadata" ,python2-importlib-metadata-bootstrap) ("python-more-itertools" ,python2-more-itertools) + ("python-packaging" ,python2-packaging-bootstrap) ("python-pathlib2" ,python2-pathlib2) ("python-pluggy" ,python2-pluggy) ("python-py" ,python2-py) - ("python-six" ,python2-six-bootstrap))) + ("python-six" ,python2-six-bootstrap) + ("python-wcwidth" ,python2-wcwidth))) (native-inputs `(("bash" ,bash) ;tests require 'compgen' ("python-hypothesis" ,python2-hypothesis) @@ -871,10 +874,13 @@ and many external plugins.") `(("python-atomicwrites" ,python2-atomicwrites) ("python-attrs" ,python2-attrs-bootstrap) ("python-funcsigs" ,python2-funcsigs-bootstrap) + ("python-importlib-metadata" ,python2-importlib-metadata-bootstrap) ("python-more-itertools" ,python2-more-itertools) + ("python-packaging" ,python2-packaging-bootstrap) ("python-pathlib2" ,python2-pathlib2-bootstrap) - ("python-pluggy" ,python2-pluggy) - ("python-py" ,python2-py)))))) + ("python-pluggy" ,python2-pluggy-bootstrap) + ("python-py" ,python2-py) + ("python-wcwidth" ,python2-wcwidth)))))) (define-public python-pytest-cov (package diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 70abc7bad1..7924479185 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2019 Efraim Flashner ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -243,6 +244,17 @@ wrapper. It provides a backport of the @code{Path} object.") ("python-unittest2" ,python2-unittest2) ,@(package-native-inputs base)))))) +;; This package is used to bootstrap pytest, via importlib-metadata. +(define-public python2-zipp-bootstrap + (hidden-package + (package/inherit + python2-zipp + (arguments + `(#:tests? #f + ,@(package-arguments python2-zipp))) + (native-inputs + `(("python-setuptools-scm" ,python2-setuptools-scm)))))) + (define-public python-zstandard (package (name "python-zstandard") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ea67be17ef..12faca73eb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5004,6 +5004,16 @@ older Python versions.") for older versions of Python.") (license license:asl2.0))) +;; For importlib-metadata-bootstrap below. +(define-public python2-importlib-resources-bootstrap + (hidden-package + (package/inherit + python2-importlib-resources + (name "python2-importlib-resources-bootstrap") + (propagated-inputs + `(("python-pathlib2-bootstrap" ,python2-pathlib2-bootstrap) + ("python-typing" ,python2-typing)))))) + (define-public python-importlib-metadata (package (name "python-importlib-metadata") @@ -5019,7 +5029,7 @@ for older versions of Python.") `(("python-zipp" ,python-zipp))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) - ("python-packaging" ,python-packaging))) + ("python-packaging" ,python-packaging-bootstrap))) (home-page "https://importlib-metadata.readthedocs.io/") (synopsis "Read metadata from Python packages") (description @@ -5045,6 +5055,22 @@ need to use the older and less efficient @code{pkg_resources} package.") ("python-pathlib2" ,python2-pathlib2) ,@(package-propagated-inputs base)))))) +;; This package is used by python2-pytest, and thus must not depend on it. +(define-public python2-importlib-metadata-bootstrap + (hidden-package + (package/inherit + python2-importlib-metadata + (name "python2-importlib-metadata-bootstrap") + (arguments + `(#:tests? #f + ,@(package-arguments python2-importlib-metadata))) + (propagated-inputs + `(("python-zipp" ,python2-zipp-bootstrap) + ("python-pathlib2" ,python2-pathlib2-bootstrap) + ("python-configparser" ,python2-configparser) + ("python-contextlib2" ,python2-contextlib2-bootstrap) + ("python-importlib-resources" ,python2-importlib-resources-bootstrap)))))) + (define-public python-jaraco-packaging (package (name "python-jaraco-packaging") @@ -8288,6 +8314,18 @@ the standard library.") (native-inputs `(("python2-unittest2" ,python2-unittest2)))))) +;; This package is used by python2-pytest via python2-importlib-metadata, +;; and thus can not depend on python-unittest2 (which depends on pytest). +(define-public python2-contextlib2-bootstrap + (hidden-package + (package/inherit + python2-contextlib2 + (name "python2-contextlib2-bootstrap") + (arguments + `(#:tests? #f + ,@(package-arguments python2-contextlib2))) + (native-inputs '())))) + (define-public python-texttable (package (name "python-texttable") @@ -8786,6 +8824,20 @@ Pytest but stripped of Pytest specific details.") (propagated-inputs `(("python-importlib-metadata" ,python2-importlib-metadata)))))) +;; This package requires python2-importlib-metadata, but that package +;; ends up needing python2-pluggy via python2-pytest, so we need this +;; variant to solve the circular dependency. +(define-public python2-pluggy-bootstrap + (hidden-package + (package/inherit + python2-pluggy + (name "python2-pluggy-bootstrap") + (arguments + `(#:tests? #f + ,@(package-arguments python2-pluggy))) + (propagated-inputs + `(("python-importlib-metadata" ,python2-importlib-metadata-bootstrap)))))) + (define-public python-tox (package (name "python-tox") @@ -13107,7 +13159,11 @@ several utilities, as well as an API for building localization tools.") (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "py.test" "-vv")))))) + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "py.test" "-vv") + (format #t "test suite not run~%")) + #t))))) (native-inputs `(("python-pretend" ,python-pretend) ("python-pytest" ,python-pytest))) @@ -13125,7 +13181,10 @@ information.") ;; licenses. (license (list license:asl2.0 license:bsd-2)))) -;; A variant with minimal dependencies, for bootstrapping Pytest. +(define-public python2-packaging + (package-with-python2 python-packaging)) + +;; Variants with minimal dependencies, for bootstrapping Pytest. (define-public python-packaging-bootstrap (hidden-package (package/inherit @@ -13136,8 +13195,17 @@ information.") `(("python-pyparsing" ,python-pyparsing))) (arguments '(#:tests? #f))))) -(define-public python2-packaging - (package-with-python2 python-packaging)) +(define-public python2-packaging-bootstrap + (hidden-package + (package/inherit + python2-packaging + (name "python2-packaging-bootstrap") + (native-inputs '()) + (propagated-inputs + `(("python-pyparsing" ,python2-pyparsing))) + (arguments + `(#:tests? #f + ,@(package-arguments python2-packaging)))))) (define-public python-relatorio (package -- cgit v1.2.3 From 0e648e616094b20ffc3b296a27fb01e3085acf38 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 08:31:39 +0100 Subject: gnu: python-mako: Do not use pytest nose compatibility layer. * gnu/packages/python-xyz.scm (python-mako)[native-inputs]: Replace PYTHON-PYTEST with PYTHON-NOSE. [arguments]: Adjust check phase accordingly. While at it, allow overriding the #:tests? key. --- gnu/packages/python-xyz.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 12faca73eb..1de855f617 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8990,13 +8990,16 @@ python-xdo for newer bindings.)") (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest" "-vv")))))) + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "nosetests" "-v") + (format #t "test suite not run~%")) + #t))))) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) (native-inputs `(("python-mock" ,python-mock) - ("python-pytest" ,python-pytest))) + ("python-nose" ,python-nose))) (home-page "https://www.makotemplates.org/") (synopsis "Templating language for Python") (description "Mako is a templating language for Python that compiles -- cgit v1.2.3 From cc63d8cfd859a2ddc6018d8eac056203dc255c48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 09:29:10 +0100 Subject: gnu: python-pytest-cov: Update to 2.8.1. * gnu/packages/check.scm (python-pytest-cov): Update to 2.8.1. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 941b4547b6..12c56d4a3e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -885,13 +885,13 @@ and many external plugins.") (define-public python-pytest-cov (package (name "python-pytest-cov") - (version "2.6.1") + (version "2.8.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest-cov" version)) (sha256 - (base32 "0cyxbbghx2l4p60w10k00j1j74q1ngfiffr0pxn73ababjr69dha")))) + (base32 "0avzlk9p4nc44k7lpx9109dybq71xqnggxb9f4hp0l64pbc44ryc")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 9ba3cf5782f85e8d0528f9e445aad4c5fd0241a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 09:13:12 +0100 Subject: gnu: python-pycairo: Update to 1.18.2. * gnu/packages/gtk.scm (python-pycairo): Update to 1.18.2. (python2-pycairo)[propagated-inputs]: Remove. --- gnu/packages/gtk.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 55269438d0..d8aeb156fb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1278,7 +1278,7 @@ printing and other features typical of a source code editor.") (define-public python-pycairo (package (name "python-pycairo") - (version "1.17.1") + (version "1.18.2") (source (origin (method url-fetch) @@ -1286,7 +1286,7 @@ printing and other features typical of a source code editor.") version "/pycairo-" version ".tar.gz")) (sha256 (base32 - "165n0g7gp2a0qi8558snvfans17x83jv2lv7bx4vr1rxjbn3a2hg")))) + "0cb5n4r4nl0k1g90b1gz9iyk4lp7hi03db98i1p52a870bym7f6w")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1305,9 +1305,6 @@ printing and other features typical of a source code editor.") (strip-python2-variant python-pycairo)))) (package (inherit pycairo) - (propagated-inputs - `(("python2-funcsigs" ,python2-funcsigs) - ,@(package-propagated-inputs pycairo))) ;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1 (license (list license:lgpl2.1 license:mpl1.1))))) -- cgit v1.2.3 From cc9c83c55d23cc5fca1f4642258bcf78d4b1f943 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 09:26:09 +0100 Subject: gnu: python-pygobject: Update to 3.34.0. * gnu/packages/glib.scm (python-pygobject): Update to 3.34.0. [source](modules, snippet): New fields. Delete failing tests identified by commit 622d702f7eba3. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Remove. [native-inputs]: Remove WHICH and DBUS. (python2-pygobject)[build-system]: Change to PYTHON-BUILD-SYSTEM. [arguments]: New field. Copy old phase from python-pygobject. [native-inputs]: Remove WHICH and DBUS. (python-pygobject-3.34.0): Remove variable. --- gnu/packages/glib.scm | 84 ++++++++++++++++++++------------------------------ gnu/packages/gnome.scm | 2 +- 2 files changed, 34 insertions(+), 52 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 08c7811809..e6f1cf819f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Giacomo Leidi -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -692,7 +692,7 @@ useful for C++.") (define-public python-pygobject (package (name "python-pygobject") - (version "3.28.3") + (version "3.34.0") (source (origin (method url-fetch) @@ -701,24 +701,20 @@ useful for C++.") "/pygobject-" version ".tar.xz")) (sha256 (base32 - "1c6h3brzlyvzbpdsammnd957azmp6cbzqrd65r400vnh2l8f5lrx")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-broken-tests - (lambda _ - ;; FIXME: this test freezes and times out. - (delete-file "tests/test_mainloop.py") - ;; FIXME: this test fails with this kind of error: - ;; AssertionError: != != Date: Thu, 16 Jan 2020 17:05:56 +0100 Subject: gnu: python-dateutil: Add missing input. * gnu/packages/time.scm (python-dateutil)[native-inputs]: Add PYTHON-PYTEST-COV. --- gnu/packages/time.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 0ec9a102a5..cd0d8794d1 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -190,6 +190,7 @@ Pendulum instances.") (invoke "pytest" "-vv")))))) (native-inputs `(("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) ("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs `(("python-six" ,python-six))) -- cgit v1.2.3 From 4255efda3df0d310e00f31666d9e5174cd6f9398 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 17:06:22 +0100 Subject: gnu: python-dateutil: Update to 2.8.1. * gnu/packages/time.scm (python-dateutil): Update to 2.8.1. --- gnu/packages/time.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index cd0d8794d1..63227d7bf5 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -166,14 +166,14 @@ Pendulum instances.") (define-public python-dateutil (package (name "python-dateutil") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) (uri (pypi-uri "python-dateutil" version)) (sha256 (base32 - "17nsfhy4xdz1khrfxa61vd7pmvd5z0wa3zb6v4gb4kfnykv0b668")))) + "0g42w7k5007iv9dam6gnja2ry8ydwirh99mgdll35s12pyfzxsvk")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 403b533fde0d34bd2cb961abe1abbcb17ddf6045 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 18:00:25 +0100 Subject: gnu: libimobiledevice: Fix build with Python 3.8. * gnu/packages/libusb.scm (%libimobiledevice-patches): New variable. (libimobiledevice)[source](patches): New field. [arguments]: Remove #:configure-flags. Add #:phases. [native-inputs]: Add AUTOCONF and AUTOMAKE. --- gnu/packages/libusb.scm | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index abf11400e3..1a677a0fb9 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Jonathan Brielmaier ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Vagrant Cascadian +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -364,6 +365,25 @@ connections from and to iOS devices by connecting to a socket provided by a @code{usbmuxd} daemon.") (license license:lgpl2.1+))) +;; These patches are needed to build with Python 3.8. +(define %libimobiledevice-patches + (list (origin + (method url-fetch) + (uri (string-append "https://github.com/libimobiledevice/libimobiledevice" + "/commit/1ff3448d2e27f1bac8d2f0af8b8e952854860278.patch")) + (file-name "libimobiledevice-python-config.patch") + (sha256 + (base32 + "1mkwhp8vvhajij29jk3w4rkgcfh8d8waf908drh3076k70hb6i8y"))) + (origin + (method url-fetch) + (uri (string-append "https://github.com/libimobiledevice/libimobiledevice" + "/commit/eea4f1be9107c8ab621fd71460e47d0d38e55d71.patch")) + (file-name "libimobiledevice-python-3.8-compat.patch") + (sha256 + (base32 + "1zz8v7kgwyq5ck1qp03l29pcmljygnjwls9d6q28nv5pkwa6848w"))))) + (define-public libimobiledevice (package (name "libimobiledevice") @@ -372,17 +392,19 @@ connections from and to iOS devices by connecting to a socket provided by a (method url-fetch) (uri (string-append "https://www.libimobiledevice.org/downloads/" "libimobiledevice-" version ".tar.bz2")) + ;; Note: Remove the 'force-bootstrap' phase and the autoconf + ;; inputs below when removing these patches. + (patches %libimobiledevice-patches) (sha256 (base32 "0dqhy4qwj30mw8pwckvjmgnj1qqrh6p8c6jknmhvylshhzh0ssvq")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list (string-append "PYTHON_LDFLAGS=-L" - (assoc-ref %build-inputs "python") - "/lib -lpython" - ,(version-major+minor (package-version python)) - "m")))) + `(#:phases (modify-phases %standard-phases + (add-before 'bootstrap 'force-bootstrap + (lambda _ + (delete-file "configure") + #t))))) (propagated-inputs `(("openssl" ,openssl-1.0) ("libplist" ,libplist) @@ -392,6 +414,10 @@ connections from and to iOS devices by connecting to a socket provided by a (native-inputs `(("pkg-config" ,pkg-config) ("python-cython" ,python-cython) + + ;; These are required because we patch and bootstrap the build system. + ("autoconf" ,autoconf) + ("automake" ,automake) ("libtool" ,libtool))) (home-page "https://www.libimobiledevice.org/") (synopsis "Protocol library and tools to communicate with Apple devices") -- cgit v1.2.3 From bf2522863c420f241b312a6c1282cdca4b2816a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 18:14:00 +0100 Subject: gnu: network-manager: Fix build with Python 3.8. * gnu/packages/gnome.scm (network-manager)[arguments]: Set "NM_TEST_REGENERATE" before running the tests. --- gnu/packages/gnome.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 459d64b731..0ec3bf60fd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6481,6 +6481,10 @@ users.") (lambda _ ;; For the missing /etc/machine-id. (setenv "DBUS_FATAL_WARNINGS" "0") + + ;; XXX: Regenerate some of the tests that are dependent on Python version. + ;; Try removing this variable for newer versions of NetworkManager. + (setenv "NM_TEST_REGENERATE" "1") #t)) (replace 'install (lambda _ -- cgit v1.2.3 From 96af5dcf917853e40c6b17a2969fb44c161e096c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Jan 2020 08:01:41 +0100 Subject: gnu: python-freezegun: Update to 0.3.13. * gnu/packages/check.scm (python-freezegun): Update to 0.3.13. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 12c56d4a3e..5da3fdb5fd 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2219,13 +2219,13 @@ create data based on random numbers and yet remain repeatable.") (define-public python-freezegun (package (name "python-freezegun") - (version "0.3.12") + (version "0.3.13") (source (origin (method url-fetch) (uri (pypi-uri "freezegun" version)) (sha256 - (base32 "1rx57v8ryjncjimg8hys9kx1r3rknvwcl4y340g20jn0sf69qk9a")))) + (base32 "07lrb8ghng1y1jr278clvgi17dq1470gbr2lvbvwys6jkdg9c9b1")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) -- cgit v1.2.3 From 41fdad9f8c48a674d758c9835ab8640a9192a1a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Jan 2020 08:03:29 +0100 Subject: gnu: python-cffi: Update to 1.13.2. * gnu/packages/patches/python-cffi-x87-stack-clean.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/libffi.scm (python-cffi): Update to 1.13.2. [arguments]: Adjust substitution. Remove obsolete phase. --- gnu/local.mk | 1 - gnu/packages/libffi.scm | 16 +++--------- .../patches/python-cffi-x87-stack-clean.patch | 29 ---------------------- 3 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 gnu/packages/patches/python-cffi-x87-stack-clean.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4f1385d73b..88ce141c13 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1312,7 +1312,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-cross-compile.patch \ - %D%/packages/patches/python-cffi-x87-stack-clean.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 52654ddf3f..b0098389c0 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -76,14 +76,13 @@ conversions for values passed between the two languages.") (define-public python-cffi (package (name "python-cffi") - (version "1.11.5") + (version "1.13.2") (source (origin (method url-fetch) (uri (pypi-uri "cffi" version)) (sha256 - (base32 "1x3lrj928dcxx1k8k9gf3s4s3jwvzv8mc3kkyg1g7c3a1sc1f3z9")) - (patches (search-patches "python-cffi-x87-stack-clean.patch")))) + (base32 "0iikq5rn9a405n94c7s2j6kq3jv5qs9q4xyik8657b2py27ix6jr")))) (build-system python-build-system) (inputs `(("libffi" ,libffi))) @@ -116,7 +115,7 @@ conversions for values passed between the two languages.") "compiler_so='gcc',linker_exe='gcc'," "linker_so='gcc -shared')"))) (substitute* "testing/cffi0/test_ownlib.py" - (("'cc testownlib") "'gcc testownlib")) + (("\"cc testownlib") "\"gcc testownlib")) (invoke "py.test" "-v" "c/" "testing/") #t)) (add-before 'check 'patch-paths-of-dynamically-loaded-libraries @@ -142,14 +141,7 @@ conversions for values passed between the two languages.") (substitute* "c/test_c.py" (("find_and_load_library\\(['\"]{1}c['\"]{1}") (format #f "find_and_load_library('~a'" libc))) - #t))) - (add-before 'check 'disable-failing-test - ;; This is assumed to be a libffi issue: - ;; https://bitbucket.org/cffi/cffi/issues/312/tests-failed-with-armv8 - (lambda _ - (substitute* "testing/cffi0/test_ownlib.py" - (("ret.left") "ownlib.left")) - #t))))) + #t)))))) (home-page "https://cffi.readthedocs.io/") (synopsis "Foreign function interface for Python") (description "Foreign Function Interface for Python calling C code.") diff --git a/gnu/packages/patches/python-cffi-x87-stack-clean.patch b/gnu/packages/patches/python-cffi-x87-stack-clean.patch deleted file mode 100644 index 50243505ee..0000000000 --- a/gnu/packages/patches/python-cffi-x87-stack-clean.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix test that fails on i686: - -https://bitbucket.org/cffi/cffi/issues/382 - -This is a squashed version of these commits: -https://bitbucket.org/cffi/cffi/commits/ef09637b2314 -https://bitbucket.org/cffi/cffi/commits/7a76a3815340 - -diff -r 99940f1f5402 testing/cffi0/test_function.py ---- a/testing/cffi0/test_function.py Tue Feb 27 21:18:33 2018 +0100 -+++ b/testing/cffi0/test_function.py Sun Nov 11 16:26:23 2018 +0100 -@@ -45,14 +45,14 @@ - assert x != math.sin(1.23) # rounding effects - assert abs(x - math.sin(1.23)) < 1E-6 - -- def test_sin_no_return_value(self): -+ def test_lround_no_return_value(self): - # check that 'void'-returning functions work too - ffi = FFI(backend=self.Backend()) - ffi.cdef(""" -- void sin(double x); -+ void lround(double x); - """) - m = ffi.dlopen(lib_m) -- x = m.sin(1.23) -+ x = m.lround(1.23) - assert x is None - - def test_dlopen_filename(self): -- cgit v1.2.3 From 9a4990064f4707d18f0b17962e9438d75968839e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 18:07:48 +0100 Subject: gnu: python-six: Update to 1.14.0. * gnu/packages/python-xyz.scm (python-six): Update to 1.14.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1de855f617..15f8fb24de 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1091,14 +1091,14 @@ from the Python interpreter, or as a small part of a larger application.") (define-public python-six (package (name "python-six") - (version "1.13.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (pypi-uri "six" version)) (sha256 (base32 - "0rkby0kxlxj0kk2m6q5mh73ka5rk608p886vnv57h9cbkqki1xih")))) + "02lw67hprv57hyg3cfy02y3ixjk3nzwc0dx3c4ynlvkfwkfdnsr3")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From e0a5693533f343423527f6fc79d398e4e4c6d730 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 00:03:47 +0100 Subject: gnu: python-hypothesis: Update to 5.3.0. * gnu/packages/check.scm (python-hypothesis): Update to 5.3.0. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5da3fdb5fd..8025ea1979 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1658,13 +1658,13 @@ instantly.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "5.1.5") + (version "5.3.0") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "1ady8cjwpwsicpkhpjd6qwnipjr1lf488sv23psksbxsbgffg7sz")))) + "0aclww914la1s41jkjla10pm0qh88dpdv9x1riyqw7xzwczvbzf9")))) (build-system python-build-system) (arguments ;; XXX: Tests are not distributed with the PyPI archive. -- cgit v1.2.3 From 0075e2e2655c9fa1f2b4a3e696199d79fde2c901 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 00:04:00 +0100 Subject: gnu: python-setuptools-scm: Update to 3.4.3. * gnu/packages/python-xyz.scm (python-setuptools-scm): Update to 3.4.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 15f8fb24de..6cf6cb3aeb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4929,13 +4929,13 @@ child application and control it as if a human were typing commands.") (define-public python-setuptools-scm (package (name "python-setuptools-scm") - (version "3.3.3") + (version "3.4.3") (source (origin (method url-fetch) (uri (pypi-uri "setuptools_scm" version)) (sha256 (base32 - "19cyndx23xmpbhz4qrwmfwsmnnaczd0dw7qg977ksq2dbvxy29dx")))) + "083k93wi7mrmp1cn28hcbnr6sivbgls0y7zz2m5qzn1wg04a3f16")))) (build-system python-build-system) (home-page "https://github.com/pypa/setuptools_scm/") (synopsis "Manage Python package versions in SCM metadata") -- cgit v1.2.3 From a5670bd45a97585e17e974bc689aeeb8ef14d66e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 00:06:22 +0100 Subject: gnu: python-pycairo: Update to 1.19.0. * gnu/packages/gtk.scm (python-pycairo): Update to 1.19.0. (python2-pycairo): Stick with 1.18.2. --- gnu/packages/gtk.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d8aeb156fb..02f00f4a92 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1278,7 +1278,7 @@ printing and other features typical of a source code editor.") (define-public python-pycairo (package (name "python-pycairo") - (version "1.18.2") + (version "1.19.0") (source (origin (method url-fetch) @@ -1286,7 +1286,7 @@ printing and other features typical of a source code editor.") version "/pycairo-" version ".tar.gz")) (sha256 (base32 - "0cb5n4r4nl0k1g90b1gz9iyk4lp7hi03db98i1p52a870bym7f6w")))) + "176i283glkpycka8wwyndwld0zp1yn9xj9rpvllqgja698vsjnsg")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1300,11 +1300,21 @@ printing and other features typical of a source code editor.") (license license:lgpl3+) (properties `((python2-variant . ,(delay python2-pycairo)))))) +;; Pycairo no longer supports Python 2 since version 1.19.0, so we stick +;; with this older version here. (define-public python2-pycairo (let ((pycairo (package-with-python2 (strip-python2-variant python-pycairo)))) (package (inherit pycairo) + (version "1.18.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/pygobject/pycairo/releases" + "/download/v" version "/pycairo-" version ".tar.gz")) + (sha256 + (base32 + "0cb5n4r4nl0k1g90b1gz9iyk4lp7hi03db98i1p52a870bym7f6w")))) ;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1 (license (list license:lgpl2.1 license:mpl1.1))))) -- cgit v1.2.3 From 0eb2ce12c03d8608b8cace51132ef72c16d36ef2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 00:07:28 +0100 Subject: gnu: python-freezegun: Update to 0.3.14. * gnu/packages/check.scm (python-freezegun): Update to 0.3.14. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8025ea1979..b58349fb2e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2219,13 +2219,13 @@ create data based on random numbers and yet remain repeatable.") (define-public python-freezegun (package (name "python-freezegun") - (version "0.3.13") + (version "0.3.14") (source (origin (method url-fetch) (uri (pypi-uri "freezegun" version)) (sha256 - (base32 "07lrb8ghng1y1jr278clvgi17dq1470gbr2lvbvwys6jkdg9c9b1")))) + (base32 "0al75mk829j1izxi760b7yjnknjihyfhp2mvi5qiyrxb9cpxwqk2")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) -- cgit v1.2.3 From 861a265959ca931bab38fe6c1266de8849016820 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 00:13:10 +0100 Subject: gnu: python-pytest-runner: Update to 5.2. * gnu/packages/check.scm (python-pytest-runner): Update to 5.2. [arguments]: New field. [native-inputs]: Remove PYTHON-PYTEST-BOOTSTRAP. --- gnu/packages/check.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b58349fb2e..19147e1afd 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -920,18 +920,28 @@ supports coverage of subprocesses.") (define-public python-pytest-runner (package (name "python-pytest-runner") - (version "4.4") + (version "5.2") (source (origin (method url-fetch) (uri (pypi-uri "pytest-runner" version)) (sha256 (base32 - "1x0d9n40lsiphblbs61rdc0d5r31f6vh0vcahqdv0mffakbnrb80")))) + "0awll1bva5zy8cspsxcpv7pjcrdf5c6pf56nqn4f74vvmlzfgiwn")))) (build-system python-build-system) + (arguments + '(;; FIXME: The test suite requires 'python-flake8' and 'python-black', + ;; but that introduces a circular dependency. + #:tests? #f + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "pytest" "-vv") + (format #t "test suite not run~%")) + #t))))) (native-inputs - `(("python-pytest" ,python-pytest-bootstrap) - ("python-setuptools-scm" ,python-setuptools-scm))) + `(("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://github.com/pytest-dev/pytest-runner") (synopsis "Invoke py.test as a distutils command") (description -- cgit v1.2.3 From 64d47f5043b1996ef398b9aaceac53795a1960b7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 00:13:26 +0100 Subject: gnu: python-fonttools: Update to 4.2.4. * gnu/packages/python-xyz.scm (python-fonttools): Update to 4.2.4. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6cf6cb3aeb..a9b75db2da 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6849,13 +6849,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "4.2.2") + (version "4.2.4") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "012qqspnwdl4vy8qgzzpfglkk5dgzxiw0fak2jq74ngygvz3vfv6")))) + "0rz2fn707x8ri507bb5k5y3di851dwchn0886f77g5bgiflmnpwm")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.2.3 From 0830b2f4aaed3630ba266a7bcc92083ff04d5bed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 17:16:21 +0100 Subject: gnu: libuv: Update to 1.34.2. * gnu/packages/libevent.scm (libuv): Update to 1.34.2. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 72bbddea00..4a0dc052d8 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -101,14 +101,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.34.1") + (version "1.34.2") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1kwgl7j9snmjicrszhynfyp4njckqaw6l90y71a0b0alp2m8asbn")))) + "0inzk8qpw78im3fiazrc54qi1gcapbs8dhf0hk3kwpzg0i2kpnb5")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static") -- cgit v1.2.3 From f69a22accfe95860f04186ba6fcd997c19d381f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 17:16:53 +0100 Subject: gnu: util-linux: Update to 2.35. * gnu/packages/linux.scm (util-linux): Update to 2.35. [arguments]: Add substitution to fix test locale. --- gnu/packages/linux.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3be93e77dc..569ba34aa4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1096,7 +1096,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.34") + (version "2.35") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -1104,7 +1104,7 @@ providing the system administrator with some help in common tasks.") "util-linux-" version ".tar.xz")) (sha256 (base32 - "1db2kydkwjmvgd1glkcba3adhidxw0f1x735dcjdpdjjf869sgvl")) + "1jg2vywxi9m2h0f2pz0a7a9afvv1j5726dg0cwryrhb809b1n25k")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet @@ -1160,6 +1160,10 @@ providing the system administrator with some help in common tasks.") (substitute* "tests/ts/misc/mcookie" (("/etc/services") (string-append net "/etc/services"))) + + ;; The C.UTF-8 locale does not exist in our libc. + (substitute* "tests/ts/column/invalid-multibyte" + (("C\\.UTF-8") "en_US.utf8")) #t))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 0d775f987c36309299202e43cfa9d04f64f6a52d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 17:17:53 +0100 Subject: gnu: sqlite: Update to 3.31.0. * gnu/packages/sqlite.scm (sqlite): Update to 3.31.0. --- gnu/packages/sqlite.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 445c1606cf..80807d5d12 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,7 +46,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.30.1") + (version "3.31.0") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -58,11 +58,11 @@ (map (cut string-pad <> 2 #\0) other-digits)) 6 #\0)))))) - (string-append "https://sqlite.org/2019/sqlite-autoconf-" + (string-append "https://sqlite.org/2020/sqlite-autoconf-" numeric-version ".tar.gz"))) (sha256 (base32 - "0q4f57a5995wz9c7dfiqy9zwl0kn0b900nxwinqa3llv13dm0nlc")))) + "1w7i954349sjd5a6rvy118prra43k07y9hy8rpajs6vmjmnnx7bw")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (outputs '("out" "static")) -- cgit v1.2.3 From 6abfe6f525a46db5d5b9b227ca45398ec68b79b2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 17:18:27 +0100 Subject: gnu: pciutils: Update to 3.6.3. * gnu/packages/pciutils.scm (pciutils): Update to 3.6.3. --- gnu/packages/pciutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 18d7c1e56c..5f49bb3400 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -33,7 +33,7 @@ (define-public pciutils (package (name "pciutils") - (version "3.6.2") + (version "3.6.3") (source (origin (method url-fetch) (uri (string-append @@ -41,7 +41,7 @@ version ".tar.xz")) (sha256 (base32 - "1wwkpglvvr1sdj2gxz9khq507y02c4px48njy25divzdhv4jwifv")))) + "1ssjdd91q0w3xlc40y5f2zhfhck3rpajs1902hajas5ir20qvdy5")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 89dc00cc2a4e367e6237b1c9233b5d2f5ff70210 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 17:18:47 +0100 Subject: gnu: meson: Update to 0.53.1. * gnu/packages/build-tools.scm (meson): Update to 0.53.1. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 006b0c48f2..cfbcc0f318 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -168,7 +168,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.53.0") + (version "0.53.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -176,7 +176,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "1xnkm4q9gk71nsdmrrmq7rv7lffgcif86awhpyg6rymn7acpaph3")))) + "011v84ijdnmbdgpzslaa6qiq7p2jh52sqzb0q6iaq6vhx8za66zc")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From d040e650b2bfeb4ba25912f68f828b675c6b0464 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 17:19:06 +0100 Subject: gnu: bison: Update to 3.5.1. * gnu/packages/bison.scm (bison): Update to 3.5.1. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index eae8673edc..92ab80e9bf 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -31,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.5") + (version "3.5.1") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "0hd6lgkxb9i46alcwn87jygs53q4vkq7k0jzb84ikbdln4is1r2m")))) + "1l2d59xwlkmmm6vsskw6vsrk75ql9fvld57681g2v6khv5xhjziy")))) (build-system gnu-build-system) (arguments '(;; Building in parallel on many-core systems may cause an error such as -- cgit v1.2.3 From 5fcc5b38ed309ded75e52f54dc14b371f3a6bc96 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 17:54:58 +0100 Subject: gnu: qmapshack: Remove sqlite-with-column-metadata workaround. * gnu/packages/geo.scm (qmapshack)[arguments]: Do not set LD_LIBRARY_PATH in wrapper scripts. --- gnu/packages/geo.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index b5b6d9114e..5f9037a89f 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1431,23 +1431,15 @@ using the dataset of topographical information collected by (invoke "patch" "-p1" "-i" "FindQuaZip5.patch") #t)) (add-after 'install 'wrap - ;; The program fails to run with the error: - ;; undefined symbol: sqlite3_column_table_name16 - ;; Forcing the program to use sqlite-with-column-metadata instead - ;; of sqlite using LD_LIBRARY_PATH solves the problem. - ;; - ;; The program also fails to find the QtWebEngineProcess program, + ;; The program fails to find the QtWebEngineProcess program, ;; so we set QTWEBENGINEPROCESS_PATH to help it. (lambda* (#:key inputs outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin")) (qtwebengineprocess (string-append (assoc-ref inputs "qtwebengine") - "/lib/qt5/libexec/QtWebEngineProcess")) - (sqlite-lib (string-append (assoc-ref inputs "sqlite") - "/lib"))) + "/lib/qt5/libexec/QtWebEngineProcess"))) (for-each (lambda (program) (wrap-program program - `("LD_LIBRARY_PATH" ":" prefix (,sqlite-lib)) `("QTWEBENGINEPROCESS_PATH" = (,qtwebengineprocess)))) (find-files bin ".*"))) -- cgit v1.2.3 From 8c81210ed0422522627f87f43f404e38c8bea8cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jan 2020 18:49:10 +0100 Subject: gnu: python2-pygtk: Build with pango@1.42. * gnu/packages/gtk.scm (python2-pygtk)[inputs]: Add PANGO-1.42. --- gnu/packages/gtk.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 02f00f4a92..bc396a28f5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1338,6 +1338,11 @@ printing and other features typical of a source code editor.") `(("pkg-config" ,pkg-config))) (inputs `(("python" ,python-2) + + ;; XXX: The package fails to build with the latest Pango (propagated + ;; from GTK+2), so we provide it with this older version. + ("pango" ,pango-1.42) + ("libglade" ,libglade) ("glib" ,glib))) (propagated-inputs -- cgit v1.2.3 From fa8e0a5387419ba1edd17722329cdb27b1371ccf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Jan 2020 12:50:57 +0100 Subject: gnu: cmake: Build an optimized executable. * gnu/packages/cmake.scm (cmake-bootstrap)[arguments]: Pass "-DCMAKE_BUILD_TYPE" in #:configure-flags. --- gnu/packages/cmake.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index cf542f12e4..913317b25f 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -97,7 +97,11 @@ ;; to --mandir and --docdir. "--mandir=share/man" ,(string-append "--docdir=share/doc/cmake-" - (version-major+minor version)))) + (version-major+minor version)) + + ;; By default CMake is built without any optimizations. Use + ;; the recommended Release target for a ~2.5x speedup. + "--" "-DCMAKE_BUILD_TYPE=Release")) #:make-flags (let ((skipped-tests (list "BundleUtilities" ; This test fails on Guix. -- cgit v1.2.3 From 7c1ea9316a3fd4212c08f8c3767dbd654d5136c6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Jan 2020 14:19:14 +0100 Subject: gnu: cmake-minimal-bootstrap: Rename to cmake-bootstrap. ...and change the inheritance order while at it, to prepare for the next commit. * gnu/packages/cmake.scm (cmake-minimal): Rename to ... (cmake-bootstrap): ... this. [name]: Set to "cmake-bootstrap". [native-inputs]: Change from CURL to CURL-MINIMAL. (cmake-minimal-bootstrap): Remove variable. (cmake-minimal): New variable, inherits from CMAKE-BOOTSTRAP. * gnu/packages/image.scm (libjpeg-turbo)[arguments]: Change from CMAKE-MINIMAL-BOOTSTRAP to CMAKE-BOOTSTRAP. --- gnu/packages/cmake.scm | 35 ++++++++++++++++++----------------- gnu/packages/image.scm | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 913317b25f..252ea1b065 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -47,11 +47,11 @@ #:use-module (gnu packages xml) #:use-module (srfi srfi-1)) -;;; This minimal variant of CMake does not include the documentation. It is -;;; used by the cmake-build-system. -(define-public cmake-minimal +;;; The "bootstrap" CMake. It is used to build the inputs of 'cmake-minimal' +;;; below, to prevent a cyclic dependency on cmake-build-system. +(define-public cmake-bootstrap (package - (name "cmake-minimal") + (name "cmake-bootstrap") (version "3.16.3") (source (origin (method url-fetch) @@ -156,7 +156,9 @@ (apply invoke "./configure" configure-flags)))))) (native-inputs `(("bzip2" ,bzip2) - ("curl" ,curl) + ;; cURL depends on ghostscript (via groff and OpenLDAP), which depends on + ;; 'cmake-build-system' through libtiff and ultimately libjpeg-turbo. + ("curl" ,curl-minimal) ("expat" ,expat) ("file" ,file) ("libarchive" ,libarchive) @@ -194,6 +196,17 @@ and workspaces that can be used in the compiler environment of your choice.") license:expat ; cmjsoncpp is dual MIT/public domain license:public-domain)))) ; cmlibarchive/archive_getdate.c +;;; This minimal variant of CMake does not include the documentation. It is +;;; used by the cmake-build-system. +(define-public cmake-minimal + (package + (inherit cmake-bootstrap) + (name "cmake-minimal") + (native-inputs + `(("curl" ,curl) + ,@(alist-delete "curl" (package-native-inputs cmake-bootstrap)))))) + +;;; The "user-facing" CMake, now with manuals and HTML documentation. (define-public cmake (package (inherit cmake-minimal) @@ -236,18 +249,6 @@ and workspaces that can be used in the compiler environment of your choice.") (search-paths (package-native-search-paths cmake-minimal)))) -;; The purpose of this package is to solve a circular dependency between -;; packages that use cmake-build-system and CMakes own dependencies. -(define-public cmake-minimal-bootstrap - (package - (inherit cmake-minimal) - (name "cmake-minimal-bootstrap") - (native-inputs - `(;; cURL depends on ghostscript (via groff and OpenLDAP), which depends on - ;; 'cmake-build-system' through libtiff and ultimately libjpeg-turbo. - ("curl" ,curl-minimal) - ,@(alist-delete "curl" (package-native-inputs cmake-minimal)))))) - (define-public emacs-cmake-mode (package (inherit cmake) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 1b86f700e4..ebb30742a4 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1512,7 +1512,7 @@ is hereby granted.")))) '() ;; Use a special "bootstrap" CMake for the native build to work ;; around a circular dependency between CMake and this package. - `(#:cmake ,cmake-minimal-bootstrap)))) + `(#:cmake ,cmake-bootstrap)))) (home-page "https://libjpeg-turbo.org/") (synopsis "SIMD-accelerated JPEG image handling library") (description "libjpeg-turbo is a JPEG image codec that accelerates baseline -- cgit v1.2.3 From b5fc075d01d76eafde4d297b146ae43f08e2f347 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Jan 2020 14:21:03 +0100 Subject: gnu: cmake-minimal: Remove bundled jsoncpp. * gnu/packages/cmake.scm (cmake-minimal)[source](snippet): New field. Purge bundled jsoncpp. [inputs]: Add JSONCPP. [arguments]: Adjust accordingly. * gnu/packages/serialization.scm (jsoncpp)[arguments]: For native builds, use CMAKE-BOOTSTRAP. --- gnu/packages/cmake.scm | 19 ++++++++++++++++--- gnu/packages/serialization.scm | 6 +++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 252ea1b065..ce9769981b 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -42,9 +42,11 @@ #:use-module (gnu packages file) #:use-module (gnu packages libevent) #:use-module (gnu packages ncurses) + #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages xml) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) ;;; The "bootstrap" CMake. It is used to build the inputs of 'cmake-minimal' @@ -71,7 +73,6 @@ ;; "cmcompress" "cmcurl" "cmexpat" - ;; "cmjsoncpp" ;; "cmlibarchive" "cmliblzma" ;; "cmlibuv" @@ -88,7 +89,7 @@ (string-append "--parallel=" parallel-job-count) (string-append "--prefix=" out) "--system-libs" - "--no-system-jsoncpp" ; FIXME: Circular dependency. + "--no-system-jsoncpp" ;; By default, the man pages and other docs land ;; in PREFIX/man and PREFIX/doc, but we want them ;; in share/{man,doc}. Note that unlike @@ -202,9 +203,21 @@ and workspaces that can be used in the compiler environment of your choice.") (package (inherit cmake-bootstrap) (name "cmake-minimal") + (source (origin + (inherit (package-source cmake-bootstrap)) + (snippet + (match (origin-snippet (package-source cmake-bootstrap)) + ((begin exp ...) + (append '(begin (delete-file-recursively "Utilities/cmjsoncpp")) + exp)))))) (native-inputs `(("curl" ,curl) - ,@(alist-delete "curl" (package-native-inputs cmake-bootstrap)))))) + ("jsoncpp" ,jsoncpp) + ,@(alist-delete "curl" (package-native-inputs cmake-bootstrap)))) + (arguments + (substitute-keyword-arguments (package-arguments cmake-bootstrap) + ((#:configure-flags flags ''()) + `(delete "--no-system-jsoncpp" ,flags)))))) ;;; The "user-facing" CMake, now with manuals and HTML documentation. (define-public cmake diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 72cc70e3c4..0b3eb7ecaa 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cmake) #:use-module (gnu packages cpp) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) @@ -296,7 +297,10 @@ that implements both the msgpack and msgpack-rpc specifications.") "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES"))) + `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES") + ,@(if (%current-target-system) + '() + `(#:cmake ,cmake-bootstrap)))) (synopsis "C++ library for interacting with JSON") (description "JsonCpp is a C++ library that allows manipulating JSON values, including serialization and deserialization to and from strings. It can also -- cgit v1.2.3 From ed24dda76d07f6d714effbc4ff692a4bce62a60e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Jan 2020 14:44:53 +0100 Subject: gnu: CMake: Remove most bundled libraries. * gnu/packages/cmake.scm (cmake-bootstrap)[source](modules): Add (ice-9 ftw). [source](snippet): Change to a whitelist approach, keeping "jsoncpp" and "libuv". [arguments]: Add phase "use-system-libarchive". Remove substitution of deleted file. [native-inputs]: Add (PACKAGE-SOURCE LIBARCHIVE) [license]: Remove LICENSE:BSD-4 and LICENSE:BSD-2. --- gnu/packages/cmake.scm | 57 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index ce9769981b..c1b4d5de04 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -63,21 +63,34 @@ (sha256 (base32 "0s06wrp0jnw2l4yq94skj53hwnz7lqrmhh96sq7w7njkkggickz5")) - (modules '((guix build utils))) + (modules '((guix build utils) + (ice-9 ftw))) (snippet '(begin - ;; Drop bundled software. (with-directory-excursion "Utilities" + ;; CMake bundles its dependencies below "Utilities" with a + ;; "cm" prefix in the directory name. Delete those to ensure + ;; the system libraries are used. (for-each delete-file-recursively - '("cmbzip2" - ;; "cmcompress" - "cmcurl" - "cmexpat" - ;; "cmlibarchive" - "cmliblzma" - ;; "cmlibuv" - "cmzlib")) - #t))) + (scandir + "." + (lambda (file) + (and (string-prefix? "cm" file) + (eq? 'directory (stat:type (stat file))) + + ;; jsoncpp must be kept around for now to + ;; work around a circular dependency. It + ;; gets deleted once we reach "cmake-minimal". + ;; TODO: Consider building jsoncpp with + ;; Meson instead, once meson-build-system + ;; learns cross-compilation. + (not (string=? "cmjsoncpp" file)) + + ;; XXX: cmake's bootstrap script appears to + ;; rquire libuv, even though it detects and + ;; uses the system version eventually. + (not (string=? "cmlibuv" file))))))) + #t)) (patches (search-patches "cmake-curl-certificates.patch")))) (build-system gnu-build-system) (arguments @@ -127,6 +140,24 @@ (substitute* "Auxiliary/CMakeLists.txt" ((".*cmake-mode.el.*") "")) #t)) + (add-after 'unpack 'use-system-libarchive + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((libarchive-source (assoc-ref (or native-inputs inputs) + "libarchive:source")) + (libarchive-version ,(package-version libarchive)) + (files-to-unpack '("libarchive/archive_getdate.c" + "libarchive/archive_getdate.h"))) + ;; XXX: Source/cm_get_date.c includes archive_getdate.c wholesale, + ;; so it needs to be available along with the header file. + (mkdir-p "Utilities/cmlibarchive") + (apply invoke "tar" "-xvf" libarchive-source + "--strip-components=1" + "-C" "Utilities/cmlibarchive" + (map (lambda (file) + (string-append "libarchive-" libarchive-version + "/" file)) + files-to-unpack)) + #t))) (add-before 'configure 'patch-bin-sh (lambda _ ;; Replace "/bin/sh" by the right path in... a lot of @@ -138,7 +169,6 @@ "Source/cmLocalUnixMakefileGenerator3.cxx" "Source/cmExecProgramCommand.cxx" "Utilities/Release/release_cmake.cmake" - "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c" "Tests/CMakeLists.txt" "Tests/RunCMake/File_Generate/RunCMakeTest.cmake") (("/bin/sh") (which "sh"))) @@ -163,6 +193,7 @@ ("expat" ,expat) ("file" ,file) ("libarchive" ,libarchive) + ("libarchive:source" ,(package-source libarchive)) ("libuv" ,libuv) ("rhash" ,rhash) ("zlib" ,zlib))) @@ -192,8 +223,6 @@ and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice.") (properties '((hidden? . #t))) (license (list license:bsd-3 ; cmake - license:bsd-4 ; cmcompress - license:bsd-2 ; cmlibarchive license:expat ; cmjsoncpp is dual MIT/public domain license:public-domain)))) ; cmlibarchive/archive_getdate.c -- cgit v1.2.3 From 88b263465c4baabe1711ca2d1eeffe8527a93cc0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 01:52:55 +0100 Subject: build-system/cmake: Enable parallel tests by default. * guix/build-system/cmake.scm (cmake-build, cmake-cross-build): Set the PARALLEL-TESTS? key to #t. --- guix/build-system/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index aa0f4187ec..1fc0931a27 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -102,7 +102,7 @@ (build-type "RelWithDebInfo") (tests? #t) (test-target "test") - (parallel-build? #t) (parallel-tests? #f) + (parallel-build? #t) (parallel-tests? #t) (validate-runpath? #t) (patch-shebangs? #t) (strip-binaries? #t) @@ -181,7 +181,7 @@ provides a 'CMakeLists.txt' file as its build system." (build-type "RelWithDebInfo") (tests? #f) ; nothing can be done (test-target "test") - (parallel-build? #t) (parallel-tests? #f) + (parallel-build? #t) (parallel-tests? #t) (validate-runpath? #t) (patch-shebangs? #t) (strip-binaries? #t) -- cgit v1.2.3 From 013c5c23f9c3cc7464841c920c9557741ff5ed1b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 12:47:55 +0100 Subject: gnu: cmake, cmake-minimal: Use cmake-build-system. This allows removing the bundled LibUV in a subsequent commit. This commit alone makes no functional changes apart from the build system adjustments. * gnu/packages/cmake.scm (%common-build-phases, %common-disabled-tests): New variables. (cmake-bootstrap)[arguments]: Refactor to use the shared phases and tests. (cmake-minimal)[build-system]: Change to CMAKE-BUILD-SYSTEM. [arguments]: Adjust accordingly. (cmake)[arguments]: Likewise. --- gnu/packages/cmake.scm | 175 ++++++++++++++++++++++++++++++------------------- 1 file changed, 109 insertions(+), 66 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index c1b4d5de04..ffb2eeba48 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -33,6 +33,7 @@ #:use-module (guix utils) #:use-module (guix deprecation) #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) #:use-module (gnu packages) #:use-module (gnu packages backup) @@ -49,8 +50,63 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1)) -;;; The "bootstrap" CMake. It is used to build the inputs of 'cmake-minimal' -;;; below, to prevent a cyclic dependency on cmake-build-system. +;;; Build phases shared between 'cmake-bootstrap' and the later variants +;;; that use cmake-build-system. +(define %common-build-phases + `((add-after 'unpack 'split-package + ;; Remove files that have been packaged in other package recipes. + (lambda _ + (delete-file "Auxiliary/cmake-mode.el") + (substitute* "Auxiliary/CMakeLists.txt" + ((".*cmake-mode.el.*") "")) + #t)) + (add-after 'unpack 'use-system-libarchive + ;; 'Source/cm_get_date.c' includes archive_getdate.c wholesale, + ;; so it needs to be available along with the header file. + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((libarchive-source (assoc-ref (or native-inputs inputs) + "libarchive:source")) + ;; XXX: We can not use ,(package-version libarchive) here due to + ;; a cyclic module reference at the top-level. + (libarchive-version "3.4.1") + (files-to-unpack '("libarchive/archive_getdate.c" + "libarchive/archive_getdate.h"))) + (mkdir-p "Utilities/cmlibarchive") + (apply invoke "tar" "-xvf" libarchive-source + "--strip-components=1" + "-C" "Utilities/cmlibarchive" + (map (lambda (file) + (string-append "libarchive-" libarchive-version + "/" file)) + files-to-unpack)) + #t))) + (add-before 'configure 'patch-bin-sh + (lambda _ + ;; Replace "/bin/sh" by the right path in... a lot of + ;; files. + (substitute* + '("Modules/CompilerId/Xcode-3.pbxproj.in" + "Modules/Internal/CPack/CPack.RuntimeScript.in" + "Source/cmGlobalXCodeGenerator.cxx" + "Source/cmLocalUnixMakefileGenerator3.cxx" + "Source/cmExecProgramCommand.cxx" + "Utilities/Release/release_cmake.cmake" + "Tests/CMakeLists.txt" + "Tests/RunCMake/File_Generate/RunCMakeTest.cmake") + (("/bin/sh") (which "sh"))) + #t)))) + +(define %common-disabled-tests + '(;; This test copies libgcc_s.so.1 from GCC and tries to modify its RPATH, + ;; but does not cope with the file being read-only. + "BundleUtilities" + ;; This test requires network access. + "CTestTestUpload" + ;; This test requires 'ldconfig' which is not available in Guix. + "RunCMake.install")) + +;;; The "bootstrap" CMake. It is used to build 'cmake-minimal' below, as well +;;; as any dependencies that need cmake-build-system. (define-public cmake-bootstrap (package (name "cmake-bootstrap") @@ -78,17 +134,13 @@ (and (string-prefix? "cm" file) (eq? 'directory (stat:type (stat file))) - ;; jsoncpp must be kept around for now to - ;; work around a circular dependency. It - ;; gets deleted once we reach "cmake-minimal". + ;; These inputs are required to bootstrap + ;; the initial build system. They are + ;; deleted in 'cmake-minimal' below. ;; TODO: Consider building jsoncpp with ;; Meson instead, once meson-build-system ;; learns cross-compilation. (not (string=? "cmjsoncpp" file)) - - ;; XXX: cmake's bootstrap script appears to - ;; rquire libuv, even though it detects and - ;; uses the system version eventually. (not (string=? "cmlibuv" file))))))) #t)) (patches (search-patches "cmake-curl-certificates.patch")))) @@ -118,13 +170,11 @@ "--" "-DCMAKE_BUILD_TYPE=Release")) #:make-flags (let ((skipped-tests - (list "BundleUtilities" ; This test fails on Guix. + (list ,@%common-disabled-tests "CTestTestSubdir" ; This test fails to build 2 of the 3 tests. - ;; This test requires 'ldconfig' which is not available in Guix. - "RunCMake.install" - ;; These tests requires network access. - "CTestCoverageCollectGCOV" - "CTestTestUpload"))) + ;; This test fails when ARGS (below) is in use, see + ;; . + "CTestCoverageCollectGCOV"))) (list (string-append ;; These arguments apply for the tests only. @@ -133,46 +183,7 @@ " --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$"))) #:phases (modify-phases %standard-phases - (add-after 'unpack 'split-package - ;; Remove files that have been packaged in other package recipes. - (lambda _ - (delete-file "Auxiliary/cmake-mode.el") - (substitute* "Auxiliary/CMakeLists.txt" - ((".*cmake-mode.el.*") "")) - #t)) - (add-after 'unpack 'use-system-libarchive - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((libarchive-source (assoc-ref (or native-inputs inputs) - "libarchive:source")) - (libarchive-version ,(package-version libarchive)) - (files-to-unpack '("libarchive/archive_getdate.c" - "libarchive/archive_getdate.h"))) - ;; XXX: Source/cm_get_date.c includes archive_getdate.c wholesale, - ;; so it needs to be available along with the header file. - (mkdir-p "Utilities/cmlibarchive") - (apply invoke "tar" "-xvf" libarchive-source - "--strip-components=1" - "-C" "Utilities/cmlibarchive" - (map (lambda (file) - (string-append "libarchive-" libarchive-version - "/" file)) - files-to-unpack)) - #t))) - (add-before 'configure 'patch-bin-sh - (lambda _ - ;; Replace "/bin/sh" by the right path in... a lot of - ;; files. - (substitute* - '("Modules/CompilerId/Xcode-3.pbxproj.in" - "Modules/Internal/CPack/CPack.RuntimeScript.in" - "Source/cmGlobalXCodeGenerator.cxx" - "Source/cmLocalUnixMakefileGenerator3.cxx" - "Source/cmExecProgramCommand.cxx" - "Utilities/Release/release_cmake.cmake" - "Tests/CMakeLists.txt" - "Tests/RunCMake/File_Generate/RunCMakeTest.cmake") - (("/bin/sh") (which "sh"))) - #t)) + ,@%common-build-phases (add-before 'configure 'set-paths (lambda _ ;; Help cmake's bootstrap process to find system libraries @@ -187,8 +198,6 @@ (apply invoke "./configure" configure-flags)))))) (native-inputs `(("bzip2" ,bzip2) - ;; cURL depends on ghostscript (via groff and OpenLDAP), which depends on - ;; 'cmake-build-system' through libtiff and ultimately libjpeg-turbo. ("curl" ,curl-minimal) ("expat" ,expat) ("file" ,file) @@ -243,10 +252,37 @@ and workspaces that can be used in the compiler environment of your choice.") `(("curl" ,curl) ("jsoncpp" ,jsoncpp) ,@(alist-delete "curl" (package-native-inputs cmake-bootstrap)))) + (build-system cmake-build-system) (arguments - (substitute-keyword-arguments (package-arguments cmake-bootstrap) - ((#:configure-flags flags ''()) - `(delete "--no-system-jsoncpp" ,flags)))))) + `(#:configure-flags + (list "-DCMAKE_USE_SYSTEM_LIBRARIES=ON" + (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-" + ,(version-major+minor (package-version + cmake-bootstrap)))) + + ;; This is the CMake used in cmake-build-system. Ensure compiler + ;; optimizations are enabled to save size and CPU cycles. + #:build-type "Release" + #:phases + (modify-phases %standard-phases + ,@%common-build-phases + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (let ((skipped-tests (list ,@%common-disabled-tests + ;; This test requires the bundled libuv. + "BootstrapTest"))) + (if tests? + (begin + (invoke "ctest" "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + "--exclude-regex" + (string-append "^(" (string-join skipped-tests "|") ")$"))) + (format #t "test suite not run~%")) + #t)))) + ,@(if (%current-target-system) + '() + `(#:cmake ,cmake-bootstrap)))))) ;;; The "user-facing" CMake, now with manuals and HTML documentation. (define-public cmake @@ -255,12 +291,19 @@ and workspaces that can be used in the compiler environment of your choice.") (name "cmake") (arguments (substitute-keyword-arguments (package-arguments cmake-minimal) - ((#:configure-flags configure-flags ''()) - `(append ,configure-flags - ;; Extra configure flags used to generate the documentation. - '("--sphinx-info" - "--sphinx-man" - "--sphinx-html"))) + ;; Use cmake-minimal this time. + ((#:cmake _ #f) + (if (%current-target-system) + cmake-minimal-cross + cmake-minimal)) + ((#:configure-flags flags ''()) + `(append (list "-DSPHINX_INFO=ON" "-DSPHINX_MAN=ON" "-DSPHINX_HTML=ON" + (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-" + ,(version-major+minor (package-version + cmake-minimal))) + "-DCMAKE_INFO_DIR=share/info" + "-DCMAKE_MAN_DIR=share/man") + ,flags)) ((#:phases phases) `(modify-phases ,phases (add-after 'install 'move-html-doc -- cgit v1.2.3 From 11f4d87756dfc83656021c5aae00850724997ee0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 12:48:34 +0100 Subject: gnu: cmake: Remove bundled LibUV. * gnu/packages/cmake.scm (cmake-minimal)[source](snippet): Delete 'Utilities/cmlibuv'. --- gnu/packages/cmake.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index ffb2eeba48..ecabc8a763 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -246,7 +246,11 @@ and workspaces that can be used in the compiler environment of your choice.") (snippet (match (origin-snippet (package-source cmake-bootstrap)) ((begin exp ...) - (append '(begin (delete-file-recursively "Utilities/cmjsoncpp")) + ;; Now we can delete the remaining software bundles. + (append '(begin + (for-each delete-file-recursively + '("Utilities/cmjsoncpp" + "Utilities/cmlibuv"))) exp)))))) (native-inputs `(("curl" ,curl) -- cgit v1.2.3 From 28ba01aec6d998ffffc819458db308d691948246 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 12:49:45 +0100 Subject: gnu: cmake: Enable debugging information. * gnu/packages/cmake.scm (cmake)[arguments]: Set #:build-type. --- gnu/packages/cmake.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index ecabc8a763..93a71e1d92 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -300,6 +300,10 @@ and workspaces that can be used in the compiler environment of your choice.") (if (%current-target-system) cmake-minimal-cross cmake-minimal)) + + ;; Enable debugging information for convenience. + ((#:build-type _ #f) "RelWithDebInfo") + ((#:configure-flags flags ''()) `(append (list "-DSPHINX_INFO=ON" "-DSPHINX_MAN=ON" "-DSPHINX_HTML=ON" (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-" -- cgit v1.2.3 From f3418f58dc6fc2698183a46dacdf01fe16d685f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 12:57:56 +0100 Subject: gnu: libjpeg-turbo: Fix cross-compilation. * gnu/packages/image.scm (libjpeg-turbo)[arguments]: In #:configure-flags, add "-DCMAKE_SYSTEM_PROCESSOR" for known architectures when cross-compiling. --- gnu/packages/image.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index ebb30742a4..ecd1867af6 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1507,7 +1507,22 @@ is hereby granted.")))) `(("nasm" ,nasm))) (arguments `(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib" - "-DENABLE_STATIC=0") + "-DENABLE_STATIC=0" + ;; The build system probes for the current CPU, but + ;; that fails when cross-compiling. + ,@(let ((target (%current-target-system))) + (if target + (cond + ((string-prefix? "arm" target) + `("-DCMAKE_SYSTEM_PROCESSOR=arm")) + ((string-prefix? "aarch64" target) + `("-DCMAKE_SYSTEM_PROCESSOR=aarch64")) + ((string-prefix? "i686" target) + `("-DCMAKE_SYSTEM_PROCESSOR=x86")) + ((string-prefix? "x86_64" target) + `("-DCMAKE_SYSTEM_PROCESSOR=x86_64")) + (else '())) + '()))) ,@(if (%current-target-system) '() ;; Use a special "bootstrap" CMake for the native build to work -- cgit v1.2.3 From 38746d026cb4179edc18cbb1d1472a0f4c96b5cc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 13:00:30 +0100 Subject: build-system/cmake: Specify C++ compiler when cross-compiling. * guix/build/cmake-build-system.scm (configure)[args]: Add "-DCMAKE_CXX_COMPILER" when cross-compiling. --- guix/build/cmake-build-system.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index 9b1112f2d6..d1ff5071be 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -67,6 +67,8 @@ ,@(if target (list (string-append "-DCMAKE_C_COMPILER=" target "-gcc") + (string-append "-DCMAKE_CXX_COMPILER=" + target "-g++") (if (string-contains target "mingw") "-DCMAKE_SYSTEM_NAME=Windows" "-DCMAKE_SYSTEM_NAME=Linux")) -- cgit v1.2.3 From 4d67659700798cd0ee8c966312abb4a2308ac636 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 13:02:29 +0100 Subject: gnu: jsoncpp: Fix cross-compilation. * gnu/packages/serialization.scm (jsoncpp)[arguments]: Add configure flag to prevent running a test during the build process. --- gnu/packages/serialization.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 0b3eb7ecaa..8149b05c95 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2019 Marius Bakke +;;; Copyright © 2016, 2019, 2020 Marius Bakke ;;; Copyright © 2016, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Corentin Bocquillon ;;; Copyright © 2017 Gregor Giesen @@ -297,7 +297,10 @@ that implements both the msgpack and msgpack-rpc specifications.") "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES") + `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES" + ,@(if (%current-target-system) + `("-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF") + '())) ,@(if (%current-target-system) '() `(#:cmake ,cmake-bootstrap)))) -- cgit v1.2.3 From a51c9c903f9db26a08672c7e19ddddeef1aee6b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 13:04:13 +0100 Subject: gnu: rhash: Fix cross-compilation. * gnu/packages/crypto.scm (rhash)[arguments]: In custom configure phase, set "--target" and "-cc" when cross-compiling. --- gnu/packages/crypto.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 4e761de2ce..79472847d6 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -728,9 +729,16 @@ BLAKE.") (replace 'configure ;; ./configure is not GNU autotools' and doesn't gracefully handle ;; unrecognized options, so we must call it manually. - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key native-inputs outputs #:allow-other-keys) (invoke "./configure" - (string-append "--prefix=" (assoc-ref outputs "out"))))) + (string-append "--prefix=" (assoc-ref outputs "out")) + ,@(let ((target (%current-target-system))) + (if target + `((string-append "--target=" ,target) + (string-append "--cc=" + (assoc-ref native-inputs "cross-gcc") + "/bin/" ,target "-gcc")) + '()))))) (add-before 'check 'patch-/bin/sh (lambda _ (substitute* "Makefile" -- cgit v1.2.3 From ac841750a52e44d68d7f1b02e9507421f3e3824f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 13:15:55 +0100 Subject: gnu: cmake: Fix cross-compilation. * gnu/packages/cmake.scm (cmake-bootstrap)[native-inputs]: Move everything except (PACKAGE-SOURCE LIBARCHIVE) ... [inputs]: ... here. * gnu/packages/cmake.scm (cmake-minimal)[native-inputs, inputs]: Adjust accordingly. --- gnu/packages/cmake.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 93a71e1d92..cc4340bbc6 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -197,17 +197,17 @@ (lambda* (#:key (configure-flags '()) #:allow-other-keys) (apply invoke "./configure" configure-flags)))))) (native-inputs + `(("libarchive:source" ,(package-source libarchive)))) + (inputs `(("bzip2" ,bzip2) ("curl" ,curl-minimal) ("expat" ,expat) ("file" ,file) ("libarchive" ,libarchive) - ("libarchive:source" ,(package-source libarchive)) ("libuv" ,libuv) + ("ncurses" ,ncurses) ;required for ccmake ("rhash" ,rhash) ("zlib" ,zlib))) - (inputs - `(("ncurses" ,ncurses))) ; required for ccmake (native-search-paths (list (search-path-specification (variable "CMAKE_PREFIX_PATH") @@ -252,10 +252,10 @@ and workspaces that can be used in the compiler environment of your choice.") '("Utilities/cmjsoncpp" "Utilities/cmlibuv"))) exp)))))) - (native-inputs + (inputs `(("curl" ,curl) ("jsoncpp" ,jsoncpp) - ,@(alist-delete "curl" (package-native-inputs cmake-bootstrap)))) + ,@(alist-delete "curl" (package-inputs cmake-bootstrap)))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 68dbd5c9de78ad803cc33973db40d22e29c532ec Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 30 Jan 2020 01:17:54 +0100 Subject: gexp: Move 'file-mapping->tree' to (guix store). * guix/gexp.scm (%not-slash): Remove. (file-mapping->tree): Move to... * guix/store.scm (file-mapping->tree): ... here. --- guix/gexp.scm | 43 ------------------------------------------- guix/store.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 43 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 8fea42c757..0a9d56c0e8 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1239,49 +1239,6 @@ execution environment." ;;; Module handling. ;;; -(define %not-slash - (char-set-complement (char-set #\/))) - -(define (file-mapping->tree mapping) - "Convert MAPPING, an alist like: - - ((\"guix/build/utils.scm\" . \"…/utils.scm\")) - -to a tree suitable for 'interned-file-tree'." - (let ((mapping (map (match-lambda - ((destination . source) - (cons (string-tokenize destination - %not-slash) - source))) - mapping))) - (fold (lambda (pair result) - (match pair - ((destination . source) - (let loop ((destination destination) - (result result)) - (match destination - ((file) - (let* ((mode (stat:mode (stat source))) - (type (if (zero? (logand mode #o100)) - 'regular - 'executable))) - (alist-cons file - `(,type (file ,source)) - result))) - ((file rest ...) - (let ((directory (assoc-ref result file))) - (alist-cons file - `(directory - ,@(loop rest - (match directory - (('directory . entries) entries) - (#f '())))) - (if directory - (alist-delete file result) - result))))))))) - '() - mapping))) - (define %utils-module ;; This file provides 'mkdir-p', needed to implement 'imported-files' and ;; other primitives below. Note: We give the file name relative to this diff --git a/guix/store.scm b/guix/store.scm index f99fa581a8..77ee23fdd8 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -103,6 +103,7 @@ add-text-to-store add-to-store add-file-tree-to-store + file-mapping->tree binary-file build-things build @@ -1220,6 +1221,45 @@ an arbitrary directory layout in the store without creating a derivation." (hash-set! cache tree result) result))))) +(define (file-mapping->tree mapping) + "Convert MAPPING, an alist like: + + ((\"guix/build/utils.scm\" . \"…/utils.scm\")) + +to a tree suitable for 'add-file-tree-to-store' and 'interned-file-tree'." + (let ((mapping (map (match-lambda + ((destination . source) + (cons (string-tokenize destination %not-slash) + source))) + mapping))) + (fold (lambda (pair result) + (match pair + ((destination . source) + (let loop ((destination destination) + (result result)) + (match destination + ((file) + (let* ((mode (stat:mode (stat source))) + (type (if (zero? (logand mode #o100)) + 'regular + 'executable))) + (alist-cons file + `(,type (file ,source)) + result))) + ((file rest ...) + (let ((directory (assoc-ref result file))) + (alist-cons file + `(directory + ,@(loop rest + (match directory + (('directory . entries) entries) + (#f '())))) + (if directory + (alist-delete file result) + result))))))))) + '() + mapping))) + (define build-things (let ((build (operation (build-things (string-list things) (integer mode)) -- cgit v1.2.3 From 46312064de8ae0cca531fddbc4b5ec8421e5d866 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 30 Jan 2020 01:20:49 +0100 Subject: derivations: Import modules with 'add-file-tree-to-store'. This reduces the number of RPCs on "guix build libreoffice -nd" from 2,589 to 2,558 (1%). * guix/derivations.scm (imported-files): Rewrite to call to 'add-file-tree-to-store'. Remove #:system and #:guile parameters. (%imported-modules): Adjust docstring to say that result is a store item, and adjust 'imported-files' call. (%compiled-modules): Adjust accordingly. (imported+compiled-modules): Likewise. (build-expression->derivation): Likewise. --- guix/derivations.scm | 61 +++++++++++----------------------------------------- 1 file changed, 13 insertions(+), 48 deletions(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index 480a65c78b..16aa95d2c7 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016, 2017 Mathieu Lirzin ;;; ;;; This file is part of GNU Guix. @@ -1098,39 +1098,13 @@ recursively." (string-tokenize (dirname file-name) not-slash)))))) (define* (imported-files store files ;deprecated - #:key (name "file-import") - (system (%current-system)) - (guile (%guile-for-build))) - "Return a derivation that imports FILES into STORE. FILES must be a list + #:key (name "file-import")) + "Return a store item that contains FILES. FILES must be a list of (FINAL-PATH . FILE-NAME) pairs; each FILE-NAME is read from the file system, imported, and appears under FINAL-PATH in the resulting store path." - (let* ((files (map (match-lambda - ((final-path . file-name) - (list final-path - (add-to-store store (basename final-path) #f - "sha256" file-name)))) - files)) - (builder - `(begin - (mkdir %output) (chdir %output) - ,@(append-map (match-lambda - ((final-path store-path) - (append (match (parent-directories final-path) - (() '()) - ((head ... tail) - (append (map (lambda (d) - `(false-if-exception - (mkdir ,d))) - head) - `((or (file-exists? ,tail) - (mkdir ,tail)))))) - `((symlink ,store-path ,final-path))))) - files)))) - (build-expression->derivation store name builder - #:system system - #:inputs files - #:guile-for-build guile - #:local-build? #t))) + (add-file-tree-to-store store + `(,name directory + ,@(file-mapping->tree files)))) ;; The "file not found" error condition. (define-condition-type &file-search-error &error @@ -1157,10 +1131,8 @@ of symbols.)" (define* (%imported-modules store modules ;deprecated #:key (name "module-import") - (system (%current-system)) - (guile (%guile-for-build)) (module-path %load-path)) - "Return a derivation that contains the source files of MODULES, a list of + "Return a store item that contains the source files of MODULES, a list of module names such as `(ice-9 q)'. All of MODULES must be in the MODULE-PATH search path." ;; TODO: Determine the closure of MODULES, build the `.go' files, @@ -1169,8 +1141,7 @@ search path." (let ((f (module->source-file-name m))) (cons f (search-path* module-path f)))) modules))) - (imported-files store files #:name name #:system system - #:guile guile))) + (imported-files store files #:name name))) (define* (%compiled-modules store modules ;deprecated #:key (name "module-import-compiled") @@ -1180,11 +1151,8 @@ search path." "Return a derivation that builds a tree containing the `.go' files corresponding to MODULES. All the MODULES are built in a context where they can refer to each other." - (let* ((module-drv (%imported-modules store modules - #:system system - #:guile guile + (let* ((module-dir (%imported-modules store modules #:module-path module-path)) - (module-dir (derivation->output-path module-drv)) (files (map (lambda (m) (let ((f (string-join (map symbol->string m) "/"))) @@ -1215,7 +1183,7 @@ they can refer to each other." files))) (build-expression->derivation store name builder - #:inputs `(("modules" ,module-drv)) + #:inputs `(("modules" ,module-dir)) #:system system #:guile-for-build guile #:local-build? #t))) @@ -1233,8 +1201,7 @@ MODULES are compiled." (list modules (derivation-file-name guile) system)) (or (hash-ref %module-cache key) - (let ((result (cons (%imported-modules store modules - #:system system #:guile guile) + (let ((result (cons (%imported-modules store modules) (%compiled-modules store modules #:system system #:guile guile)))) (hash-set! %module-cache key result) @@ -1368,10 +1335,8 @@ and PROPERTIES." #:guile guile-drv #:system system) '(#f . #f))) - (mod-drv (car mod+go-drv)) + (mod-dir (car mod+go-drv)) (go-drv (cdr mod+go-drv)) - (mod-dir (and mod-drv - (derivation->output-path mod-drv))) (go-dir (and go-drv (derivation->output-path go-drv)))) (derivation store name guile @@ -1388,7 +1353,7 @@ and PROPERTIES." #:inputs `((,(or guile-for-build (%guile-for-build))) (,builder) ,@(map cdr inputs) - ,@(if mod-drv `((,mod-drv) (,go-drv)) '())) + ,@(if mod-dir `((,mod-dir) (,go-drv)) '())) ;; When MODULES is non-empty, shamelessly clobber ;; $GUILE_LOAD_COMPILED_PATH. -- cgit v1.2.3 From 5db7df2eab8c0dc0f91aaaf8431f0ba0d72d6049 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 30 Jan 2020 16:53:44 +0100 Subject: guix: Fix missing export for make-desktop-entry-file. * guix/build/utils.scm: Export make-desktop-entry-file. --- guix/build/utils.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index cee4e8aaa2..a398bf9b90 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -108,6 +108,8 @@ invoke/quiet + make-desktop-entry-file + locale-category->string)) -- cgit v1.2.3 From 1eb343f9cf18544319bc4ac016845348816f7265 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Feb 2020 16:52:55 -0500 Subject: gnu: php: Update to 7.4.2. Fixes issue #38250 (see: https://bugs.gnu.org/38250). * gnu/packages/php.scm (php): Update to 7.4.2. [home-page]: Update URL. [phases]{prepare-tests}: Delete failing tests. --- gnu/packages/php.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index a82257c582..ac0f991206 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Oleg Pykhalov +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,15 +60,15 @@ (define-public php (package (name "php") - (version "7.4.1") - (home-page "https://secure.php.net/") + (version "7.4.2") + (home-page "https://www.php.net/") (source (origin (method url-fetch) (uri (string-append home-page "distributions/" "php-" version ".tar.xz")) (sha256 (base32 - "0qn7zwf2jzj3h7p4b1l79lf9gv236mycwkhgw15hj2fmpmkbh6sn")) + "04yz9f7klh642syfh49rmribzwd1k5ssxv0pc510vnhpq3m4sa4q")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -210,6 +211,14 @@ "ext/standard/tests/strings/setlocale_basic2.phpt" "ext/standard/tests/strings/setlocale_basic3.phpt" "ext/standard/tests/strings/setlocale_variation1.phpt" + ;; This failing test is skipped on PHP's Travis CI as it is + ;; supposedly inaccurate. + "ext/standard/tests/file/disk_free_space_basic.phpt" + ;; The two following tests erroneously expect the link count + ;; of a sub-directory to increase compared to its + ;; parent. + "ext/standard/tests/file/lstat_stat_variation8.phpt" + "ext/standard/tests/file/lstat_stat_variation9.phpt" ;; XXX: These gd tests fails. Likely because our version ;; is different from the (patched) bundled one. @@ -237,6 +246,13 @@ ;; complete. It's a warning in both cases and test ;; result is the same. "ext/gd/tests/bug77973.phpt" + ;; Test expects uninitialized value to be false, but + ;; instead gets "resource(5) of type (gd)". + "ext/gd/tests/bug79067.phpt" + ;; The following test fails with "The image size + ;; differs: expected 114x115, got 117x117". + "ext/gd/tests/bug79068.phpt" + ;; XXX: These iconv tests have the expected outcome, ;; but with different error messages. -- cgit v1.2.3 From 0684a2f907151c20cee1643873547f7968fcbfa0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 3 Feb 2020 09:08:20 +0200 Subject: gnu: python-importlib-metadata: Fix test suite. * gnu/packages/python-xyz.scm (python-importlib-metadata)[native-inputs]: Add python-six. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a9b75db2da..abaec7f699 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5029,6 +5029,7 @@ for older versions of Python.") `(("python-zipp" ,python-zipp))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) + ("python-six" ,python-six) ("python-packaging" ,python-packaging-bootstrap))) (home-page "https://importlib-metadata.readthedocs.io/") (synopsis "Read metadata from Python packages") -- cgit v1.2.3 From 5d8c7f2f596f0445cebc46b194370f2146ed1e29 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Feb 2020 11:45:00 +0100 Subject: gnu: python2-importlib-metadata: Fix circular dependency. Commit 0684a2f907151c20cee1643873547f7968fcbfa0 introduced a circular dependency in the Python 2 variant of python-importlib-metadata. * gnu/packages/python-xyz.scm (python-importlib-metadata)[native-inputs]: Remove PYTHON-SIX and PYTHON-PACKAGING-BOOTSTRAP. Add PYTHON-PACKAGING. (python2-importlib-metadata)[native-inputs]: New field. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index abaec7f699..5a1ff5bc97 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5029,8 +5029,7 @@ for older versions of Python.") `(("python-zipp" ,python-zipp))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) - ("python-six" ,python-six) - ("python-packaging" ,python-packaging-bootstrap))) + ("python-packaging" ,python-packaging))) (home-page "https://importlib-metadata.readthedocs.io/") (synopsis "Read metadata from Python packages") (description @@ -5049,6 +5048,9 @@ need to use the older and less efficient @code{pkg_resources} package.") (package/inherit base (name "python2-importlib-metadata") + (native-inputs + `(("python-packaging" ,python2-packaging-bootstrap) + ,@(alist-delete "python-packaging" (package-native-inputs base)))) (propagated-inputs `(("python-configparser" ,python2-configparser) ("python-contextlib2" ,python2-contextlib2) -- cgit v1.2.3 From a6046f24ddd34b44418a2d1b02a84ddcc61b47aa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Feb 2020 09:44:14 +0100 Subject: gnu: llvm@3: Do not inherit 'install-opt-viewer' phase. This is a follow-up to commit 50b61ec22306181c419a3bd4c35b3c001c604994. * gnu/packages/llvm.scm (llvm-3.9.1)[outputs, arguments]: New fields. (llvm-3.8, llvm-3.7, llvm-3.6, llvm-3.5): Inherit from LLVM-3.9.1. --- gnu/packages/llvm.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index ae5fe72d93..e333ab7638 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Dennis Mungai ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2018, 2019 Marius Bakke +;;; Copyright © 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Tim Gesthuizen @@ -574,7 +574,13 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") version "/llvm-" version ".src.tar.xz")) (sha256 (base32 - "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z")))))) + "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z")))) + (outputs '("out")) + (arguments + (substitute-keyword-arguments (package-arguments llvm) + ((#:phases phases) + `(modify-phases ,phases + (delete 'install-opt-viewer))))))) (define-public clang-runtime-3.9.1 (clang-runtime-from-llvm @@ -590,7 +596,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") #:patches '("clang-3.8-libc-search-path.patch"))) (define-public llvm-3.8 - (package (inherit llvm) + (package (inherit llvm-3.9.1) (name "llvm") (version "3.8.1") (source @@ -615,7 +621,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") #:patches '("clang-3.8-libc-search-path.patch"))) (define-public llvm-3.7 - (package (inherit llvm) + (package (inherit llvm-3.9.1) (version "3.7.1") (source (origin @@ -639,7 +645,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") #:patches '("clang-3.5-libc-search-path.patch"))) (define-public llvm-3.6 - (package (inherit llvm) + (package (inherit llvm-3.9.1) (version "3.6.2") (source (origin @@ -662,7 +668,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") #:patches '("clang-3.5-libc-search-path.patch"))) (define-public llvm-3.5 - (package (inherit llvm) + (package (inherit llvm-3.9.1) (version "3.5.2") (source (origin -- cgit v1.2.3 From f847d9dcda9bf0efc169601ccb8a1f9546819275 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Jan 2020 22:01:16 +0100 Subject: gnu: libaio: Fix cross-compilation. * gnu/packages/linux.scm (libaio)[arguments]: When cross-compiling, set CC to the cross-gcc in #:make-flags. --- gnu/packages/linux.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 569ba34aa4..e47f731f15 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3838,8 +3838,14 @@ Linux Device Mapper multipathing driver: "0ajhzbqjwsmz51gwccfyw6w9k4j4gmxcl2ph30sfn2gxv0d8gkv2")))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list "CC=gcc" (string-append "prefix=" %output)) + `(#:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "prefix=" %output) + (string-append + "CC=" (if target + (string-append (assoc-ref %build-inputs "cross-gcc") + "/bin/" target "-gcc") + "gcc")))) #:test-target "partcheck" ; need root for a full 'check' #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script -- cgit v1.2.3 From 7981c0be07d4e7723c263bedc5ef258d814a0ffb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Jan 2020 23:06:40 +0100 Subject: gnu: libsepol: Fix cross-compilation. * gnu/packages/selinux.scm (libsepol)[arguments]: Check for (%CURRENT-TARGET-SYSTEM) and adjust the "CC" flag accordingly. --- gnu/packages/selinux.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 49362d129b..5c0cbfa639 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,14 +63,19 @@ `(#:tests? #f ; tests require checkpolicy, which requires libsepol #:test-target "test" #:make-flags - (let ((out (assoc-ref %outputs "out"))) + (let ((out (assoc-ref %outputs "out")) + (target ,(%current-target-system))) (list (string-append "PREFIX=" out) (string-append "SHLIBDIR=" out "/lib") (string-append "MAN3DIR=" out "/share/man/man3") (string-append "MAN5DIR=" out "/share/man/man5") (string-append "MAN8DIR=" out "/share/man/man8") (string-append "LDFLAGS=-Wl,-rpath=" out "/lib") - "CC=gcc")) + (string-append "CC=" + (if target + (string-append (assoc-ref %build-inputs "cross-gcc") + "/bin/" target "-gcc") + "gcc")))) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 2401678f56695b80b5a46d2aef931afcde278c2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Jan 2020 23:07:23 +0100 Subject: gnu: checkpolicy: Fix cross-compilation. * gnu/packages/selinux.scm (checkpolicy)[arguments]: Check for (%CURRENT-TARGET-SYSTEM) and adjust the "CC" flag accordingly. --- gnu/packages/selinux.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 5c0cbfa639..1502d167c4 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -106,12 +106,17 @@ boolean settings).") (arguments `(#:tests? #f ; there is no check target #:make-flags - (let ((out (assoc-ref %outputs "out"))) + (let ((out (assoc-ref %outputs "out")) + (target ,(%current-target-system))) (list (string-append "PREFIX=" out) (string-append "LIBSEPOLA=" (assoc-ref %build-inputs "libsepol") "/lib/libsepol.a") - "CC=gcc")) + (string-append "CC=" + (if target + (string-append (assoc-ref %build-inputs "cross-gcc") + "/bin/" target "-gcc") + "gcc")))) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From d2a4020a012e305b425c9bd48e9585c24a606aa7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 09:47:41 +0100 Subject: gnu: RHash: Move custom configure logic to #:configure-flags. * gnu/packages/crypto.scm (rhash)[arguments]: Add #:configure-flags. Adjust the 'configure' phase accordingly. --- gnu/packages/crypto.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 79472847d6..852a262a7c 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -720,7 +720,16 @@ BLAKE.") "1xn9fqa6rlnhsbgami45g82dlw9i1skg2sri3ydiinwak5ph1ca2")))) (build-system gnu-build-system) (arguments - `(#:make-flags + `(#:configure-flags + (list (string-append "--prefix=" (assoc-ref %outputs "out")) + ,@(let ((target (%current-target-system))) + (if target + `((string-append "--target=" ,target) + (string-append "--cc=" + (assoc-ref %build-inputs "cross-gcc") + "/bin/" ,target "-gcc")) + '()))) + #:make-flags ;; The binaries in /bin need some help finding librhash.so.0. (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) #:test-target "test" ; ‘make check’ just checks the sources @@ -729,16 +738,8 @@ BLAKE.") (replace 'configure ;; ./configure is not GNU autotools' and doesn't gracefully handle ;; unrecognized options, so we must call it manually. - (lambda* (#:key native-inputs outputs #:allow-other-keys) - (invoke "./configure" - (string-append "--prefix=" (assoc-ref outputs "out")) - ,@(let ((target (%current-target-system))) - (if target - `((string-append "--target=" ,target) - (string-append "--cc=" - (assoc-ref native-inputs "cross-gcc") - "/bin/" ,target "-gcc")) - '()))))) + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "./configure" configure-flags))) (add-before 'check 'patch-/bin/sh (lambda _ (substitute* "Makefile" -- cgit v1.2.3 From 181171ffdb4bdb534a4ce0fb631fa7cf103a2996 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 14:06:43 +0100 Subject: gnu: ninja: Do not use unstable tarball. * gnu/packages/ninja.scm (ninja)[source]: Change to GIT-FETCH. --- gnu/packages/ninja.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index a8ad6430ba..320aec0fa6 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +23,7 @@ (define-module (gnu packages ninja) #:use-module ((guix licenses) #:select (asl2.0)) #:use-module (guix packages) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages python)) @@ -32,13 +33,14 @@ (name "ninja") (version "1.9.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/martine/ninja/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ninja-build/ninja") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ffmzj5s9h98qhl94d9i23zcv057rsqbac9g1hdgvlzq51ccfzjx")))) + "1q0nld3g0d210zmdjyjzjz2xb2bw1s58gj6zsx7p8q30yh0wg610")))) (build-system gnu-build-system) (inputs `(("python" ,python-wrapper))) (arguments -- cgit v1.2.3 From 8928425756a9cc162bc38888a7c7084fcc777bd1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 14:07:39 +0100 Subject: gnu: ninja: Update to 1.10.0. * gnu/packages/ninja.scm (ninja): Update to 1.10.0. --- gnu/packages/ninja.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index 320aec0fa6..11ee472d56 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -31,7 +31,7 @@ (define-public ninja (package (name "ninja") - (version "1.9.0") + (version "1.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -40,7 +40,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1q0nld3g0d210zmdjyjzjz2xb2bw1s58gj6zsx7p8q30yh0wg610")))) + "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4")))) (build-system gnu-build-system) (inputs `(("python" ,python-wrapper))) (arguments -- cgit v1.2.3 From 090f33d6767dfc0b23d5e287369ec2dde331de01 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 14:10:18 +0100 Subject: gnu: OpenLDAP: Update to 2.4.49. * gnu/packages/openldap.scm (openldap): Update to 2.4.49. --- gnu/packages/openldap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index ec528787ca..334affcd2a 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -59,7 +59,7 @@ (define-public openldap (package (name "openldap") - (version "2.4.48") + (version "2.4.49") (source (origin (method url-fetch) @@ -76,7 +76,7 @@ "openldap-release/openldap-" version ".tgz"))) (sha256 (base32 - "0k87qra4kirb6xgja4q1jyw6piwb9v8b8g6gkxq4plawmgy3ylnr")))) + "0vp524rsngdcykf6ki7vprsyg7gj8z7hszg8xwxz50219fa1gcg3")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From f97db3de739f3a40aeb918c695dc3994d727bc2e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 14:10:41 +0100 Subject: gnu: SQLite: Update to 3.31.1. * gnu/packages/sqlite.scm (sqlite): Update to 3.31.1. --- gnu/packages/sqlite.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 80807d5d12..8468131ddf 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,7 +46,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.31.0") + (version "3.31.1") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -62,7 +62,7 @@ numeric-version ".tar.gz"))) (sha256 (base32 - "1w7i954349sjd5a6rvy118prra43k07y9hy8rpajs6vmjmnnx7bw")))) + "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (outputs '("out" "static")) -- cgit v1.2.3 From 5855813f772653c2cfe03d2a7e4a209e42687e29 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 14:10:59 +0100 Subject: gnu: poppler: Update to 0.85.0. * gnu/packages/pdf.scm (poppler): Update to 0.85.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 8451390647..62120b9cf9 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -90,14 +90,14 @@ (define-public poppler (package (name "poppler") - (version "0.84.0") + (version "0.85.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "0ccp2gx05cz5y04k5pgbyi4ikyq60nafa7x2yx4aaf1vfkd318f7")))) + "0jyr036scdly13hx5dxmsqp2p3jifc29h2by51msw0ih6bmpbj1b")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From fef24361889103057a0c999b2303e22218c04e63 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 14:12:47 +0100 Subject: gnu: util-linux: Update to 2.35.1. * gnu/packages/linux.scm (util-linux): Update to 2.35.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e47f731f15..0fb10e3f1d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1096,7 +1096,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.35") + (version "2.35.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -1104,7 +1104,7 @@ providing the system administrator with some help in common tasks.") "util-linux-" version ".tar.xz")) (sha256 (base32 - "1jg2vywxi9m2h0f2pz0a7a9afvv1j5726dg0cwryrhb809b1n25k")) + "1yfpy6bkab4jw61mpx48gfy24yrqp4a7arvpis8csrkk53fkxpnr")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From effd1422af81b210682a22f34858c5c69f7a1ba7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 17:57:38 +0100 Subject: gnu: libbsd: Do not build the static library. * gnu/packages/libbsd.scm (libbsd)[arguments]: New field. --- gnu/packages/libbsd.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/libbsd.scm b/gnu/packages/libbsd.scm index 9d0dff10f1..16a7e8fd89 100644 --- a/gnu/packages/libbsd.scm +++ b/gnu/packages/libbsd.scm @@ -34,6 +34,8 @@ (base32 "11x8q45jvjvf2dvgclds64mscyg10lva33qinf2hwgc84v3svf1l")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (synopsis "Utility functions from BSD systems") (description "This library provides useful functions commonly found on BSD systems, and lacking on others like GNU systems, thus making it easier to port -- cgit v1.2.3 From 2f144210c677ea7d5fc49906fddc886b66fe3891 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 17:58:26 +0100 Subject: gnu: pciutils: Update to 3.6.4. * gnu/packages/pciutils.scm (pciutils): Update to 3.6.4. --- gnu/packages/pciutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 5f49bb3400..0a55299c93 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -33,7 +33,7 @@ (define-public pciutils (package (name "pciutils") - (version "3.6.3") + (version "3.6.4") (source (origin (method url-fetch) (uri (string-append @@ -41,7 +41,7 @@ version ".tar.xz")) (sha256 (base32 - "1ssjdd91q0w3xlc40y5f2zhfhck3rpajs1902hajas5ir20qvdy5")))) + "0mb0f2phdcmp4kfiqsszn2k6nlln0w160ffzrjjv4bbfjwrgfzzn")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From b8f4d3f4c504ac2a28d5e62552d1c46821f04060 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Feb 2020 11:38:47 +0100 Subject: gnu: python-pytest: Update to 5.3.5. * gnu/packages/check.scm (python-pytest): Update to 5.3.5. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 19147e1afd..4c8275cd67 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -764,14 +764,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "5.3.2") + (version "5.3.5") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1yi51ckkiywszz0qp67jisxzcp54acf57wqr3ysgk457nlai4mvb")))) + "139i9cjhrv5aici3skq8iihvfb3lq0d8xb5j7qycr2hlk8cfjpqd")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 916f1d552dd8ebfe73eabf699b32f1c4aa41f220 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Feb 2020 11:39:05 +0100 Subject: gnu: python-hypothesis: Update to 5.4.1. * gnu/packages/check.scm (python-hypothesis): Update to 5.4.1. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4c8275cd67..32ef32abda 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1668,13 +1668,13 @@ instantly.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "5.3.0") + (version "5.4.1") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0aclww914la1s41jkjla10pm0qh88dpdv9x1riyqw7xzwczvbzf9")))) + "0zn09bn6hadk4vxl6jy8bkjr5fz8mrhin3z46w7pq5qgbaycr89p")))) (build-system python-build-system) (arguments ;; XXX: Tests are not distributed with the PyPI archive. -- cgit v1.2.3 From 3079b8144d07cc49599c8df0e26eaf57961463b7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Feb 2020 11:39:24 +0100 Subject: gnu: python-more-itertools: Update to 8.2.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 8.2.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5a1ff5bc97..6358db8b60 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15148,14 +15148,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "8.1.0") + (version "8.2.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "121j5nsz017r8ry2vabx4wb13srlvfjvhk0i38lbd043aznass64")))) + "01x5nwm1zxmnd06cllbdd095xxc2nd25ing1a726m2kd30rbkpdi")))) (build-system python-build-system) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") -- cgit v1.2.3 From 3a22f04af16fa5fcdcc39c26c849f25b9a1969e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 2 Feb 2020 22:10:09 +0100 Subject: gnu: libtasn1: Update to 4.16.0. * gnu/packages/tls.scm (libtasn1): Update to 4.16.0. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 0683fe7fc6..671bb1377f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -71,7 +71,7 @@ (define-public libtasn1 (package (name "libtasn1") - (version "4.15.0") + (version "4.16.0") (source (origin (method url-fetch) @@ -79,7 +79,7 @@ version ".tar.gz")) (sha256 (base32 - "17kkh89zfnwszw657fj13y2gamzay33lsrfazgm4sc7mx2gm0xyx")))) + "179jskl7dmfp1rd2khkzmlibzgki4wi6hvmmwfv7q49r728b03qf")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 584d08c5c98cb1893e4f44bd1c4191f405b13f01 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 2 Feb 2020 22:10:27 +0100 Subject: gnu: gnutls: Update to 3.6.12. * gnu/packages/tls.scm (gnutls): Update to 3.6.12. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 671bb1377f..925165dfbe 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -163,7 +163,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.6.11.1") + (version "3.6.12") (source (origin (method url-fetch) (uri @@ -175,7 +175,7 @@ living in the same process.") (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "1y1wadpsrj5ai603xv5bgssl9v0pb1si2hg14zqdnmcsvgri5fpv")))) + "0jvca1qahn9lrwv6f5kfs95icirc15b2a8x9fzczyj996ipg3b5z")))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software. -- cgit v1.2.3 From fb62edfc35fd6896bd30c06038718b630c1b92bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Feb 2020 16:04:29 +0100 Subject: gnu: python-importlib-metadata: Update to 1.5.0. * gnu/packages/python-xyz.scm (python-importlib-metadata): Update to 1.5.0. [native-inputs]: Add PYTHON-PYFAKEFS. (python2-importlib-metadata)[native-inputs]: Add PYTHON2-PYFAKEFS-BOOTSTRAP. * gnu/packages/check.scm (python2-pyfakefs-bootstrap): New public variable. --- gnu/packages/check.scm | 13 +++++++++++++ gnu/packages/python-xyz.scm | 11 +++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3c2bdaff3a..749bcc7831 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2547,3 +2547,16 @@ system. The code under test requires no modification to work with pyfakefs.") (define-public python2-pyfakefs (package-with-python2 python-pyfakefs)) + +;; This minimal variant is used to avoid a circular dependency between +;; python2-importlib-metadata, which requires pyfakefs for its tests, and +;; python2-pytest, which requires python2-importlib-metadata. +(define-public python2-pyfakefs-bootstrap + (hidden-package + (package + (inherit python2-pyfakefs) + (name "python2-pyfakefs-bootstrap") + (native-inputs '()) + (arguments + `(#:python ,python-2 + #:tests? #f))))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b884b4eee1..2024d07d46 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5019,18 +5019,20 @@ for older versions of Python.") (define-public python-importlib-metadata (package (name "python-importlib-metadata") - (version "1.4.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "importlib_metadata" version)) (sha256 - (base32 "1n76444v7zn910xrhh8954jdn4byxbn9f1jck6b85a716mbh2z7i")))) + (base32 + "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86")))) (build-system python-build-system) (propagated-inputs `(("python-zipp" ,python-zipp))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) + ("python-pyfakefs" ,python-pyfakefs) ("python-packaging" ,python-packaging))) (home-page "https://importlib-metadata.readthedocs.io/") (synopsis "Read metadata from Python packages") @@ -5051,8 +5053,9 @@ need to use the older and less efficient @code{pkg_resources} package.") base (name "python2-importlib-metadata") (native-inputs - `(("python-packaging" ,python2-packaging-bootstrap) - ,@(alist-delete "python-packaging" (package-native-inputs base)))) + `(("python-setuptools-scm" ,python2-setuptools-scm) + ("python-pyfakefs" ,python2-pyfakefs-bootstrap) + ("python-packaging" ,python2-packaging-bootstrap))) (propagated-inputs `(("python-configparser" ,python2-configparser) ("python-contextlib2" ,python2-contextlib2) -- cgit v1.2.3 From b9a3654e09948d56945f8f6aa68de5183d17df9b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 13:36:30 +0100 Subject: gnu: bzip2: Update to 1.0.8. * gnu/packages/compression.scm (bzip2): Update to 1.0.8. [source](uri): Change to maintained fork at sourceware.org. --- gnu/packages/compression.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 6926545c23..37da33908f 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -259,16 +259,14 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (define-public bzip2 (package (name "bzip2") - (version "1.0.6") + (version "1.0.8") (source (origin (method url-fetch) - ;; XXX The bzip.org domain was allowed to expire. - (uri (string-append "https://web.archive.org/web/20180624184806/" - "http://www.bzip.org/" - version "/bzip2-" version ".tar.gz")) + (uri (string-append "https://sourceware.org/pub/bzip2/bzip2-" + version ".tar.gz")) (sha256 (base32 - "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152")))) + "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 4a0c71f9f70fd2f2891848e272b3f81e3fabcf86 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 14:10:02 +0100 Subject: gnu: isl: Update to 0.22.1. * gnu/packages/gcc.scm (isl): Update to 0.22.1. --- gnu/packages/gcc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 40cc9ed631..94f7e15382 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -871,7 +871,7 @@ as the 'native-search-paths' field." (define-public isl (package (name "isl") - (version "0.21") + (version "0.22.1") (source (origin (method url-fetch) (uri (list (string-append @@ -882,7 +882,7 @@ as the 'native-search-paths' field." name "-" version ".tar.bz2"))) (sha256 (base32 - "0ng8l3q1px9lkzb44nxnzhh6fhdbclrwng9xs2v9m8yii8gs336i")))) + "1kf54jib0nind1pvakblnfhimmwzm0y1llz8470ag0di5vwqwrhs")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp))) (home-page "http://isl.gforge.inria.fr/") -- cgit v1.2.3 From fe994a0c328b456195fcf64443c28b2ca3f8da76 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Feb 2020 20:10:01 +0100 Subject: gnu: OpenLDAP: Remove cross-compilation workaround. This is no longer required since the update to 2.4.49 in commit 090f33d6767dfc0b23d5e287369ec2dde331de01. * gnu/packages/openldap.scm (openldap)[native-inputs]: Remove AUTOMAKE. [arguments]: Remove 'fix-configure' phase. --- gnu/packages/openldap.scm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 107b9239b8..60b543393e 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -87,9 +87,7 @@ ("zlib" ,zlib))) (native-inputs `(("libtool" ,libtool) ("groff" ,groff) - ("bdb" ,bdb-5.3) - ;; For up to date 'config.guess' and 'config.sub'. - ("automake" ,automake))) + ("bdb" ,bdb-5.3))) (arguments `(#:tests? #f #:configure-flags @@ -102,20 +100,6 @@ #:make-flags '("STRIP=") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-configure - (lambda* (#:key inputs native-inputs #:allow-other-keys) - ;; Replace outdated config.sub and config.guess: - (with-directory-excursion "build" - (for-each (lambda (file) - (install-file (string-append - (assoc-ref - (or native-inputs inputs) "automake") - "/share/automake-" - ,(version-major+minor - (package-version automake)) - "/" file) ".")) - '("config.sub" "config.guess"))) - #t)) ,@(if (%current-target-system) '((add-before 'configure 'fix-cross-gcc (lambda* (#:key target #:allow-other-keys) -- cgit v1.2.3 From f0e810110bf44b6c5c61bf0cdcadc836a7fd459d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Feb 2020 20:18:52 +0100 Subject: gnu: WebKitGTK: Remove obsolete patch. This patch was added in eb5f3ea1003f76545b197b1e779e2967ec379475 and no longer necessary since the update to 2.26.3 in f32ca55778eb049e83210aedcbeb4df2c98e587a. * gnu/packages/patches/webkitgtk-icu-65.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/webkit.scm (webkitgtk)[source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/patches/webkitgtk-icu-65.patch | 47 ----------------------------- gnu/packages/webkit.scm | 1 - 3 files changed, 49 deletions(-) delete mode 100644 gnu/packages/patches/webkitgtk-icu-65.patch diff --git a/gnu/local.mk b/gnu/local.mk index 65b62e2e58..60b1ce9248 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1480,7 +1480,6 @@ dist_patch_DATA = \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/weasyprint-library-paths.patch \ - %D%/packages/patches/webkitgtk-icu-65.patch \ %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ diff --git a/gnu/packages/patches/webkitgtk-icu-65.patch b/gnu/packages/patches/webkitgtk-icu-65.patch deleted file mode 100644 index 66819c566b..0000000000 --- a/gnu/packages/patches/webkitgtk-icu-65.patch +++ /dev/null @@ -1,47 +0,0 @@ -Fix build with ICU 65. - -Taken from upstream: -https://bugs.webkit.org/show_bug.cgi?id=202600 -https://trac.webkit.org/r250747 - -diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp -index 18e7f13cd615..c584f1a0cb7e 100644 ---- a/Source/WTF/wtf/URLHelpers.cpp -+++ b/Source/WTF/wtf/URLHelpers.cpp -@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt - Optional previousCodePoint; - while (i < length) { - UChar32 c; -- U16_NEXT(buffer, i, length, c) -+ U16_NEXT(buffer, i, length, c); - UErrorCode error = U_ZERO_ERROR; - UScriptCode script = uscript_getScript(c, &error); - if (error != U_ZERO_ERROR) { -diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp -index 2443e24c9bc4..1fbb3a716006 100644 ---- a/Source/WebCore/dom/Document.cpp -+++ b/Source/WebCore/dom/Document.cpp -@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -5019,7 +5019,7 @@ ExceptionOr> Document::parseQualifiedName(cons - - for (unsigned i = 0; i < length; ) { - UChar32 c; -- U16_NEXT(qualifiedName, i, length, c) -+ U16_NEXT(qualifiedName, i, length, c); - if (c == ':') { - if (sawColon) - return Exception { InvalidCharacterError }; diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index b3a87e798a..aeead92871 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -126,7 +126,6 @@ engine that uses Wayland for graphics output.") (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) - (patches (search-patches "webkitgtk-icu-65.patch")) (sha256 (base32 "04g6y0sv04d20bw401myq3k828ikysjhx383ly81vh9wji9i3mdd")))) -- cgit v1.2.3 From a1caea07f6b509e52c16869a9c74ec4503b67139 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Feb 2020 09:35:32 +0100 Subject: gnu: commencement: Avoid hard-coded GCC version numbers. * gnu/packages/commencement.scm (gcc-mesboot1, gcc-mesboot): Use 'package-version' instead of hard-coding the version number. --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ced13eb075..8f24815b28 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -934,7 +934,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (package (inherit gcc-mesboot0) (name "gcc-mesboot1") - (version "4.7.4") + (version (package-version gcc-4.7)) (source (bootstrap-origin (origin (inherit (package-source gcc-4.7)) (patches (search-patches "gcc-boot-4.7.4.patch"))))) @@ -1261,7 +1261,7 @@ exec " gcc "/bin/" program (package (inherit gcc-mesboot1) (name "gcc-mesboot") - (version "4.9.4") + (version (package-version gcc-4.9)) (source (bootstrap-origin (package-source gcc-4.9))) (native-inputs `(("binutils" ,binutils-mesboot) ("gcc-wrapper" ,gcc-mesboot1-wrapper) -- cgit v1.2.3 From 558b0bbe291b2f2cd38b7f4eadc827e2ed102c54 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Feb 2020 09:40:51 +0100 Subject: gnu: commencement: Rationalize search path handling. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit ensures that only packages that correspond to compilers have a search path set. It also reduces manual handling of search path environment variables. * gnu/packages/commencement.scm (tcc-boot0)[native-search-paths]: Remove copy/pasted comment. (gcc-core-mesboot)[arguments]: In 'install2' phase, do not copy TCC/include to OUT/include. [native-search-paths]: Remove leading slash in "lib/gcc-lib/…" directory name. (mesboot-headers)[native-search-paths]: Remove. (glibc-mesboot0)[native-search-paths]: Remove. (gcc-mesboot0)[native-inputs]: Reorder so that we have libc, then kernel-headers, then gcc. [arguments]: Rewrite 'setenv' phase to only set CONFIG_SHELL and create 'config.cache'. (gcc-mesboot1)[native-inputs]: Reorder similarly. [arguments]: In 'setenv' phase, only set CONFIG_SHELL, C_INCLUDE_PATH, and CPLUS_INCLUDE_PATH. (glibc-headers-mesboot)[arguments]: In 'setenv' phase, replace references to '%build-inputs' by references to 'inputs'; simplify setting of CONFIG_SHELL and SHELL; simplify patching of /bin/pwd in the "configure" file; leave C_INCLUDE_PATH and LIBRARY_PATH unset. (glibc-mesboot)[native-search-paths]: Remove. (gcc-mesboot)[native-inputs]: Reorder. [arguments]: Remove clause for #:phases that would change the 'setenv' phase. --- gnu/packages/commencement.scm | 196 ++++++++++-------------------------------- 1 file changed, 45 insertions(+), 151 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8f24815b28..e26bc1cec2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2017 Mark H Weaver @@ -144,11 +144,6 @@ (lambda _ (invoke "sh" "install.sh")))))) (native-search-paths - ;; Use the language-specific variables rather than 'CPATH' because they - ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. - ;; The intent is to allow headers that are in the search path to be - ;; treated as "system headers" (headers exempt from warnings) just like - ;; the typical /usr/include headers on an FHS system. (list (search-path-specification (variable "C_INCLUDE_PATH") (files '("share/mes/include"))) @@ -262,11 +257,6 @@ (lambda _ (invoke "sh" "install.sh")))))) (native-search-paths - ;; Use the language-specific variables rather than 'CPATH' because they - ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. - ;; The intent is to allow headers that are in the search path to be - ;; treated as "system headers" (headers exempt from warnings) just like - ;; the typical /usr/include headers on an FHS system. (list (search-path-specification (variable "C_INCLUDE_PATH") (files '("include"))) @@ -623,18 +613,14 @@ ac_cv_c_float_format='IEEE (little-endian)' (string-append tcc-lib "/libc+gnu.o") (string-append tcc-lib "/libtcc1.o")) (invoke "ls" "-ltrF" gcc-dir) - (copy-recursively (string-append tcc "/include") - (string-append out "/include")) #t)))))) (native-search-paths - ;; Use the language-specific variables rather than 'CPATH' because they - ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. - ;; The intent is to allow headers that are in the search path to be - ;; treated as "system headers" (headers exempt from warnings) just like - ;; the typical /usr/include headers on an FHS system. (list (search-path-specification (variable "C_INCLUDE_PATH") - (files '("include" "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"))) + (files '("include" + + ;; Needed to get things like GCC's . + "lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"))) (search-path-specification (variable "LIBRARY_PATH") (files '("lib"))))))) @@ -665,16 +651,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (mkdir-p include) (copy-recursively "include" out) (copy-recursively headers out) - #t)))))) - (native-search-paths - ;; Use the language-specific variables rather than 'CPATH' because they - ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. - ;; The intent is to allow headers that are in the search path to be - ;; treated as "system headers" (headers exempt from warnings) just like - ;; the typical /usr/include headers on an FHS system. - (list (search-path-specification - (variable "C_INCLUDE_PATH") - (files '("include"))))))) + #t)))))))) (define glibc-mesboot0 ;; GNU C Library 2.2.5 is the most recent glibc that we managed to build @@ -756,67 +733,37 @@ ac_cv_c_float_format='IEEE (little-endian)' (lambda* (#:key configure-flags #:allow-other-keys) (format (current-error-port) "running ./configure ~a\n" (string-join configure-flags)) - (apply invoke "./configure" configure-flags)))))) - (native-search-paths - ;; Use the language-specific variables rather than 'CPATH' because they - ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. - ;; The intent is to allow headers that are in the search path to be - ;; treated as "system headers" (headers exempt from warnings) just like - ;; the typical /usr/include headers on an FHS system. - (list (search-path-specification - (variable "C_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "CPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib"))))))) + (apply invoke "./configure" configure-flags)))))))) (define gcc-mesboot0 (package (inherit gcc-core-mesboot) (name "gcc-mesboot0") (native-inputs `(("binutils" ,binutils-mesboot0) - ("gcc" ,gcc-core-mesboot) + + ;; Packages are given in an order that's relevant for + ;; #include_next purposes. ("libc" ,glibc-mesboot0) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("gcc" ,gcc-core-mesboot) ("bash" ,%bootstrap-coreutils&co) ("coreutils" ,%bootstrap-coreutils&co) ("diffutils" ,diffutils-mesboot) - ("kernel-headers" ,%bootstrap-linux-libre-headers) ("make" ,make-mesboot0))) (arguments (substitute-keyword-arguments (package-arguments gcc-core-mesboot) ((#:phases phases) `(modify-phases ,phases (replace 'setenv - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (gcc (assoc-ref %build-inputs "gcc")) - (glibc (assoc-ref %build-inputs "libc")) - (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) - (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) - (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) - (setenv "C_INCLUDE_PATH" (string-append - gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include" - ":" kernel-headers "/include" - ":" glibc "/include")) - (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) - (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) - ;; FIXME: add glibc dirs to paths manually - (setenv "LIBRARY_PATH" (string-join - (list (string-append glibc "/lib") - (getenv "LIBRARY_PATH")) - ":")) - (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) - (with-output-to-file "config.cache" - (lambda _ - (display " + (lambda _ + (setenv "CONFIG_SHELL" (which "sh")) + (with-output-to-file "config.cache" + (lambda _ + (display " ac_cv_c_float_format='IEEE (little-endian)' "))) - #t))) + #t)) (replace 'install2 (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -942,13 +889,14 @@ ac_cv_c_float_format='IEEE (little-endian)' ("mpfr-source" ,(package-source mpfr-boot)) ("mpc-source" ,(package-source mpc-boot)))) (native-inputs `(("binutils" ,binutils-mesboot) - ("gcc" ,gcc-mesboot0) + ("libc" ,glibc-mesboot0) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("gcc" ,gcc-mesboot0) ("bash" ,%bootstrap-coreutils&co) ("coreutils" ,%bootstrap-coreutils&co) ("diffutils" ,diffutils-mesboot) - ("kernel-headers" ,%bootstrap-linux-libre-headers) ("make" ,make-mesboot))) (arguments (substitute-keyword-arguments (package-arguments gcc-core-mesboot) @@ -990,24 +938,18 @@ ac_cv_c_float_format='IEEE (little-endian)' #t))) (delete 'remove-info) (replace 'setenv - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (binutils (assoc-ref %build-inputs "binutils")) - (bash (assoc-ref %build-inputs "bash")) - (gcc (assoc-ref %build-inputs "gcc")) - (glibc (assoc-ref %build-inputs "libc")) - (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) - (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) - (setenv "C_INCLUDE_PATH" (string-append - gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include" - ":" kernel-headers "/include" - ":" glibc "/include" - ":" (getcwd) "/mpfr/src")) - (setenv "LIBRARY_PATH" (string-append glibc "/lib" - ":" gcc "/lib")) - (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) - (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) - #t))) + (lambda _ + (setenv "CONFIG_SHELL" (which "sh")) + + ;; Allow MPFR headers to be found. + (setenv "C_INCLUDE_PATH" + (string-append (getcwd) "/mpfr/src:" + (getenv "C_INCLUDE_PATH"))) + + ;; Set the C++ search path so that C headers can be found as + ;; libstdc++ is being compiled. + (setenv "CPLUS_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) + #t)) (delete 'install2))) ((#:configure-flags configure-flags) `(let ((out (assoc-ref %outputs "out")) @@ -1154,22 +1096,18 @@ exec " gcc "/bin/" program ((#:phases phases) `(modify-phases ,phases (replace 'setenv - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (headers (assoc-ref %build-inputs "headers")) - (bash (assoc-ref %build-inputs "bash")) - (coreutils (assoc-ref %build-inputs "coreutils")) - (libc (assoc-ref %build-inputs "libc")) - (gcc (assoc-ref %build-inputs "gcc")) + (lambda* (#:key inputs #:allow-other-keys) + (let* ((headers (assoc-ref inputs "headers")) + (libc (assoc-ref inputs "libc")) + (gcc (assoc-ref inputs "gcc")) (cppflags (string-append " -I " (getcwd) "/nptl/sysdeps/pthread/bits" " -D BOOTSTRAP_GLIBC=1")) (cflags (string-append " -L " (getcwd) " -L " libc "/lib"))) (setenv "libc_cv_friendly_stddef" "yes") - (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) - (setenv "SHELL" (getenv "CONFIG_SHELL")) - (format (current-error-port) "CONFIG_SHELL=~s\n" (getenv "CONFIG_SHELL")) + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "SHELL" (which "sh")) (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) @@ -1177,10 +1115,7 @@ exec " gcc "/bin/" program ;; avoid -fstack-protector (setenv "libc_cv_ssp" "false") (substitute* "configure" - (("/bin/pwd") (string-append coreutils "/bin/pwd"))) - (setenv "C_INCLUDE_PATH" (string-append libc "/include" - headers "/include")) - (setenv "LIBRARY_PATH" (string-append libc "/lib")) + (("/bin/pwd") "pwd")) #t))) (replace 'install (lambda* (#:key outputs make-flags #:allow-other-keys) @@ -1240,22 +1175,7 @@ exec " gcc "/bin/" program (install-flags (cons "install" make-flags))) (apply invoke "make" install-flags) (copy-recursively kernel-headers out) - #t)))))))) - (native-search-paths ;; FIXME: move to glibc-mesboot0 - ;; Use the language-specific variables rather than 'CPATH' because they - ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. - ;; The intent is to allow headers that are in the search path to be - ;; treated as "system headers" (headers exempt from warnings) just like - ;; the typical /usr/include headers on an FHS system. - (list (search-path-specification - (variable "C_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "CPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib"))))))) + #t)))))))))) (define gcc-mesboot (package @@ -1264,14 +1184,15 @@ exec " gcc "/bin/" program (version (package-version gcc-4.9)) (source (bootstrap-origin (package-source gcc-4.9))) (native-inputs `(("binutils" ,binutils-mesboot) + + ("libc" ,glibc-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) ("gcc-wrapper" ,gcc-mesboot1-wrapper) ("gcc" ,gcc-mesboot1) - ("libc" ,glibc-mesboot) ("bash" ,%bootstrap-coreutils&co) ("coreutils" ,%bootstrap-coreutils&co) ("diffutils" ,diffutils-mesboot) - ("kernel-headers" ,%bootstrap-linux-libre-headers) ("make" ,make-mesboot))) (arguments `(#:validate-runpath? #f @@ -1314,34 +1235,7 @@ exec " gcc "/bin/" program "--disable-libstdcxx-pch" ;; for libcpp ... - "--disable-build-with-cxx"))) - ((#:phases phases) - `(modify-phases ,phases - (replace 'setenv - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (binutils (assoc-ref %build-inputs "binutils")) - (bash (assoc-ref %build-inputs "bash")) - (gcc (assoc-ref %build-inputs "gcc")) - (glibc (assoc-ref %build-inputs "libc")) - (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) - (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) - (setenv "C_INCLUDE_PATH" (string-append - gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.7.4/include" - ":" kernel-headers "/include" - ":" glibc "/include" - ":" (getcwd) "/mpfr/src")) - (setenv "CPLUS_INCLUDE_PATH" (string-append - gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.7.4/include" - ":" kernel-headers "/include" - ":" glibc "/include" - ":" (getcwd) "/mpfr/src")) - (setenv "LIBRARY_PATH" (string-append glibc "/lib" - ":" gcc "/lib")) - (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) - (format (current-error-port) "CPLUS_INCLUDE_PATH=~a\n" (getenv "CPLUS_INCLUDE_PATH")) - (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) - #t)))))))))) + "--disable-build-with-cxx")))))))) (define gcc-mesboot-wrapper ;; We need this so gcc-mesboot can be used to create shared binaries that -- cgit v1.2.3 From 2073b55e6b964cb8ca15e8c74cb32dac00f05f0d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Feb 2020 15:32:00 +0100 Subject: gnu: gcc: Switch back to using 'C_INCLUDE_PATH' instead of 'CPATH'. Fixes . Initially reported by Julien Lepiller . * gnu/packages/base.scm (make-gcc-libc): Remove 'treat-glibc-as-system-header' phase from 'arguments'. * gnu/packages/commencement.scm (gcc-final): Likewise. * gnu/packages/gcc.scm (gcc-4.7)[arguments]: Add "include/c++" to 'CPLUS_INCLUDE_PATH'. (gcc-6)[native-search-paths]: Remove. * gnu/packages/make-bootstrap.scm (gcc-for-bootstrap): Remove 'native-search-paths' and 'arguments'. * gnu/packages/patches/python-2.7-search-paths.patch, gnu/packages/patches/python-3-search-paths.patch: Replace "CPATH" with "C_INCLUDE_PATH". * guix/build-system/cmake.scm (lower): When not cross-compiling, move INPUTS from the 'host-inputs' field to the 'build-inputs' field of the bag, right after NATIVE-INPUTS. * guix/build-system/glib-or-gtk.scm (lower): Likewise. * guix/build-system/gnu.scm (lower): Likewise. * guix/build-system/meson.scm (lower): Likewise. --- gnu/packages/base.scm | 19 +++------------- gnu/packages/commencement.scm | 9 -------- gnu/packages/gcc.scm | 18 +++++----------- gnu/packages/make-bootstrap.scm | 25 ++-------------------- gnu/packages/patches/python-2.7-search-paths.patch | 4 ++-- gnu/packages/patches/python-3-search-paths.patch | 4 ++-- guix/build-system/cmake.scm | 5 +++-- guix/build-system/glib-or-gtk.scm | 16 +++++++------- guix/build-system/gnu.scm | 10 +++++++-- guix/build-system/meson.scm | 14 ++++++------ 10 files changed, 40 insertions(+), 84 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 45f6cf79ba..05a48ce7e0 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2019 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver @@ -981,21 +981,8 @@ with the Linux kernel.") (package-name libc) "-" (package-version libc))) (arguments - (substitute-keyword-arguments - (ensure-keyword-arguments (package-arguments base-gcc) - '(#:implicit-inputs? #f)) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'treat-glibc-as-system-header - (lambda _ - (let ((libc (assoc-ref %build-inputs "libc"))) - ;; GCCs build processes requires that the libc - ;; we're building against is on the system header - ;; search path. - (for-each (lambda (var) - (setenv var (string-append libc "/include"))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) - #t))))))) + (ensure-keyword-arguments (package-arguments base-gcc) + '(#:implicit-inputs? #f))) (native-inputs `(,@(package-native-inputs base-gcc) ,@(append (fold alist-delete (%final-inputs) '("libc" "libc:static"))) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index e26bc1cec2..2a0a83ad49 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2193,15 +2193,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" char-set:letter) ,(package-name lib))) (list gmp-6.0 mpfr mpc)) - #t))) - (add-before 'configure 'treat-glibc-as-system-header - (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "libc"))) - ;; Make sure Glibc is treated as a "system header" so - ;; #include_next does the right thing. - (for-each (lambda (var) - (setenv var (string-append libc "/include"))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) #t)))))))) ;; This time we want Texinfo, so we get the manual. Add diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 94f7e15382..69bac8dd0c 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge @@ -340,7 +340,9 @@ where the OS part is overloaded to denote a specific ABI---into GCC (files '("include"))) (search-path-specification (variable "CPLUS_INCLUDE_PATH") - (files '("include"))) + ;; Add 'include/c++' here so that 's "#include_next + ;; " finds GCC's , not libc's. + (files '("include/c++" "include"))) (search-path-specification (variable "LIBRARY_PATH") (files '("lib" "lib64"))))) @@ -476,17 +478,7 @@ Go. It also includes runtime support libraries for these languages.") "gcc-5.0-libvtv-runpath.patch")))) (inputs `(("isl" ,isl) - ,@(package-inputs gcc-4.7))) - - (native-search-paths - ;; We have to use 'CPATH' for GCC > 5, not 'C_INCLUDE_PATH' & co., due to - ;; . - (list (search-path-specification - (variable "CPATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))))) + ,@(package-inputs gcc-4.7))))) (define-public gcc-7 (package diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 0144a6e9a2..eea59758fd 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Mark H Weaver @@ -95,32 +95,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (package (inherit gcc) (outputs '("out")) ;all in one so libgcc_s is easily found - (native-search-paths - ;; Set CPLUS_INCLUDE_PATH so GCC is able to find the libc - ;; C++ headers. - (cons (search-path-specification - (variable "CPLUS_INCLUDE_PATH") - (files '("include"))) - (package-native-search-paths gcc))) (inputs `( ;; Distinguish the name so we can refer to it below. ("bootstrap-libc" ,(glibc-for-bootstrap glibc)) ("libc:static" ,(glibc-for-bootstrap glibc) "static") - ,@(package-inputs gcc))) - (arguments - (substitute-keyword-arguments (package-arguments gcc) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'treat-glibc-as-system-header - (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "bootstrap-libc"))) - ;; GCCs build processes requires that the libc - ;; we're building against is on the system header - ;; search path. - (for-each (lambda (var) - (setenv var (string-append libc "/include"))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) - #t)))))))))) + ,@(package-inputs gcc)))))) (define (package-with-relocatable-glibc p) "Return a variant of P that uses the libc as defined by diff --git a/gnu/packages/patches/python-2.7-search-paths.patch b/gnu/packages/patches/python-2.7-search-paths.patch index 5a345c7691..3318f44d23 100644 --- a/gnu/packages/patches/python-2.7-search-paths.patch +++ b/gnu/packages/patches/python-2.7-search-paths.patch @@ -1,4 +1,4 @@ -Make sure the build system honors CPATH and LIBRARY_PATH when +Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when looking for headers and libraries. --- Python-2.7.10/setup.py 2015-10-07 18:33:18.125153186 +0200 @@ -10,7 +10,7 @@ looking for headers and libraries. + # Always honor these variables. + if not cross_compiling: + lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('CPATH', '').split(os.pathsep) ++ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + else: + lib_dirs = os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep) + inc_dirs = os.getenv('CROSS_CPATH', '').split(os.pathsep) diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index aaf7236631..612201d1f2 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -1,4 +1,4 @@ -Make sure the build system honors CPATH and LIBRARY_PATH when +Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when looking for headers and libraries. --- a/setup.py 2015-10-07 23:32:58.891329173 +0200 @@ -10,7 +10,7 @@ looking for headers and libraries. - self.lib_dirs = self.compiler.library_dirs + system_lib_dirs - self.inc_dirs = self.compiler.include_dirs + system_include_dirs + self.lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ self.inc_dirs = os.getenv('CPATH', '').split(os.pathsep) ++ self.inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) else: # Add the sysroot paths. 'sysroot' is a compiler option used to # set the logical path of the standard system headers and diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 1fc0931a27..29259c5785 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2020 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2017 Ricardo Wurmus ;;; @@ -72,6 +72,7 @@ '()) ,@`(("cmake" ,cmake)) ,@native-inputs + ,@(if target '() inputs) ,@(if target ;; Use the standard cross inputs of ;; 'gnu-build-system'. @@ -79,7 +80,7 @@ '()) ;; Keep the standard inputs of 'gnu-build-system'. ,@(standard-packages))) - (host-inputs inputs) + (host-inputs (if target inputs '())) ;; The cross-libc is really a target package, but for bootstrapping ;; reasons, we can't put it in 'host-inputs'. Namely, 'cross-gcc' is a diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 8de7dfbfc2..fb1f8fb930 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Federico Beffa ;;; @@ -92,15 +92,15 @@ (bag (name name) (system system) - (host-inputs `(,@(if source - `(("source" ,source)) - '()) - ,@inputs)) - (build-inputs `(("glib:bin" ,glib "bin") ; to compile schemas + (host-inputs (if source + `(("source" ,source)) + '())) + (build-inputs `(,@native-inputs + ,@inputs + ("glib:bin" ,glib "bin") ; to compile schemas ,@(if implicit-inputs? (standard-packages) - '()) - ,@native-inputs)) + '()))) (outputs outputs) (build glib-or-gtk-build) (arguments (strip-keyword-arguments private-keywords arguments))))) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 3cc89f8852..6e66f5ffce 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -296,13 +296,19 @@ standard packages used as implicit inputs of the GNU build system." `(("source" ,source)) '()) ,@native-inputs + + ;; When not cross-compiling, ensure implicit inputs come + ;; last. That way, libc headers come last, which allows + ;; #include_next to work correctly; see + ;; . + ,@(if target '() inputs) ,@(if (and target implicit-cross-inputs?) (standard-cross-packages target 'host) '()) ,@(if implicit-inputs? (standard-packages) '()))) - (host-inputs inputs) + (host-inputs (if target inputs '())) ;; The cross-libc is really a target package, but for bootstrapping ;; reasons, we can't put it in 'host-inputs'. Namely, 'cross-gcc' is a diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index b29f2f4ecf..b68bcb80de 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -74,13 +74,13 @@ (system system) (build-inputs `(("meson" ,meson) ("ninja" ,ninja) - ,@native-inputs)) - (host-inputs `(,@(if source - `(("source" ,source)) - '()) - ,@inputs - ;; Keep the standard inputs of 'gnu-build-system'. - ,@(standard-packages))) + ,@native-inputs + ,@inputs + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages))) + (host-inputs (if source + `(("source" ,source)) + '())) (outputs outputs) (build meson-build) (arguments (strip-keyword-arguments private-keywords arguments))))) -- cgit v1.2.3 From 22236ceb648e152651b392337441bba0ab957db6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 23:03:30 +0100 Subject: gnu: git, git-minimal: Do not retain a reference to 'bash-for-tests'. Fixes . Reported by Maxim Cournoyer . * gnu/packages/version-control.scm (git, git-minimal)[inputs]: Move BASH ... [native-inputs]: ... here. Add BASH-MINIMAL. --- gnu/packages/version-control.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ac1d68f8f3..3333cd5778 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 André -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2018 Sou Bunnbu @@ -163,6 +163,10 @@ as well as the classic centralized workflow.") (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) + ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests, + ;; see . + ("bash" ,bash-minimal) + ("bash-for-tests" ,bash) ("gettext" ,gettext-minimal) ("git-manpages" ,(origin @@ -185,10 +189,6 @@ as well as the classic centralized workflow.") ("python" ,python-2) ; CAVEAT: incompatible with python-3 according to INSTALL ("zlib" ,zlib) - ;; Note: we keep this in inputs rather than native-inputs to work around - ;; a problem in 'patch-shebangs'; see . - ("bash-for-tests" ,bash) - ;; For PCRE support in git grep (USE_LIBPCRE2). ("pcre" ,pcre2) @@ -539,15 +539,16 @@ everything from small to very large projects with speed and efficiency.") `(,perl ,@lst)))) (outputs '("out")) (native-inputs - `(("native-perl" ,perl) + `(("bash" ,bash-minimal) + ("bash-for-tests" ,bash) + ("native-perl" ,perl) ("gettext" ,gettext-minimal))) (inputs `(("curl" ,curl) ;for HTTP(S) access ("expat" ,expat) ;for 'git push' over HTTP(S) ("openssl" ,openssl) ("perl" ,perl) - ("zlib" ,zlib) - ("bash-for-tests" ,bash))))) + ("zlib" ,zlib))))) (define-public libgit2 (package -- cgit v1.2.3 From d930b0261ca1479505109332db28b0e3df452848 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Feb 2020 16:20:53 +0100 Subject: gnu: inkscape: Remove obsolete workaround. * gnu/packages/inkscape.scm (inkscape)[arguments]: Remove phase "dont-use-system-includes". --- gnu/packages/inkscape.scm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 0bd8b9496b..26d4642547 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -100,13 +100,6 @@ "std::unique_ptr(new GlobalParams())") (("new GlobalParams\\(poppler_datadir\\)") "std::unique_ptr(new GlobalParams(poppler_datadir))")) - #t)) - (add-before 'configure 'dont-use-system-includes - (lambda _ - ;; Don't add redundant -isystem includes which confuses GCC7. - (substitute* "CMakeScripts/DefineDependsandFlags.cmake" - (("include_directories\\(SYSTEM") - "include_directories(")) #t))))) (home-page "https://inkscape.org/") (synopsis "Vector graphics editor") -- cgit v1.2.3 From 7bfb7a596493346ca2c2ba993e871e92537c2956 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Feb 2020 17:06:39 +0100 Subject: gnu: sdl2: Remove obsolete workaround. * gnu/packages/sdl.scm (sdl2)[arguments]: Remove #:make-flags. --- gnu/packages/sdl.scm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 81393bf1a3..8ac9213db3 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -130,15 +130,6 @@ joystick, and graphics hardware.") ((#:configure-flags flags) `(append '("--disable-wayland-shared" "--enable-video-kmsdrm" "--disable-kmsdrm-shared") - ,flags)) - ((#:make-flags flags ''()) - ;; Add the Fcitx header files to GCCs "system header" search path - ;; in order to suppress compiler warnings induced by those: - ;; .../include/fcitx-utils/utarray.h:178:9: error: ISO C90 forbids - ;; mixed declarations and code [-Werror=declaration-after-statement] - `(append (list (string-append "C_INCLUDE_PATH=" - (assoc-ref %build-inputs "fcitx") - "/include")) ,flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems -- cgit v1.2.3 From dfc8ccbf5da96a67eb1cade499f0def21e7fdb02 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 31 Dec 2019 09:56:51 +0100 Subject: system: Stop using canonical-package. Usage of canonical-package outside of thunked fields breaks cross-compilation, see: https://lists.gnu.org/archive/html/guix-devel/2019-12/msg00410.html. * gnu/installer.scm (installer-program): Remove canonical-package. * gnu/services/base.scm (): Ditto, (%base-services): ditto. * gnu/services/xorg.scm: Remove useless canonical-package import. * gnu/system.scm (%base-packages): Remove canonical-package. * gnu/system/install.scm (%installation-services): Ditto, (installation-os): ditto. * gnu/system/locale.scm (single-locale-directory): Ditto. --- gnu/installer.scm | 24 ++++++++++++------------ gnu/services/base.scm | 10 ++++------ gnu/services/xorg.scm | 2 +- gnu/system.scm | 9 ++------- gnu/system/install.scm | 7 +++---- gnu/system/locale.scm | 2 +- 6 files changed, 23 insertions(+), 31 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 1676a91801..6766037aae 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -291,18 +291,18 @@ selected keymap." (define set-installer-path ;; Add the specified binary to PATH for later use by the installer. #~(let* ((inputs - '#$(append (list bash ;start subshells - connman ;call connmanctl - cryptsetup - dosfstools ;mkfs.fat - e2fsprogs ;mkfs.ext4 - btrfs-progs ;mkfs.btrfs - jfsutils ;jfs_mkfs - kbd ;chvt - guix ;guix system init call - util-linux ;mkwap - shadow) - (map canonical-package (list coreutils))))) + '#$(list bash ;start subshells + connman ;call connmanctl + cryptsetup + dosfstools ;mkfs.fat + e2fsprogs ;mkfs.ext4 + btrfs-progs + jfsutils ;jfs_mkfs + kbd ;chvt + guix ;guix system init call + util-linux ;mkwap + shadow + coreutils))) (with-output-to-port (%make-void-port "w") (lambda () (set-path-environment-variable "PATH" '("bin" "sbin") inputs))))) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 0c154d1c4e..6988edc249 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -45,7 +45,7 @@ #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools)) #:use-module (gnu packages bash) #:use-module ((gnu packages base) - #:select (canonical-package coreutils glibc glibc-utf8-locales)) + #:select (coreutils glibc glibc-utf8-locales)) #:use-module (gnu packages package-management) #:use-module ((gnu packages gnupg) #:select (guile-gcrypt)) #:use-module (gnu packages linux) @@ -1212,7 +1212,7 @@ the tty to run, among other things." (name-services nscd-configuration-name-services ;list of (default '())) (glibc nscd-configuration-glibc ; - (default (canonical-package glibc)))) + (default glibc))) (define-record-type* nscd-cache make-nscd-cache nscd-cache? @@ -2445,9 +2445,7 @@ to handle." (rules (list lvm2 fuse alsa-utils crda)))) (service special-files-service-type - `(("/bin/sh" ,(file-append (canonical-package bash) - "/bin/sh")) - ("/usr/bin/env" ,(file-append (canonical-package coreutils) - "/bin/env")))))) + `(("/bin/sh" ,(file-append bash "/bin/sh")) + ("/usr/bin/env" ,(file-append coreutils "/bin/env")))))) ;;; base.scm ends here diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 73a32e4b02..881521cccf 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -29,7 +29,7 @@ #:use-module (gnu system keyboard) #:use-module (gnu services base) #:use-module (gnu services dbus) - #:use-module ((gnu packages base) #:select (canonical-package)) + #:use-module (gnu packages base) #:use-module (gnu packages guile) #:use-module (gnu packages xorg) #:use-module (gnu packages fonts) diff --git a/gnu/system.scm b/gnu/system.scm index 01baa248a2..d3f2b82519 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -590,18 +590,13 @@ of PROVENANCE-SERVICE-TYPE to its services." bash-completion - ;; XXX: We don't use (canonical-package guile-2.2) here because that - ;; would create a collision in the global profile between the GMP - ;; variant propagated by 'guile-final' and the GMP variant propagated - ;; by 'gnutls', itself propagated by 'guix'. guile-2.2 guile-readline guile-colorized ;; The packages below are also in %FINAL-INPUTS, so take them from ;; there to avoid duplication. - (map canonical-package - (list bash coreutils findutils grep sed - diffutils patch gawk tar gzip bzip2 xz lzip)))) + (list bash coreutils findutils grep sed + diffutils patch gawk tar gzip bzip2 xz lzip))) (define %default-issue ;; Default contents for /etc/issue. diff --git a/gnu/system/install.scm b/gnu/system/install.scm index c15c2c7814..0dc26b2871 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -384,8 +384,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m ;; Having /bin/sh is a good idea. In particular it allows Tramp ;; connections to this system to work. (service special-files-service-type - `(("/bin/sh" ,(file-append (canonical-package bash) - "/bin/sh")))) + `(("/bin/sh" ,(file-append bash "/bin/sh")))) ;; Loopback device, needed by OpenSSH notably. (service static-networking-service-type @@ -408,7 +407,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (list bare-bones-os glibc-utf8-locales texinfo - (canonical-package guile-2.2)))))) + guile-2.2))))) (define %issue ;; Greeting. @@ -480,7 +479,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m ;; Explicitly allow for empty passwords. (base-pam-services #:allow-empty-passwords? #t)) - (packages (cons* (canonical-package glibc) ;for 'tzselect' & co. + (packages (cons* glibc ;for 'tzselect' & co. parted gptfdisk ddrescue fontconfig font-dejavu font-gnu-unifont diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm index 8466d5b07d..5baf80622c 100644 --- a/gnu/system/locale.scm +++ b/gnu/system/locale.scm @@ -86,7 +86,7 @@ or #f on failure." #f))) (define* (single-locale-directory locales - #:key (libc (canonical-package glibc))) + #:key (libc glibc)) "Return a directory containing all of LOCALES for LIBC compiled. Because locale data formats are incompatible when switching from one libc to -- cgit v1.2.3 From f30d84d32db0f4f6cb84e139868e1727a7dc0a51 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 12 Feb 2020 11:07:49 +0100 Subject: system: locale: Remove canonical-package call. This is a follow-up of dfc8ccbf5da96a67eb1cade499f0def21e7fdb02. Building locales using the same glibc as the one programs are linked against is enough. * gnu/system/locale.scm (%default-locale-libcs): Use the plain glibc package. --- gnu/system/locale.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm index 5baf80622c..c7a371e9bf 100644 --- a/gnu/system/locale.scm +++ b/gnu/system/locale.scm @@ -147,7 +147,7 @@ data format changes between libc versions." (define %default-locale-libcs ;; The libcs for which we build locales by default. - (list (canonical-package glibc))) + (list glibc)) (define %default-locale-definitions ;; Arbitrary set of locales that are built by default. They are here mostly -- cgit v1.2.3 From fd1fde6041b7f221bed114593944365d21cb925c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Feb 2020 23:26:38 +0100 Subject: gnu: rust: Switch to 'C_INCLUDE_PATH'. * gnu/packages/rust.scm (rust-1.19)[native-search-paths]: Remove "CPATH" and add "C_INCLUDE_PATH" and "CPLUS_INCLUDE_PATH" instead. --- gnu/packages/rust.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 8bed56ff72..97ba882553 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -413,8 +413,11 @@ test = { path = \"../libtest\" } ;; modules (see ). (native-search-paths (list (search-path-specification - (variable "CPATH") + (variable "C_INCLUDE_PATH") (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include/c++" "include"))) (search-path-specification (variable "LIBRARY_PATH") (files '("lib" "lib64"))))) -- cgit v1.2.3 From 89da127035737bdf922bc566970c5506c2e01b00 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 12 Feb 2020 18:29:19 +0100 Subject: gnu: cross-base: Switch back to 'CROSS_C_INCLUDE_PATH' & co. This is a followup to 2073b55e6b964cb8ca15e8c74cb32dac00f05f0d. * gnu/build/cross-toolchain.scm (%gcc-include-paths): Switch back to 'C_INCLUDE_PATH' & co. * gnu/packages/cross-base.scm (%gcc-include-paths): Likewise. (cross-gcc-arguments): Remove 'treat-glibc-as-system-header' phase. (cross-gcc)[native-inputs]: Reorder so that libc comes last. [search-paths]: Add "include/c++" for 'CROSS_CPLUS_INCLUDE_PATH'. * guix/build-system/gnu.scm (standard-cross-packages): Have "cross-gcc" appear both for 'host and 'target. --- gnu/build/cross-toolchain.scm | 9 ++++--- gnu/packages/cross-base.scm | 63 ++++++++++++++++++++++--------------------- guix/build-system/gnu.scm | 8 +++++- 3 files changed, 46 insertions(+), 34 deletions(-) diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index 6bdbdd5411..9746be3e50 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis @@ -38,8 +38,11 @@ (define %gcc-include-paths ;; Environment variables for header search paths. - ;; Note: See for why not 'C_INCLUDE_PATH' & co. - '("CPATH")) + ;; Note: See for why not 'CPATH'. + '("C_INCLUDE_PATH" + "CPLUS_INCLUDE_PATH" + "OBJC_INCLUDE_PATH" + "OBJCPLUS_INCLUDE_PATH")) (define %gcc-cross-include-paths ;; Search path for target headers when cross-compiling. diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 13237fb8a8..497d415f57 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis @@ -54,8 +54,11 @@ (define %gcc-include-paths ;; Environment variables for header search paths. - ;; Note: See for why not 'C_INCLUDE_PATH' & co. - '("CPATH")) + ;; Note: See for why not 'CPATH'. + '("C_INCLUDE_PATH" + "CPLUS_INCLUDE_PATH" + "OBJC_INCLUDE_PATH" + "OBJCPLUS_INCLUDE_PATH")) (define %gcc-cross-include-paths ;; Search path for target headers when cross-compiling. @@ -177,19 +180,7 @@ base compiler and using LIBC (which may be either a libc package or #f.)" ,flags)) flags)) ((#:phases phases) - `(cross-gcc-build-phases - ,target - (modify-phases ,phases - (add-before 'configure 'treat-glibc-as-system-header - (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "libc"))) - (when libc - ;; For GCC6 and later, make sure Glibc is treated as a "system - ;; header" such that #include_next does the right thing. - (for-each (lambda (var) - (setenv var (string-append libc "/include"))) - '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"))) - #t)))))))))) + `(cross-gcc-build-phases ,target ,phases)))))) (define (cross-gcc-patches xgcc target) "Return GCC patches needed for XGCC and TARGET." @@ -262,27 +253,31 @@ target that libc." #:binutils xbinutils)) ("binutils-cross" ,xbinutils) - ;; Call it differently so that the builder can check whether the "libc" - ;; input is #f. - ("libc-native" ,@(assoc-ref (%final-inputs) "libc")) - - ;; Remaining inputs. ,@(let ((inputs (append (package-inputs xgcc) - (alist-delete "libc" (%final-inputs))))) + (fold alist-delete (%final-inputs) + '("libc" "libc:static")) + + ;; Call it differently so that the builder can + ;; check whether the "libc" input is #f. + `(("libc-native" + ,@(assoc-ref (%final-inputs) "libc")) + ("libc-native:static" + ,@(assoc-ref (%final-inputs) + "libc:static")))))) (cond ((target-mingw? target) (if libc - `(("libc" ,libc) - ,@inputs) - `(("mingw-source" ,(package-source mingw-w64)) - ,@inputs))) + `(,@inputs + ("libc" ,libc)) + `(,@inputs + ("mingw-source" ,(package-source mingw-w64))))) (libc - `(("libc" ,libc) + `(,@inputs + ("libc" ,libc) ("libc:static" ,libc "static") ("xkernel-headers" ;the target headers ,@(assoc-ref (package-propagated-inputs libc) - "kernel-headers")) - ,@inputs)) + "kernel-headers")))) (else inputs))))) (inputs '()) @@ -294,7 +289,15 @@ target that libc." (map (lambda (variable) (search-path-specification (variable variable) - (files '("include")))) + + ;; Add 'include/c++' here so that 's + ;; "#include_next " finds GCC's + ;; , not libc's. + (files (match variable + ("CROSS_CPLUS_INCLUDE_PATH" + '("include/c++" "include")) + (_ + '("include")))))) %gcc-cross-include-paths))) (native-search-paths '()))) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 6e66f5ffce..d6613edb33 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -460,13 +460,19 @@ is one of `host' or `target'." (libc (module-ref cross 'cross-libc))) (case kind ((host) + ;; Cross-GCC appears once here, so that it's in $PATH... `(("cross-gcc" ,(gcc target #:xbinutils (binutils target) #:libc (libc target))) ("cross-binutils" ,(binutils target)))) ((target) (let ((libc (libc target))) - `(("cross-libc" ,libc) + ;; ... and once here, so that libstdc++ & co. are in + ;; CROSS_CPLUS_INCLUDE_PATH, etc. + `(("cross-gcc" ,(gcc target + #:xbinutils (binutils target) + #:libc libc)) + ("cross-libc" ,libc) ;; MinGW's libc doesn't have a "static" output. ,@(if (member "static" (package-outputs libc)) -- cgit v1.2.3 From bbd1e4e7ed0d6d2ff23f3bedd94641d5ad527d3e Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sun, 2 Feb 2020 16:26:44 +0000 Subject: gnu: cairo: Add support for XML. * gnu/packages/gtk.scm (cairo)[arguments]: Add enable-xml flag. Signed-off-by: Marius Bakke --- gnu/packages/gtk.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bc396a28f5..e5064a72e7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -147,6 +147,7 @@ tools have full access to view and control running applications.") (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html #:configure-flags '("--enable-tee" ;needed for GNU Icecat + "--enable-xml" ;for cairo-xml support "--disable-static"))) (synopsis "2D graphics library") (description -- cgit v1.2.3 From 4a894c2f096d39ef3a412576c120f0e6d09806d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Feb 2020 17:06:07 +0100 Subject: gnu: linux-libre: Remove obsolete workaround. * gnu/packages/linux.scm (make-linux-libre*)[arguments]: Do not change CPATH or CROSS_CPATH. --- gnu/packages/linux.scm | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 06ef1fa220..7793bf4d7c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -684,27 +684,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." #t)) (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) - ;; On AArch64 (at least), we need to remove glibc headers from - ;; CPATH (they are still available as "system headers"), so that - ;; the kernel can override uint64_t. See - ;; . This is also true when - ;; cross-compiling, except in that case, cross-libc must be - ;; removed from CROSS_CPATH. - (let ((var ,(if (%current-target-system) - "CROSS_CPATH" - "CPATH")) - (libc ,(if (%current-target-system) - "cross-libc" - "libc"))) - (setenv var - (string-join - (remove - (cut string-prefix? (assoc-ref inputs libc) <>) - (string-split (getenv var) #\:)) - ":")) - (format #t "environment variable `~a' changed to `~a'~%" - var (getenv var))) - ;; Avoid introducing timestamps (setenv "KCONFIG_NOTIMESTAMP" "1") (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH")) -- cgit v1.2.3 From 6388bed78cf6e9126b53e2a2ef832765a0373ab7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 15:48:18 +0100 Subject: gnu: efivar: Remove obsolete workaround. * gnu/packages/linux.scm (efivar)[arguments]: Remove phase 'kernel-headers-are-system-headers'. --- gnu/packages/linux.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7793bf4d7c..2bf7b4bee9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5062,14 +5062,7 @@ under OpenGL graphics workloads.") (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) #:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'kernel-headers-are-system-headers - (lambda* (#:key inputs #:allow-other-keys) - (let ((kernel-headers (assoc-ref inputs "kernel-headers"))) - ;; Make sure the kernel headers are treated as system headers - ;; to suppress a conflict between "util.h" and . - (setenv "C_INCLUDE_PATH" (string-append kernel-headers "/include")) - #t)))))) + (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 87d3e94d82111081a40ed2bea76e50575967af30 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 15:48:27 +0100 Subject: gnu: efibootmgr: Remove obsolete workaround. * gnu/packages/linux.scm (efibootmgr)[arguments]: Don't set C_INCLUDE_PATH in #:configure-flags. --- gnu/packages/linux.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2bf7b4bee9..e9a6675839 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5095,12 +5095,7 @@ interface to the variable facility of UEFI boot firmware.") ;; installed (known as OS_VENDOR in the code). ;; GRUB overrides this, as such it's only used if ;; nothing else is specified on the command line. - "EFIDIR=gnu" - ;; Treat kernel headers as system headers to prevent - ;; warnings about conflicting types. - (string-append "C_INCLUDE_PATH=" - (assoc-ref %build-inputs "kernel-headers") - "/include")) + "EFIDIR=gnu") #:phases (modify-phases %standard-phases (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 429243a43ab8891b1ca4adc36838576a3de0a50b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Jan 2020 13:14:47 +0100 Subject: gnu: linux-libre-headers: Update to 5.4.20. * gnu/packages/linux.scm (linux-libre-headers-4.19.56): Rename to ... (linux-libre-headers-5.4.20): ... this. Update to 5.4.20. (linux-libre-headers): Adjust accordingly. * gnu/packages/commencement.scm (rsync-boot0): New variable. (linux-libre-headers-boot0)[native-inputs]: Add RSYNC-BOOT0. --- gnu/packages/commencement.scm | 15 ++++++++++++++- gnu/packages/linux.scm | 8 ++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2a0a83ad49..89f9305970 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +46,7 @@ #:use-module (gnu packages hurd) #:use-module (gnu packages texinfo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages rsync) #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) @@ -1661,6 +1662,15 @@ exec " gcc "/bin/" program #:guile ,%bootstrap-guile #:tests? #f)))) +(define rsync-boot0 + (package + (inherit rsync) + (native-inputs `(("perl" ,perl-boot0))) + (inputs (%boot0-inputs)) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile)))) + (define linux-libre-headers-boot0 (mlambda () "Return Linux-Libre header files for the bootstrap environment." @@ -1680,6 +1690,9 @@ exec " gcc "/bin/" program ;; Flex and Bison are required since version 4.16. ("flex" ,flex-boot0) ("bison" ,bison-boot0) + + ;; Rsync is required since version 5.3. + ("rsync" ,rsync-boot0) ,@(%boot0-inputs)))))) (define with-boot0 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e9a6675839..b402b4920d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -543,11 +543,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The following package is used in the early bootstrap, and thus must be kept ;; stable and with minimal build requirements. -(define-public linux-libre-headers-4.19.56 - (make-linux-libre-headers "4.19.56" - "1zqiic55viy065lhnkmhn33sz3bbbr2ykbm5f92yzd8lpc9zl7yx")) +(define-public linux-libre-headers-5.4.20 + (make-linux-libre-headers "5.4.20" + "1qxhf6dmcwjblzx8fgn6vr10p38xw10iwh6d1y1v1mxb25y30b47")) -(define-public linux-libre-headers linux-libre-headers-4.19.56) +(define-public linux-libre-headers linux-libre-headers-5.4.20) ;;; -- cgit v1.2.3 From 645772e4b916dfb05c7f9d8f7dbf3d40e2e1b5f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Feb 2020 12:00:42 +0100 Subject: gnu: dnsmasq: Fix build with linux-libre-headers >= 5.2. * gnu/packages/dns.scm (dnsmasq)[source](modules, snippet): New fields. --- gnu/packages/dns.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 3a42a98bc4..652fc5968a 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016 ng0 ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Gregor Giesen ;;; Copyright © 2018 Oleg Pykhalov @@ -83,7 +83,17 @@ version ".tar.xz")) (sha256 (base32 - "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd")))) + "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd")) + (modules '((guix build utils))) + (snippet + '(begin + ;; The SIOCGSTAMP ioctl is defined in instead + ;; of starting with linux-libre-headers 5.2. + ;; Remove this for dnsmasq versions > 2.80. + (substitute* "src/dnsmasq.h" + (("#if defined\\(HAVE_LINUX_NETWORK\\)" all) + (string-append all "\n#include "))) + #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 3e3a37b2bcb1f23011fde8626559f83504177889 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Feb 2020 16:28:43 +0100 Subject: gnu: binutils: Update to 2.34. * gnu/packages/base.scm (binutils): Update to 2.34. [arguments]: Add #:make-flags. [properties]: New field. (binutils+documentation): New public variable. * gnu/packages/make-bootstrap.scm (%binutils-static)[arguments]: Inherit #:make-flags. --- gnu/packages/base.scm | 30 ++++++++++++++++++++++++++---- gnu/packages/make-bootstrap.scm | 6 +++++- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 05a48ce7e0..7e5df241a9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus @@ -399,14 +399,14 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.33.1") + (version "2.34") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c")) + "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49")) (patches (search-patches "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) @@ -431,7 +431,17 @@ change. GNU make offers many powerful extensions over the standard utility.") ;; Make sure 'ar' and 'ranlib' produce archives in a ;; deterministic fashion. - "--enable-deterministic-archives"))) + "--enable-deterministic-archives") + + ;; XXX: binutils 2.34 was mistakenly released without generated manuals: + ;; . To avoid a + ;; circular dependency on texinfo, prevent the build system from creating + ;; the manuals by calling "true" instead of "makeinfo"... + #:make-flags '("MAKEINFO=true"))) + + ;; ...and "hide" this package so that users who install binutils get the + ;; version with documentation defined below. + (properties '((hidden? . #t))) (synopsis "Binary utilities: bfd gas gprof ld") (description @@ -444,6 +454,18 @@ included.") (license gpl3+) (home-page "https://www.gnu.org/software/binutils/"))) +;; Work around a problem with binutils 2.34 whereby manuals are missing from +;; the release tarball. Remove this and the related code above when updating. +(define-public binutils+documentation + (package/inherit + binutils + (native-inputs + `(("texinfo" ,texinfo))) + (arguments + (substitute-keyword-arguments (package-arguments binutils) + ((#:make-flags _ ''()) ''()))) + (properties '()))) + (define-public binutils-gold (package (inherit binutils) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index eea59758fd..c1930582d1 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Mark H Weaver ;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. @@ -374,6 +374,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (package-arguments binutils)) ((#:configure-flags flags _ ...) flags))) + #:make-flags ,(match (memq #:make-flags (package-arguments binutils)) + ((#:make-flags flags _ ...) + flags) + (_ ''())) #:strip-flags '("--strip-all") #:phases (modify-phases %standard-phases (add-before 'configure 'all-static -- cgit v1.2.3 From a493a5264664b5c3d8f4fcf636715f5ae817b278 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 18:37:49 +0100 Subject: gnu: ath9k-htc-firmware: Build with binutils@2.33.1. * gnu/packages/base.scm (binutils-2.33): New public variable. * gnu/packages/cross-base.scm (cross-binutils): Add optional BINUTILS argument. * gnu/packages/firmware.scm (ath9k-htc-firmware)[native-inputs]: Build the xtensa-elf toolchain with BINUTILS-2.33. --- gnu/packages/base.scm | 19 +++++++++++++++++++ gnu/packages/cross-base.scm | 6 +++--- gnu/packages/firmware.scm | 9 +++++++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 7e5df241a9..184ef3b841 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -466,6 +466,25 @@ included.") ((#:make-flags _ ''()) ''()))) (properties '()))) +;; FIXME: ath9k-firmware-htc-binutils.patch do not apply on 2.34 because of a +;; big refactoring of xtensa-modules.c (commit 567607c11fbf7105 upstream). +;; Keep this version around until the patch is updated. +(define-public binutils-2.33 + (package/inherit + binutils + (version "2.33.1") + (source (origin + (inherit (package-source binutils)) + (uri (string-append "mirror://gnu/binutils/binutils-" + version ".tar.bz2")) + (sha256 + (base32 + "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c")))) + (arguments + (substitute-keyword-arguments (package-arguments binutils) + ((#:make-flags _ ''()) ''()))) + (properties '()))) + (define-public binutils-gold (package (inherit binutils) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 497d415f57..667d1f786a 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2019 Carl Dong ;;; ;;; This file is part of GNU Guix. @@ -79,8 +79,8 @@ (source (origin (inherit (package-source original)) (patches (list patch)))))) -(define (cross-binutils target) - "Return a cross-Binutils for TARGET." +(define* (cross-binutils target #:optional (binutils binutils)) + "Return a cross-Binutils for TARGET using BINUTILS." (let ((binutils (package (inherit binutils) (arguments (substitute-keyword-arguments (package-arguments diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index bec582d982..f9832161ea 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages assembly) + #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages cmake) #:use-module (gnu packages cross-base) @@ -83,8 +85,11 @@ ;; The firmware is cross-compiled using a "bare bones" compiler (no libc.) ;; Use our own tool chain for that. - (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-elf")) - ("cross-binutils" ,(cross-binutils "xtensa-elf")) + (native-inputs `(("cross-gcc" ,(cross-gcc + "xtensa-elf" + #:xbinutils (cross-binutils "xtensa-elf" + binutils-2.33))) + ("cross-binutils" ,(cross-binutils "xtensa-elf" binutils-2.33)) ("cmake" ,cmake-minimal) ("perl" ,perl))) (home-page "http://wireless.kernel.org/en/users/Drivers/ath9k_htc") -- cgit v1.2.3 From a33eac038a811603c8b9ed106ae405a5f80a0e9d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Feb 2020 16:29:02 +0100 Subject: gnu: glibc: Update to 2.31. * gnu/packages/patches/glibc-supported-locales.patch: Adjust for upstream changes. * gnu/packages/patches/glibc-2.29-supported-locales.patch: New file, with previous contents. * gnu/packages/patches/gcc-4.9-libsanitizer-mode-size.patch, gnu/packages/patches/gcc-6-libsanitizer-mode-size.patch, gnu/packages/patches/gcc-7-libsanitizer-mode-size.patch, gnu/packages/patches/gcc-8-libsanitizer-mode-size.patch, gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gcc.scm (gcc-4.9, gcc-5, gcc-6, gcc-7, gcc-8, gcc-9)[source](patches): Add the respective patch files. * gnu/packages/base.scm (glibc): Update to 2.31. [source](patches): Remove obsolete. (glibc-2.30): New public variable. (glibc-2.29)[source](patches): Adjust for renamed patch file. --- gnu/local.mk | 6 +++ gnu/packages/base.scm | 25 ++++++++-- gnu/packages/gcc.scm | 6 +++ .../patches/gcc-4.9-libsanitizer-mode-size.patch | 52 +++++++++++++++++++ .../patches/gcc-6-libsanitizer-mode-size.patch | 53 ++++++++++++++++++++ .../patches/gcc-7-libsanitizer-mode-size.patch | 53 ++++++++++++++++++++ .../patches/gcc-8-libsanitizer-mode-size.patch | 56 +++++++++++++++++++++ .../patches/gcc-9-libsanitizer-mode-size.patch | 58 ++++++++++++++++++++++ .../patches/glibc-2.29-supported-locales.patch | 33 ++++++++++++ gnu/packages/patches/glibc-supported-locales.patch | 11 ++-- 10 files changed, 343 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/gcc-4.9-libsanitizer-mode-size.patch create mode 100644 gnu/packages/patches/gcc-6-libsanitizer-mode-size.patch create mode 100644 gnu/packages/patches/gcc-7-libsanitizer-mode-size.patch create mode 100644 gnu/packages/patches/gcc-8-libsanitizer-mode-size.patch create mode 100644 gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch create mode 100644 gnu/packages/patches/glibc-2.29-supported-locales.patch diff --git a/gnu/local.mk b/gnu/local.mk index 347713239d..7b3d314993 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -883,6 +883,11 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch \ %D%/packages/patches/gcc-4.9-libsanitizer-ustat.patch \ %D%/packages/patches/gcc-libsanitizer-ustat.patch \ + %D%/packages/patches/gcc-4.9-libsanitizer-mode-size.patch \ + %D%/packages/patches/gcc-6-libsanitizer-mode-size.patch \ + %D%/packages/patches/gcc-7-libsanitizer-mode-size.patch \ + %D%/packages/patches/gcc-8-libsanitizer-mode-size.patch \ + %D%/packages/patches/gcc-9-libsanitizer-mode-size.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ %D%/packages/patches/gcc-strmov-store-file-names.patch \ %D%/packages/patches/gcc-4-compile-with-gcc-5.patch \ @@ -954,6 +959,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.29-git-updates.patch \ %D%/packages/patches/glibc-2.27-supported-locales.patch \ %D%/packages/patches/glibc-2.28-supported-locales.patch \ + %D%/packages/patches/glibc-2.29-supported-locales.patch \ %D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/glm-restore-install-target.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 184ef3b841..13bcf7fe9d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -593,13 +593,13 @@ the store.") ;; version 2.28, GNU/Hurd used a different glibc branch. (package (name "glibc") - (version "2.30") + (version "2.31") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72")) + "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj")) (snippet ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is ;; required on LFS distros to avoid loading the distro's libc.so @@ -611,7 +611,6 @@ the store.") #t)) (modules '((guix build utils))) (patches (search-patches "glibc-ldd-x86_64.patch" - "glibc-CVE-2019-19126.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" @@ -843,6 +842,24 @@ with the Linux kernel.") ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) +(define-public glibc-2.30 + (package + (inherit glibc) + (version "2.30") + (source (origin + (inherit (package-source glibc)) + (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) + (sha256 + (base32 + "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72")) + (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-CVE-2019-19126.patch" + "glibc-hidden-visibility-ldconfig.patch" + "glibc-versioned-locpath.patch" + "glibc-allow-kernel-2.6.32.patch" + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-2.29-supported-locales.patch")))))) + (define-public glibc-2.29 (package (inherit glibc) @@ -861,7 +878,7 @@ with the Linux kernel.") "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" - "glibc-supported-locales.patch")))))) + "glibc-2.29-supported-locales.patch")))))) (define-public glibc-2.28 (package diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 69bac8dd0c..90cb97e15c 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -402,6 +402,7 @@ Go. It also includes runtime support libraries for these languages.") "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc")) (patches (search-patches "gcc-4.9-libsanitizer-fix.patch" "gcc-4.9-libsanitizer-ustat.patch" + "gcc-4.9-libsanitizer-mode-size.patch" "gcc-arm-bug-71399.patch" "gcc-asan-missing-include.patch" "gcc-libvtv-runpath.patch" @@ -441,6 +442,7 @@ Go. It also includes runtime support libraries for these languages.") "gcc-5.0-libvtv-runpath.patch" "gcc-5-source-date-epoch-1.patch" "gcc-5-source-date-epoch-2.patch" + "gcc-6-libsanitizer-mode-size.patch" "gcc-fix-texi2pod.patch")) (modules '((guix build utils))) (snippet @@ -473,6 +475,7 @@ Go. It also includes runtime support libraries for these languages.") (base32 "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby")) (patches (search-patches "gcc-strmov-store-file-names.patch" + "gcc-6-libsanitizer-mode-size.patch" "gcc-6-source-date-epoch-1.patch" "gcc-6-source-date-epoch-2.patch" "gcc-5.0-libvtv-runpath.patch")))) @@ -492,6 +495,7 @@ Go. It also includes runtime support libraries for these languages.") (base32 "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq")) (patches (search-patches "gcc-strmov-store-file-names.patch" + "gcc-7-libsanitizer-mode-size.patch" "gcc-5.0-libvtv-runpath.patch")))) (description "GCC is the GNU Compiler Collection. It provides compiler front-ends @@ -510,6 +514,7 @@ It also includes runtime support libraries for these languages."))) (base32 "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4")) (patches (search-patches "gcc-8-strmov-store-file-names.patch" + "gcc-8-libsanitizer-mode-size.patch" "gcc-5.0-libvtv-runpath.patch")))))) (define-public gcc-9 @@ -524,6 +529,7 @@ It also includes runtime support libraries for these languages."))) (base32 "01mj3yk7z49i49168hg2cg7qs4bsccrrnv7pjmbdlf8j2a7z0vpa")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" + "gcc-9-libsanitizer-mode-size.patch" "gcc-9-asan-fix-limits-include.patch" "gcc-5.0-libvtv-runpath.patch")))))) diff --git a/gnu/packages/patches/gcc-4.9-libsanitizer-mode-size.patch b/gnu/packages/patches/gcc-4.9-libsanitizer-mode-size.patch new file mode 100644 index 0000000000..7df22c21aa --- /dev/null +++ b/gnu/packages/patches/gcc-4.9-libsanitizer-mode-size.patch @@ -0,0 +1,52 @@ +Fix assertion failure in libsanitizer when using glibc 2.31 and later. + +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92154 +https://reviews.llvm.org/D69104 + +Adapted from these upstream revision: + +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=277981 +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=279653 + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 196eb3b3c64..b588e07e5ab 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -928,7 +928,11 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); ++#endif + CHECK_SIZE_AND_OFFSET(ipc_perm, __seq); + + CHECK_TYPE_SIZE(shmid_ds); +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index aec950454b3..6d94fc65c28 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -154,20 +154,13 @@ namespace __sanitizer { + u64 __unused1; + u64 __unused2; + #elif defined(__sparc__) +-# if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-# else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-# endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) diff --git a/gnu/packages/patches/gcc-6-libsanitizer-mode-size.patch b/gnu/packages/patches/gcc-6-libsanitizer-mode-size.patch new file mode 100644 index 0000000000..005e3c4079 --- /dev/null +++ b/gnu/packages/patches/gcc-6-libsanitizer-mode-size.patch @@ -0,0 +1,53 @@ +Fix assertion failure in libsanitizer when using glibc 2.31 and later. + +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92154 +https://reviews.llvm.org/D69104 + +Adapted from these upstream revision: + +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=277981 +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=279653 + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 069d8d557de..c49c28c6e07 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1130,8 +1130,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(x, y) 0 + #endif +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index 304d04e3935..6dee89c97e1 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -207,20 +207,13 @@ namespace __sanitizer { + unsigned long __unused1; + unsigned long __unused2; + #elif defined(__sparc__) +-# if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-# else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-# endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) + diff --git a/gnu/packages/patches/gcc-7-libsanitizer-mode-size.patch b/gnu/packages/patches/gcc-7-libsanitizer-mode-size.patch new file mode 100644 index 0000000000..41b4a4cac6 --- /dev/null +++ b/gnu/packages/patches/gcc-7-libsanitizer-mode-size.patch @@ -0,0 +1,53 @@ +Fix assertion failure in libsanitizer when using glibc 2.31 and later. + +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92154 +https://reviews.llvm.org/D69104 + +Adapted from these upstream revision: + +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=277981 +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=279653 + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 97eae3fc7bc..4089d4695e2 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1145,8 +1145,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index c139322839a..7c3c2d866e5 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -211,20 +211,13 @@ namespace __sanitizer { + unsigned long __unused1; + unsigned long __unused2; + #elif defined(__sparc__) +-# if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-# else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-# endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) + diff --git a/gnu/packages/patches/gcc-8-libsanitizer-mode-size.patch b/gnu/packages/patches/gcc-8-libsanitizer-mode-size.patch new file mode 100644 index 0000000000..e343034991 --- /dev/null +++ b/gnu/packages/patches/gcc-8-libsanitizer-mode-size.patch @@ -0,0 +1,56 @@ +Fix assertion failure in libsanitizer when using glibc 2.31 and later. + +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92154 +https://reviews.llvm.org/D69104 + +Adapted from these upstream revision: + +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=277981 +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=279653 + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index a915d37cdfe..5c720b2e700 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1147,8 +1147,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index 4d11d071776..eda75a7cd84 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -210,14 +210,8 @@ namespace __sanitizer { + u64 __unused1; + u64 __unused2; + #elif defined(__sparc__) +-#if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-#else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-#endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; +@@ -228,8 +222,7 @@ namespace __sanitizer { + unsigned long __unused1; + unsigned long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) + diff --git a/gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch b/gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch new file mode 100644 index 0000000000..9e99a3d198 --- /dev/null +++ b/gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch @@ -0,0 +1,58 @@ +Fix assertion failure in libsanitizer when using glibc 2.31 and later. + +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92154 +https://reviews.llvm.org/D69104 + +This is a combination of these upstream revisions: + +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=277981 +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=279653 + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 6cd4a5bac8b..d823a12190c 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1156,8 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index 73af92af1e8..6a673a7c995 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -211,26 +211,13 @@ namespace __sanitizer { + u64 __unused1; + u64 __unused2; + #elif defined(__sparc__) +-#if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-#else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-#endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) diff --git a/gnu/packages/patches/glibc-2.29-supported-locales.patch b/gnu/packages/patches/glibc-2.29-supported-locales.patch new file mode 100644 index 0000000000..05865dc7be --- /dev/null +++ b/gnu/packages/patches/glibc-2.29-supported-locales.patch @@ -0,0 +1,33 @@ +This patch is taken from debian's glibc package (generate-supported.mk). +It install the localedata/SUPPORTED file of the glibc. This file lists +all the supported locales of the glibc. + +diff --git a/localedata/Makefile b/localedata/Makefile +index 65079f9eb8..14818f84e0 100644 +--- a/localedata/Makefile ++++ b/localedata/Makefile +@@ -169,7 +169,8 @@ endif + # Files to install. + install-others := $(addprefix $(inst_i18ndir)/, \ + $(addsuffix .gz, $(charmaps)) \ +- $(locales)) ++ $(locales)) \ ++ $(inst_i18ndir)/SUPPORTED + + tests: $(objdir)/iconvdata/gconv-modules + +@@ -380,6 +381,14 @@ endif + + include SUPPORTED + ++$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force) ++ for locale in $(SUPPORTED-LOCALES); do \ ++ [ $$locale = true ] && continue; \ ++ echo $$locale | sed 's,/, ,' >> LOCALES; \ ++ done ++ $(make-target-directory) ++ $(INSTALL_DATA) LOCALES $@ ++ + INSTALL-SUPPORTED-LOCALE-ARCHIVE=$(addprefix install-archive-, $(SUPPORTED-LOCALES)) + INSTALL-SUPPORTED-LOCALE-FILES=$(addprefix install-files-, $(SUPPORTED-LOCALES)) + \ No newline at end of file diff --git a/gnu/packages/patches/glibc-supported-locales.patch b/gnu/packages/patches/glibc-supported-locales.patch index 05865dc7be..28577c75c0 100644 --- a/gnu/packages/patches/glibc-supported-locales.patch +++ b/gnu/packages/patches/glibc-supported-locales.patch @@ -3,20 +3,19 @@ It install the localedata/SUPPORTED file of the glibc. This file lists all the supported locales of the glibc. diff --git a/localedata/Makefile b/localedata/Makefile -index 65079f9eb8..14818f84e0 100644 --- a/localedata/Makefile +++ b/localedata/Makefile -@@ -169,7 +169,8 @@ endif - # Files to install. +@@ -176,7 +176,8 @@ + else install-others := $(addprefix $(inst_i18ndir)/, \ $(addsuffix .gz, $(charmaps)) \ - $(locales)) + $(locales)) \ + $(inst_i18ndir)/SUPPORTED + endif tests: $(objdir)/iconvdata/gconv-modules - -@@ -380,6 +381,14 @@ endif +@@ -401,6 +402,14 @@ include SUPPORTED @@ -30,4 +29,4 @@ index 65079f9eb8..14818f84e0 100644 + INSTALL-SUPPORTED-LOCALE-ARCHIVE=$(addprefix install-archive-, $(SUPPORTED-LOCALES)) INSTALL-SUPPORTED-LOCALE-FILES=$(addprefix install-files-, $(SUPPORTED-LOCALES)) - \ No newline at end of file + -- cgit v1.2.3 From fedce7b2b474251a7b7e0e4fb7cc80d89a2939bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Feb 2020 09:24:34 +0100 Subject: gnu: libfaketime: Fix build with glibc 2.31. * gnu/packages/check.scm (libfaketime)[arguments]: Disable "deprecated-declarations" warnings before running the test suite. --- gnu/packages/check.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 6c809c7d7c..e819ca72cd 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2437,6 +2437,10 @@ portable to just about any platform.") (lambda _ (substitute* "test/functests/test_exclude_mono.sh" (("/bin/bash") (which "bash"))) + + ;; Do not fail due to use of 'ftime', which was deprecated in + ;; glibc 2.31. Remove this for later versions of libfaketime. + (setenv "FAKETIME_COMPILE_CFLAGS" "-Wno-deprecated-declarations") #t))) #:test-target "test")) (native-inputs -- cgit v1.2.3 From 6457ae1339c8d3dc7ade2baa8511916d55809887 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 16:01:01 +0100 Subject: gnu: telepathy-glib: Fix test failure. * gnu/packages/patches/telepathy-glib-channel-memory-leak.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (telepathy-glib)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 1 + .../patches/telepathy-glib-channel-memory-leak.patch | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/telepathy-glib-channel-memory-leak.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7b3d314993..18e8b211f7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1435,6 +1435,7 @@ dist_patch_DATA = \ %D%/packages/patches/texinfo-5-perl-compat.patch \ %D%/packages/patches/texlive-bin-poppler-0.83.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ + %D%/packages/patches/telepathy-glib-channel-memory-leak.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ %D%/packages/patches/thefuck-test-environ.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e6f1cf819f..d25959b928 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -805,6 +805,7 @@ up the Gnome environment, and are used in many unrelated projects.") "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy")) (patches (list + (search-patch "telepathy-glib-channel-memory-leak.patch") ;; Don't use the same test name for multiple tests. ;; (origin diff --git a/gnu/packages/patches/telepathy-glib-channel-memory-leak.patch b/gnu/packages/patches/telepathy-glib-channel-memory-leak.patch new file mode 100644 index 0000000000..fe07548ec0 --- /dev/null +++ b/gnu/packages/patches/telepathy-glib-channel-memory-leak.patch @@ -0,0 +1,19 @@ +Prevent a memory leak in call-channel, which otherwise would cause a +test failure in file-transfer-channel.c. + +Taken from upstream: +https://gitlab.freedesktop.org/telepathy/telepathy-glib/commit/2e8b2cc0db09b781d99e3755bb6d01548037fe7b + +diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c +index 8ed76323be32f83c5f4d6045a50bc1698d8093fd..2a1fa203d4be9f0c8b99344225f4ba9900666ffc 100644 +--- a/telepathy-glib/call-channel.c ++++ b/telepathy-glib/call-channel.c +@@ -525,6 +525,8 @@ update_call_members (TpCallChannel *self, + + _tp_channel_contacts_queue_prepare_async ((TpChannel *) self, + contacts, update_call_members_prepared_cb, data); ++ ++ g_ptr_array_unref (contacts); + } + + static void -- cgit v1.2.3 From 5d8a4354acd081adf9ef55e07ae2cf0a257d1e95 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Feb 2020 19:41:36 +0100 Subject: gnu: isl: Move the static library to a separate output. * gnu/packages/gcc.scm (isl)[outputs, arguments]: New fields. * gnu/packages/make-bootstrap.scm (%gcc-static)[inputs]: Add ISL:STATIC. --- gnu/packages/gcc.scm | 21 ++++++++++++++++++++- gnu/packages/make-bootstrap.scm | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 90cb97e15c..f9d8b3e150 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -882,6 +882,25 @@ as the 'native-search-paths' field." (base32 "1kf54jib0nind1pvakblnfhimmwzm0y1llz8470ag0di5vwqwrhs")))) (build-system gnu-build-system) + (outputs '("out" "static")) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static")) + (source (string-append out "/lib/libisl.a")) + (target (string-append static "/lib/libisl.a"))) + (mkdir-p (dirname target)) + (link source target) + (delete-file source) + + ;; Remove reference to libisl.a from the .la file so + ;; libtool looks for it in the usual locations. + (substitute* (string-append out "/lib/libisl.la") + (("^old_library=.*") + "old_library=''\n")) + #t)))))) (inputs `(("gmp" ,gmp))) (home-page "http://isl.gforge.inria.fr/") (synopsis diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index c1930582d1..ef274a2ade 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -513,6 +513,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t))))))) (inputs `(("zlib:static" ,zlib "static") + ("isl:static" ,isl "static") ,@(package-inputs gcc))) (native-inputs (if (%current-target-system) -- cgit v1.2.3 From 974200102ba6703cde59c5a0eb50ac35cdb42d3f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Feb 2020 12:34:48 +0100 Subject: gnu: python2-more-itertools: Do not depend on 'python2-minimal'. * gnu/packages/python-xyz.scm (python2-more-itertools)[arguments]: Use PYTHON2 instead of PYTHON2-MINIMAL. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0014cc3bf3..dc48800afb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15236,7 +15236,7 @@ working with iterables.") (base32 "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) (arguments - `(#:python ,python2-minimal)) + `(#:python ,python-2)) (propagated-inputs `(("python2-six" ,python2-six-bootstrap))))) -- cgit v1.2.3 From 087c94019d31044f91d2c9a3c240b109824fd248 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:53:50 +0100 Subject: gnu: OpenBLAS: Update to 0.3.8. * gnu/packages/maths.scm (openblas): Update to 0.3.8. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c88a5ab8cf..a51855797f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3105,7 +3105,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.7") + (version "0.3.8") (source (origin (method url-fetch) @@ -3114,7 +3114,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0jbdjsi0qsxahdcm42agnn1y7xpmg0hrhwjsxg0zbhs9wwy3p568")))) + "0f7n911vlriphlr4dgfdxk2x4lmjpf8kcl8w9lb584w2nwfkbdk9")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 9640cd972d71fa474e024e43246125217e65c424 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Feb 2020 15:47:48 +0100 Subject: gnu: libgpg-error: Update to 1.37. * gnu/packages/patches/libgpg-error-gawk-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.37. [source](modules, patches): Remove. --- gnu/local.mk | 1 - gnu/packages/gnupg.scm | 13 +- .../patches/libgpg-error-gawk-compat.patch | 155 --------------------- 3 files changed, 2 insertions(+), 167 deletions(-) delete mode 100644 gnu/packages/patches/libgpg-error-gawk-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 18e8b211f7..2b425bee22 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1105,7 +1105,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ - %D%/packages/patches/libgpg-error-gawk-compat.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/libotr-test-auth-fix.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 4e8869a658..890dd3299b 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -79,7 +79,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.36") + (version "1.37") (source (origin (method url-fetch) @@ -87,16 +87,7 @@ version ".tar.bz2")) (sha256 (base32 - "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds")) - (patches (search-patches "libgpg-error-gawk-compat.patch")) - ;; XXX: Remove this snippet with the gawk patch above. It avoids having - ;; to call autoreconf for the Makefile.am change to take effect. - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "src/Makefile.in" - (("namespace=errnos") "pkg_namespace=errnos")) - #t)))) + "0qwpx8mbc2l421a22l0l1hpzkip9jng06bbzgxwpkkvk5bvnybdk")))) (build-system gnu-build-system) (arguments (if (%current-target-system) diff --git a/gnu/packages/patches/libgpg-error-gawk-compat.patch b/gnu/packages/patches/libgpg-error-gawk-compat.patch deleted file mode 100644 index 85477b0be6..0000000000 --- a/gnu/packages/patches/libgpg-error-gawk-compat.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk -index ae29043..9a1fc18 100644 ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/Makefile.am b/src/Makefile.am -index ce1b882..f2590cb 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - -diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk -index 46d436c..e9c857c 100644 ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk -index a771a73..4578e29 100644 ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk -index ea58503..188f7a4 100644 ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk -index f79df66..15b1aad 100644 ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk -index c9de9c1..285e45f 100644 ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - -- cgit v1.2.3 From 32d3f81a494e4b37c96ddbc23ff9a5a8140e8591 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Feb 2020 15:48:34 +0100 Subject: gnu: mit-krb5: Update to 1.18. * gnu/packages/kerberos.scm (mit-krb5): Update to 1.18. --- gnu/packages/kerberos.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 2b8ebbac77..890f4bc0b2 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -50,7 +50,7 @@ (define-public mit-krb5 (package (name "mit-krb5") - (version "1.17.1") + (version "1.18") (source (origin (method url-fetch) (uri (list @@ -62,7 +62,7 @@ "/krb5-" version ".tar.gz"))) (sha256 (base32 - "10dimzcdzk9s79291qb4s3kwmbpb8bvppa6k6873wxxa5vndf1ip")))) + "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From 62852fa27c8c9825023c3db0afacc532621cb6d1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Feb 2020 15:58:57 +0100 Subject: gnu: bison: Update to 3.5.2. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 92ab80e9bf..862c2a0528 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -31,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.5.1") + (version "3.5.2") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "1l2d59xwlkmmm6vsskw6vsrk75ql9fvld57681g2v6khv5xhjziy")))) + "1pah9q53aqgr0as3s5la4vbcp9940x6jhj06dyxqpnmnkvdp7qi4")))) (build-system gnu-build-system) (arguments '(;; Building in parallel on many-core systems may cause an error such as -- cgit v1.2.3 From 717c433c46e8e9fc77b796e485092e2cccee336a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Feb 2020 16:00:38 +0100 Subject: gnu: ncurses: Update to 6.2. * gnu/packages/ncurses.scm (ncurses): Update to 6.2. [arguments]: Remove phase "apply-rollup-patch". [native-inputs]: Remove "rollup-patch" input. --- gnu/packages/ncurses.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 75ad492822..12e16b2403 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -40,7 +40,7 @@ (define-public ncurses (package (name "ncurses") - (version "6.1-20190609") + (version "6.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ncurses/ncurses-" @@ -48,7 +48,7 @@ ".tar.gz")) (sha256 (base32 - "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da")))) + "17bcm2z1rdx5gmzj5fb8cp7f28aw5b4g2z4qvvqg3yg0fq66wc1h")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1 MiB of man pages @@ -188,8 +188,6 @@ ,@(if (target-mingw?) '("--enable-term-driver") '())))) #:tests? #f ; no "check" target #:phases (modify-phases %standard-phases - (add-after 'unpack 'apply-rollup-patch - ,apply-rollup-patch-phase) (replace 'configure ,configure-phase) (add-after 'install 'post-install ,post-install-phase) @@ -201,18 +199,6 @@ `(,@(if (%current-target-system) `(("self" ,this-package)) ;for `tic' '()) - - ("rollup-patch" - ,(origin - (method url-fetch) - (uri (string-append - "https://invisible-mirror.net/archives/ncurses/" - (car (string-split version #\-)) - "/ncurses-" version "-patch.sh.bz2")) - (sha256 - (base32 - "0hqlqdqmh7lfs6dwj763qksb4j9nk0pv6crzx5gnp6n4caz3i46g")))) - ("pkg-config" ,pkg-config))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From f9dcc39ac106bd65df9e472bdabeb48303a4b18a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 15:54:56 +0100 Subject: gnu: CMake: Do not use source files from system libarchive. * gnu/packages/cmake.scm (%common-build-phases): Remove phase 'use-system-libarchive'. (%preserved-third-party-files): New variable. (cmake-bootstrap)[native-inputs]: Remove. [source](snippet): Rewrite in terms of FILE-SYSTEM-FOLD, and preserve two files from the bundled libarchive. (cmake-minimal)[source](snippet): Adjust accordingly. --- gnu/packages/cmake.scm | 92 +++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index cc4340bbc6..a41cd801e8 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -60,26 +60,6 @@ (substitute* "Auxiliary/CMakeLists.txt" ((".*cmake-mode.el.*") "")) #t)) - (add-after 'unpack 'use-system-libarchive - ;; 'Source/cm_get_date.c' includes archive_getdate.c wholesale, - ;; so it needs to be available along with the header file. - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((libarchive-source (assoc-ref (or native-inputs inputs) - "libarchive:source")) - ;; XXX: We can not use ,(package-version libarchive) here due to - ;; a cyclic module reference at the top-level. - (libarchive-version "3.4.1") - (files-to-unpack '("libarchive/archive_getdate.c" - "libarchive/archive_getdate.h"))) - (mkdir-p "Utilities/cmlibarchive") - (apply invoke "tar" "-xvf" libarchive-source - "--strip-components=1" - "-C" "Utilities/cmlibarchive" - (map (lambda (file) - (string-append "libarchive-" libarchive-version - "/" file)) - files-to-unpack)) - #t))) (add-before 'configure 'patch-bin-sh (lambda _ ;; Replace "/bin/sh" by the right path in... a lot of @@ -105,6 +85,12 @@ ;; This test requires 'ldconfig' which is not available in Guix. "RunCMake.install")) +(define %preserved-third-party-files + '(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must + ;; be available along with the required headers. + "Utilities/cmlibarchive/libarchive/archive_getdate.c" + "Utilities/cmlibarchive/libarchive/archive_getdate.h")) + ;;; The "bootstrap" CMake. It is used to build 'cmake-minimal' below, as well ;;; as any dependencies that need cmake-build-system. (define-public cmake-bootstrap @@ -122,26 +108,44 @@ (modules '((guix build utils) (ice-9 ftw))) (snippet - '(begin - (with-directory-excursion "Utilities" - ;; CMake bundles its dependencies below "Utilities" with a - ;; "cm" prefix in the directory name. Delete those to ensure - ;; the system libraries are used. - (for-each delete-file-recursively - (scandir - "." - (lambda (file) - (and (string-prefix? "cm" file) - (eq? 'directory (stat:type (stat file))) + `(begin + ;; CMake bundles its dependencies in the "Utilities" directory. + ;; Delete those to ensure the system libraries are used. + (define preserved-files + '(,@%preserved-third-party-files + ;; Use the bundled JsonCpp during bootstrap to work around + ;; a circular dependency. TODO: JsonCpp can be built with + ;; Meson instead of CMake, but meson-build-system currently + ;; does not support cross-compilation. + "Utilities/cmjsoncpp" + ;; LibUV is required to bootstrap the initial build system. + "Utilities/cmlibuv")) - ;; These inputs are required to bootstrap - ;; the initial build system. They are - ;; deleted in 'cmake-minimal' below. - ;; TODO: Consider building jsoncpp with - ;; Meson instead, once meson-build-system - ;; learns cross-compilation. - (not (string=? "cmjsoncpp" file)) - (not (string=? "cmlibuv" file))))))) + (file-system-fold (lambda (dir stat result) ;enter? + (or (string=? "Utilities" dir) ;init + ;; The bundled dependencies are + ;; distinguished by having a "cm" + ;; prefix to their upstream names. + (and (string-prefix? "Utilities/cm" dir) + (not (member dir preserved-files))))) + (lambda (file stat result) ;leaf + (unless (or (member file preserved-files) + ;; Preserve top-level files. + (string=? "Utilities" + (dirname file))) + (delete-file file))) + (const #t) ;down + (lambda (dir stat result) ;up + (when (equal? (scandir dir) '("." "..")) + (rmdir dir))) + (const #t) ;skip + (lambda (file stat errno result) + (format (current-error-port) + "warning: failed to delete ~a: ~a~%" + file (strerror errno))) + #t + "Utilities" + lstat) #t)) (patches (search-patches "cmake-curl-certificates.patch")))) (build-system gnu-build-system) @@ -196,8 +200,6 @@ (replace 'configure (lambda* (#:key (configure-flags '()) #:allow-other-keys) (apply invoke "./configure" configure-flags)))))) - (native-inputs - `(("libarchive:source" ,(package-source libarchive)))) (inputs `(("bzip2" ,bzip2) ("curl" ,curl-minimal) @@ -245,12 +247,10 @@ and workspaces that can be used in the compiler environment of your choice.") (inherit (package-source cmake-bootstrap)) (snippet (match (origin-snippet (package-source cmake-bootstrap)) - ((begin exp ...) + ((_ _ exp ...) ;; Now we can delete the remaining software bundles. - (append '(begin - (for-each delete-file-recursively - '("Utilities/cmjsoncpp" - "Utilities/cmlibuv"))) + (append `(begin + (define preserved-files ',%preserved-third-party-files)) exp)))))) (inputs `(("curl" ,curl) -- cgit v1.2.3 From 7e3533a44654f416a6881f05421bfc89f3c4ada4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 15:56:02 +0100 Subject: gnu: libarchive: Update to 3.4.2. * gnu/packages/backup.scm (libarchive): Update to 3.4.2. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index c00244c003..5cdf3b9155 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -200,7 +200,7 @@ backups (called chunks) to allow easy burning to CD/DVD.") (define-public libarchive (package (name "libarchive") - (version "3.4.1") + (version "3.4.2") (source (origin (method url-fetch) @@ -211,7 +211,7 @@ backups (called chunks) to allow easy burning to CD/DVD.") version ".tar.xz"))) (sha256 (base32 - "1xs2c3fsss1g2a6yzip98j9bl93pxd3gqwr4ivh2fc6c10py115v")))) + "18dd01ahs2hv74xm7axjc3yhq839p0x0s4vssvlmm8fknja09qfq")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) -- cgit v1.2.3 From c37f9be95203d0146fbe6d0037fe993a2d749fdc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 15:56:24 +0100 Subject: gnu: CMake: Update to 3.16.4. * gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.16.4. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index a41cd801e8..18a27bc588 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -96,7 +96,7 @@ (define-public cmake-bootstrap (package (name "cmake-bootstrap") - (version "3.16.3") + (version "3.16.4") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -104,7 +104,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "0s06wrp0jnw2l4yq94skj53hwnz7lqrmhh96sq7w7njkkggickz5")) + "0b5c77lqzfk5l7mnnih5c78i36d3skbkw20jjnph79lx9l8qrk4v")) (modules '((guix build utils) (ice-9 ftw))) (snippet -- cgit v1.2.3 From d317d3dfe32a7974163ac3155722afc18b05515d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 17:47:02 +0100 Subject: gnu: readline: Update to 8.0.4. * gnu/packages/readline.scm (%patch-series-8.0): Add patches 2 through 4. --- gnu/packages/readline.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 9f886f9b6e..5f61dcb735 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -49,7 +49,10 @@ (define %patch-series-8.0 (patch-series "8.0" - (1 "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq"))) + (1 "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq") + (2 "1xy8mv8xm8hsfixwp3ci9kfx3dii3y92cq27wwd0jq75y6zzxc1n") + (3 "1vza7sxjcsr2z295ij12nzgncdil1vb6as3mqy4m7svi1chv5pcl") + (4 "0k1rfx9w32lglxg564yvp0mw6jg6883p8ac2f2lxxqpf80m3vami"))) (define %patch-series-7.0 (patch-series -- cgit v1.2.3 From acb9277480fe1c146c00daaf461ef98723622a60 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 17:47:33 +0100 Subject: gnu: bash: Update to 5.0.16. * gnu/packages/bash.scm (%patch-series-5.0): Add patches 12 through 16. --- gnu/packages/bash.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 88005f4618..84268e028b 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -73,7 +73,12 @@ (8 "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf") (9 "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d") (10 "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn") - (11 "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c"))) + (11 "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c") + (12 "0cz21qg2gbr40lfgza7g02bqi2qknwqgxnq459pjj640d0cywhr9") + (13 "16h9nwz3yzwj7fnxvlidjymdc4yr30h818433gh9j1x3in6igmzm") + (14 "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx") + (15 "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5") + (16 "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz"))) (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of -- cgit v1.2.3 From 481a0f1a7ceac666a011b28324220584ead07698 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 13 Feb 2020 10:54:29 +0200 Subject: build: gnu-build-system: Don't run configure during bootstrap. * guix/build/gnu-build-system.scm (bootstrap): Add NOCONFIGURE environment variable before running bootstrap scripts. --- guix/build/gnu-build-system.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 4df0bb4904..22805c84ea 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -190,6 +190,7 @@ working directory." (if (executable-file? script) (begin (patch-shebang script) + (setenv "NOCONFIGURE" "true") (invoke script)) (invoke "sh" script))) (if (or (file-exists? "configure.ac") -- cgit v1.2.3 From 778d6b522ae361767d3cf984a3b182bac7361b7a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 16 Feb 2020 09:06:53 +0200 Subject: gnu: Remove obsolete bootstrap workaround phases. * gnu/packages/admin.scm (igt-gpu-tools)[arguments]: Don't set NOCONFIGURE environment variable. * gnu/packages/algebra.scm (givaro, fflas-ffpack, linbox), * gnu/packages/arcan.scm (xarcan), * gnu/packages/audio.scm (rtmidi), * gnu/packages/cinnamon.scm (cinnamon-desktop), * gnu/packages/gnome.scm (dia, libxklavier, byzanz), * gnu/packages/image-viewers.scm (geeqie), * gnu/packages/libusb.scm (libplist), * gnu/packages/mail.scm (libetpan), * gnu/packages/networking.scm (aircrack-ng), * gnu/packages/terminals.scm (tilda, kmscon), * gnu/packages/xorg.scm (xf86-video-intel, xcompmgr) [arguments]: Same. --- gnu/packages/admin.scm | 9 +-------- gnu/packages/algebra.scm | 28 +--------------------------- gnu/packages/arcan.scm | 8 +------- gnu/packages/audio.scm | 7 ------- gnu/packages/cinnamon.scm | 7 ------- gnu/packages/gnome.scm | 23 +++-------------------- gnu/packages/image-viewers.scm | 1 - gnu/packages/libusb.scm | 9 +-------- gnu/packages/mail.scm | 8 +------- gnu/packages/networking.scm | 6 ------ gnu/packages/terminals.scm | 10 ---------- gnu/packages/xorg.scm | 14 +------------- 12 files changed, 9 insertions(+), 121 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index af39676d57..02fdb453b6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2802,14 +2802,7 @@ buffers.") (base32 "1gpdjs5aj6vsnzwcjvw5bb120lgffvvshi4202phr0bzw3b92ky8")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; many of the tests try to load kernel modules - #:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - ;; Don't run configure in this phase. - (setenv "NOCONFIGURE" "1") - (invoke "sh" "autogen.sh")))))) + `(#:tests? #f)) ; many of the tests try to load kernel modules (inputs `(("cairo" ,cairo) ("elfutils" ,elfutils) ; libdw diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index d3e4dfbd86..08d209ec58 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1217,15 +1217,6 @@ objects.") ("libtool" ,libtool))) (propagated-inputs `(("gmp" ,gmp))) ; gmp++.h includes gmpxx.h - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'setenv - ;; Prevent the autogen.sh script to carry out the configure - ;; script, which has not yet been patched to replace /bin/sh. - (lambda _ - (setenv "NOCONFIGURE" "yes") - #t))))) (synopsis "Algebraic computations with exact rings and fields") (description "Givaro is a C++ library implementing the basic arithmetic of various @@ -1264,15 +1255,7 @@ compound objects, such as vectors, matrices and univariate polynomials.") `(#:configure-flags (list (string-append "--with-blas-libs=" (assoc-ref %build-inputs "openblas") - "/lib/libopenblas.so")) - #:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'setenv - ;; Prevent the autogen.sh script to carry out the configure - ;; script, which has not yet been patched to replace /bin/sh. - (lambda _ - (setenv "NOCONFIGURE" "yes") - #t))))) + "/lib/libopenblas.so")))) (synopsis "C++ library for linear algebra over finite fields") (description "FFLAS-FFPACK is a C++ template library for basic linear algebra @@ -1308,15 +1291,6 @@ algebra, such as the row echelon form.") ("pkg-config" ,pkg-config))) (inputs `(("fflas-ffpack" ,fflas-ffpack))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'setenv - ;; Prevent the autogen.sh script to carry out the configure - ;; script, which has not yet been patched to replace /bin/sh. - (lambda _ - (setenv "NOCONFIGURE" "yes") - #t))))) (synopsis "C++ library for linear algebra over exact rings") (description "LinBox is a C++ template library for exact linear algebra computation diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index db472efec5..e3f8b60aea 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -216,13 +216,7 @@ engine programmable using Lua.") (assoc-ref %build-inputs "xkbcomp") "/bin") ,(string-append "--with-xkb-output=" - "/tmp")) ; FIXME: Copied from xorg - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'noconfigure - (lambda _ - (setenv "NOCONFIGURE" "true") - #t))))) + "/tmp")))) ; FIXME: Copied from xorg (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index fbb2d90979..78d29e1c68 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2444,13 +2444,6 @@ tempo and pitch of an audio recording independently of one another.") (base32 "1k962ljpnwyjw9jjiky2372khhri1wqvrj5qsalfpys31xqzw31p")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'noconfigure - (lambda _ - (setenv "NOCONFIGURE" "yes") - #t))))) (inputs `(("jack" ,jack-1) ("alsa-lib" ,alsa-lib))) diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm index a8850391aa..fadf18df81 100644 --- a/gnu/packages/cinnamon.scm +++ b/gnu/packages/cinnamon.scm @@ -51,13 +51,6 @@ (base32 "18mjy80ly9361npjhxpm3n0pkmrwviaqr2kixjb7hyxa6kzzh5xw")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'skip-premature-configure - (lambda _ - (setenv "NOCONFIGURE" "set") - #t))))) ;; TODO: package 'libgsystem'. (inputs `(("accountsservice" ,accountsservice) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cc00b69cf3..d9a5e6fe5b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -911,13 +911,6 @@ useful as a tutorial and users' guide for new or less experienced users.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'dont-configure-during-bootstrap - (lambda _ - (setenv "NOCONFIGURE" "true") - #t))))) (home-page "https://wiki.gnome.org/Apps/Dia") (synopsis "Diagram creation for GNOME") (description "Dia can be used to draw different types of diagrams, and @@ -3505,13 +3498,7 @@ and objects.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'no-configure - (lambda* _ - (setenv "NOCONFIGURE" "1") - #t))) - #:configure-flags + '(#:configure-flags (list (string-append "--with-xkb-base=" (assoc-ref %build-inputs "xkeyboard-config") "/share/X11/xkb") @@ -7924,7 +7911,7 @@ documents and diagrams, playing media, scanning, and much more.") (arguments '(#:phases (modify-phases %standard-phases - (replace 'bootstrap + (add-before 'bootstrap 'build-without-Werror (lambda _ ;; The build system cleverly detects that we're not building from ;; a release tarball and turns on -Werror for GCC. @@ -7932,11 +7919,7 @@ documents and diagrams, playing media, scanning, and much more.") ;; causes the build to fail unnecessarily, so we remove the flag. (substitute* '("configure.ac") (("-Werror") "")) - ;; The autogen.sh script in gnome-common will run ./configure - ;; by default, which is problematic because source shebangs - ;; have not yet been patched. - (setenv "NOCONFIGURE" "t") - (zero? (system* "sh" "autogen.sh"))))))) + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8589130822..2ac15a6cd9 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -155,7 +155,6 @@ actions.") write-dummy-changelog) (call-with-output-file "ChangeLog.html" write-dummy-changelog) - (setenv "NOCONFIGURE" "true") ;; Don't try to run 'git' for the version number. (substitute* "configure.ac" diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 5e468a4316..a0ae273b67 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -318,14 +318,7 @@ wrapper for accessing libusb-1.0.") (base32 "02vraf4j46bp746s0gz7vga2gv2dy3zd1v1bsy9x8algg9fpcb7n")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'configure-later - ;; Don't run ./configure during bootstrap. - (lambda _ - (setenv "NOCONFIGURE" "set") - #t))) - ;; Tests fail randomly when run in parallel because several of them write + `(;; Tests fail randomly when run in parallel because several of them write ;; and read to/from the same file--e.g., "4.plist" is accessed by ;; 'large.test' and 'largecmp.test'. #:parallel-tests? #f)) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1a9f9e5e5c..9d6e3dba8b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1133,13 +1133,7 @@ useful features.") ("expat" ,expat) ("zlib" ,zlib))) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (setenv "NOCONFIGURE" "true") - (invoke "sh" "autogen.sh")))) - #:configure-flags + '(#:configure-flags '("--disable-static" "--disable-db"))) (home-page "https://www.etpan.org/libetpan.html") (synopsis "Portable middleware for email access") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index dbc40028ad..4a48355163 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -934,12 +934,6 @@ live network and disk I/O bandwidth monitor.") (("/bin/sh") (which "sh"))) #t)) - (replace 'bootstrap - (lambda _ - ;; Patch shebangs in generated files before running - ;; ./configure. - (setenv "NOCONFIGURE" "please") - (invoke "bash" "./autogen.sh"))) (add-after 'build 'absolutize-tools (lambda* (#:key inputs #:allow-other-keys) (let ((ethtool (string-append (assoc-ref inputs "ethtool") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 8773f1969f..cffaea24a0 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -96,12 +96,6 @@ (base32 "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj")))) (build-system glib-or-gtk-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (setenv "NOCONFIGURE" "true") - (invoke "sh" "autogen.sh")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -276,10 +270,6 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.") #:disallowed-references (,mesa) #:phases (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (setenv "NOCONFIGURE" "indeed") - (invoke "sh" "autogen.sh"))) ;; Use elogind instead of systemd. (add-before 'configure 'remove-systemd (lambda _ diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ab86b228bb..3fb2cf8d0f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2980,13 +2980,7 @@ X server.") (string-prefix? "x86_64-" system))) %supported-systems)) (arguments - '(#:configure-flags '("--with-default-accel=uxa") - #:phases (modify-phases %standard-phases - (add-before 'bootstrap 'pre-bootstrap - (lambda _ - ;; Inhibit autogen.sh from running configure. - (setenv "NOCONFIGURE" "1") - #t))))) + '(#:configure-flags '("--with-default-accel=uxa"))) (home-page "https://www.x.org/wiki/") (synopsis "Intel video driver for X server") (description @@ -6079,12 +6073,6 @@ Conventions Manual) and some of the @dfn{EWMH} (base32 "11i7vyk3pynw8q8aczpy56qncm84y0cmhlvyja3sj8dgy60g03q2")) (file-name (git-file-name name version)))) (build-system gnu-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (setenv "NOCONFIGURE" "t") - (invoke "sh" "autogen.sh")))))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) -- cgit v1.2.3 From f379c665a8ba6ab30e19ddeabc310b2f4bb9e4fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Feb 2020 15:18:39 +0100 Subject: gnu: hurd-headers: Update snapshot. * gnu/packages/hurd.scm (hurd-headers): Update to 0.9-1.91a5167. [version]: Use GIT-VERSION. [arguments]: Add "--without-libcrypt" in #:configure-flags. --- gnu/packages/hurd.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 3d1709fcc3..c147bac8a3 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -129,11 +130,11 @@ communication.") (define-public hurd-headers ;; Resort to a post-0.9 snapshot that provides the 'file_utimens' and ;; 'file_exec_paths' RPCs that glibc 2.28 expects. - (let ((revision "0") - (commit "98b33905c89b7e5c309c74ae32302a5745901a6e")) + (let ((revision "1") + (commit "91a51672ff4cfe1f1a0712b4c542ded3081c825b")) (package (name "hurd-headers") - (version "0.9") + (version (git-version "0.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -141,7 +142,7 @@ communication.") (commit commit))) (sha256 (base32 - "1mj22sxgscas2675vrbxr477mwbxdj68pqcrh65lbir8qlssrgrf")) + "16k9wkahz9wasviijz53n6i13nmiwa9fs64ikf1jqh8rl60hw7cz")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs @@ -167,6 +168,7 @@ communication.") "--disable-ncursesw" "--disable-test" "--without-libbz2" + "--without-libcrypt" "--without-libz" ;; Skip the clnt_create check because it expects ;; a working glibc causing a circular dependency. -- cgit v1.2.3 From a21bd6d5c208111fbf96e9b402cc5ca872f95109 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Tue, 8 Oct 2019 02:55:03 +1100 Subject: build-system/gnu: Don't try executing directories in bootstrap phase. * guix/build/gnu-build-system.scm: (bootstrap): Change the file-exists? procedure to one that excludes directories, so that we do not mistake it for a script. For example if the source includes a bootstrap/ directory. Signed-off-by: Marius Bakke --- guix/build/gnu-build-system.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 22805c84ea..96913ef9f0 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2020 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -173,12 +174,16 @@ working directory." \"autoreconf\". Otherwise do nothing." ;; Note: Run that right after 'unpack' so that the generated files are ;; visible when the 'patch-source-shebangs' phase runs. - (if (not (file-exists? "configure")) + (define (script-exists? file) + (and (file-exists? file) + (not (file-is-directory? file)))) + + (if (not (script-exists? "configure")) ;; First try one of the BOOTSTRAP-SCRIPTS. If none exists, and it's ;; clearly an Autoconf-based project, run 'autoreconf'. Otherwise, do ;; nothing (perhaps the user removed or overrode the 'configure' phase.) - (let ((script (find file-exists? bootstrap-scripts))) + (let ((script (find script-exists? bootstrap-scripts))) ;; GNU packages often invoke the 'git-version-gen' script from ;; 'configure.ac' so make sure it has a valid shebang. (false-if-file-not-found -- cgit v1.2.3 From 1b2b7765a027908cdbeef7c96fd203509c9492de Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 16 Feb 2020 18:45:37 +0200 Subject: build: gnu-build-system: Adjust NOCONFIGURE variable. This ia a follow-up to 481a0f1a7ceac666a011b28324220584ead07698. * guix/build/gnu-build-system.scm (bootstrap): Set NOCONFIGURE for all bootstrap scripts. Clean up variable after use. --- guix/build/gnu-build-system.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 96913ef9f0..2e7dff2034 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -191,13 +191,15 @@ working directory." (if script (let ((script (string-append "./" script))) + (setenv "NOCONFIGURE" "true") (format #t "running '~a'~%" script) (if (executable-file? script) (begin (patch-shebang script) - (setenv "NOCONFIGURE" "true") (invoke script)) - (invoke "sh" script))) + (invoke "sh" script)) + ;; Let's clean up after ourselves. + (unsetenv "NOCONFIGURE")) (if (or (file-exists? "configure.ac") (file-exists? "configure.in")) (invoke "autoreconf" "-vif") -- cgit v1.2.3 From 88f85494491a0cd4d4262c97860f01e99c2bc313 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 17 Feb 2020 16:52:55 +0100 Subject: utils: Change 'patch-shebang' to not try to patch Rust source files. * guix/build/utils.scm (patch-shebang): Match only absolute paths. --- guix/build/utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index a398bf9b90..419c10195b 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -894,7 +894,7 @@ transferred and the continuation of the transfer as a thunk." (x x))) (define patch-shebang - (let ((shebang-rx (make-regexp "^[[:blank:]]*([[:graph:]]+)[[:blank:]]*([[:graph:]]*)(.*)$"))) + (let ((shebang-rx (make-regexp "^[[:blank:]]*(/[[:graph:]]+)[[:blank:]]*([[:graph:]]*)(.*)$"))) (lambda* (file #:optional (path (search-path-as-string->list (getenv "PATH"))) -- cgit v1.2.3 From eb07edabaf11e39b25f5cf40967afd3dadcb14eb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Feb 2020 23:01:54 +0100 Subject: gnu: datefudge: Fix compilation against libc 2.31. * gnu/packages/patches/datefudge-gettimeofday.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/time.scm (datefudge)[source] Use it. --- gnu/local.mk | 3 ++- gnu/packages/patches/datefudge-gettimeofday.patch | 13 +++++++++++++ gnu/packages/time.scm | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/datefudge-gettimeofday.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2b425bee22..dcdcef9875 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge # Copyright © 2016 Mathieu Lirzin # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver @@ -806,6 +806,7 @@ dist_patch_DATA = \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ + %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ diff --git a/gnu/packages/patches/datefudge-gettimeofday.patch b/gnu/packages/patches/datefudge-gettimeofday.patch new file mode 100644 index 0000000000..11c7640869 --- /dev/null +++ b/gnu/packages/patches/datefudge-gettimeofday.patch @@ -0,0 +1,13 @@ +Add the 'restrict' qualifier to match the 'gettimeofday' declaration found +in glibc 2.31. + +--- datefudge-1.23/datefudge.c 2020-02-17 22:35:21.343341725 +0100 ++++ datefudge-1.23/datefudge.c 2020-02-17 22:35:49.619117874 +0100 +@@ -78,6 +78,6 @@ + return 0; + } + +-int gettimeofday(struct timeval *x, struct timezone *y) { ++int gettimeofday(struct timeval *restrict x, void *restrict y) { + return __gettimeofday(x,y); + } diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 63227d7bf5..b9ce791827 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -39,6 +39,7 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages perl) @@ -429,7 +430,8 @@ datetime type.") (file-name (git-file-name name version)) (sha256 (base32 - "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv")))) + "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv")) + (patches (search-patches "datefudge-gettimeofday.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From ac83dc82ea9f458a4040d4449de993d373fa0fdf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Feb 2020 23:05:20 +0100 Subject: gnu: gnutls: Add dependency on datefudge. * gnu/packages/time.scm (datefudge)[source]: Use 'url-fetch' instead of 'git-fetch'. * gnu/packages/tls.scm (gnutls)[native-inputs]: Add DATEFUDGE. --- gnu/packages/time.scm | 18 ++++++++++-------- gnu/packages/tls.scm | 5 +++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index b9ce791827..d4c0f7efc6 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2013, 2017 Ludovic Courtès +;;; Copyright © 2013, 2017, 2020 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2015, 2017 Leo Famulari @@ -36,7 +36,6 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -423,14 +422,17 @@ datetime type.") (name "datefudge") (version "1.23") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://salsa.debian.org/debian/datefudge.git") - (commit (string-append "debian/" version)))) - (file-name (git-file-name name version)) + ;; Source code is available from + ;; . However, + ;; for bootstrapping reasons, we do not rely on 'git-fetch' here + ;; (since Git -> GnuTLS -> datefudge). + (method url-fetch) + (uri (string-append + "mirror://debian/pool/main/d/datefudge/datefudge_" + version ".tar.xz")) (sha256 (base32 - "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv")) + "0ifnlb0mc8qc2kb5042pbz0ns6rwcb7201di8wyrsphl0yhnhxiv")) (patches (search-patches "datefudge-gettimeofday.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f1d3f94458..d8a767f73f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2013, 2015 Andreas Enge @@ -225,7 +225,8 @@ living in the same process.") (native-inputs `(("net-tools" ,net-tools) ("pkg-config" ,pkg-config) - ("which" ,which))) + ("which" ,which) + ("datefudge" ,datefudge))) ;tests rely on 'datefudge' (inputs `(("guile" ,guile-2.2))) (propagated-inputs -- cgit v1.2.3 From d98205b4fc00cc3387df911217bffb896d078100 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 15 Sep 2019 13:21:31 +0200 Subject: gnu: Add gash-core-utils. * gnu/packages/shells.scm (gash-core-utils): New variable. --- gnu/packages/shells.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0e61284c50..a25c15443f 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -855,3 +855,36 @@ designed to be capable of bootstrapping their standard GNU counterparts. Underpinning these utilities are many Scheme interfaces for manipulating files and text.") (license gpl3+))) + +(define-public gash-core-utils + (package + (name "gash-core-utils") + (version "0.0.211-789c3") + (source (origin + (method url-fetch) + (uri (string-append "http://lilypond.org/janneke/guix/20191123/" + "/gash-core-utils-" version ".tar.gz")) + (sha256 + (base32 + "1ycf0ivyn9q3lc9hwq8vxg6wkwpsykvh48a5lrzsmganh0ma8wrr")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2) + ("gash" ,gash))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-test + (lambda _ + (substitute* "tests/core-utils.org" + (("ls \\(GASH\\) UNKNOWN") "ls (GASH) 0.0.211-789c3")) + #t))))) + (home-page "https://gitlab.com/janneke/gash-core-utils") + (synopsis "Bootstrappable replacement of core GNU utilities in Guile Scheme") + (description "Gash Core Utils provides core GNU utilities in Guile +Scheme as bootstrappable replacement for GNU coreutils&co.") + (license gpl3+))) -- cgit v1.2.3 From 6fc09bd74fd529f336a2d1539eb65063c6e31ff4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 26 Nov 2019 22:40:09 +0100 Subject: gnu: bootstrap: Add janneke's guix package url. * gnu/packages/bootstrap.scm (%bootstrap-base-urls): Add janneke's guix package url. --- gnu/packages/bootstrap.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index d6995f104c..c097d93693 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -301,7 +301,8 @@ or false to signal an error." "http://alpha.gnu.org/gnu/guix/bootstrap" "ftp://alpha.gnu.org/gnu/guix/bootstrap" "http://www.fdn.fr/~lcourtes/software/guix/packages" - "http://flashner.co.il/guix/bootstrap")) + "http://flashner.co.il/guix/bootstrap" + "http://lilypond.org/janneke/guix/")) (define (bootstrap-guile-url-path system) "Return the URI for FILE." -- cgit v1.2.3 From 899c8f3afa6453ff250c6527ff439f536cd0aef1 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 2 Dec 2019 19:11:23 +0100 Subject: gnu: commencement: Add %bootstrap-guile+guild. * gnu/packages/commencement.scm (%bootstrap-guile+guild): New variable. --- gnu/packages/commencement.scm | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 89f9305970..04502a4e90 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -81,6 +81,57 @@ ;;; ;;; Code: +(define %bootstrap-guile+guild + ;; This package combines %bootstrap-guile with guild, which is not included + ;; in %bootstrap-guile. Guild is needed to build gash-boot and + ;; gash-core-utils-boot because it is dependency of the Guile build system. + (package + (name "guile-bootstrap+guild") + (version "2.0") + (source (bootstrap-origin (package-source guile-2.0))) + (native-inputs `(("bash" ,(bootstrap-executable "bash" (%current-system))) + ("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) + ("guile" ,%bootstrap-guile))) + (build-system trivial-build-system) + (arguments + `(#:guile ,%bootstrap-guile + #:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + (let ((guile-source (assoc-ref %build-inputs "source")) + (bin (string-append (getcwd) "/bin")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz"))) + (mkdir-p bin) + (setenv "PATH" bin) + (with-directory-excursion bin + (copy-file tar "tar") + (copy-file xz "xz") + (setenv "PATH" bin)) + (let* ((out (assoc-ref %outputs "out")) + (out-bin (string-append out "/bin")) + (guile (assoc-ref %build-inputs "guile")) + (bash (assoc-ref %build-inputs "bash"))) + (mkdir-p out-bin) + (with-directory-excursion out-bin + (symlink (string-append guile "/bin/guile") + "guile") + (invoke "tar" "--strip-components=2" + "-xvf" guile-source + (string-append "guile-" + ,(package-version guile-2.0) + "/meta/guild.in")) + (copy-file "guild.in" "guild") + (substitute* "guild" + (("#!/bin/sh") (string-append "#! " bash)) + (("@installed_guile@") (string-append out-bin "/guile"))) + (chmod "guild" #o555))))))) + (synopsis "Bootstrap Guile plus Guild") + (description "Bootstrap Guile with added Guild") + (home-page #f) + (license (package-license guile-2.0)))) + (define mes-boot (package (inherit mes) -- cgit v1.2.3 From d3aec6bd896e005cd4aac77f2c1788aaac91a3f2 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 6 Dec 2019 07:21:21 +0100 Subject: gnu: commencement: Add gash-boot. * gnu/packages/commencement.scm (gash-boot): New variable. --- gnu/packages/commencement.scm | 94 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 04502a4e90..e077fe63d5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2017 Mark H Weaver ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -44,6 +44,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages linux) #:use-module (gnu packages hurd) + #:use-module (gnu packages shells) #:use-module (gnu packages texinfo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages rsync) @@ -51,6 +52,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system guile) #:use-module (guix build-system trivial) #:use-module (guix memoization) #:use-module (guix utils) @@ -130,7 +132,95 @@ (synopsis "Bootstrap Guile plus Guild") (description "Bootstrap Guile with added Guild") (home-page #f) - (license (package-license guile-2.0)))) + (license (package-license guile-2.0)) + (native-search-paths + (list (search-path-specification + (variable "GUILE_LOAD_PATH") + (files '("share/guile/site/2.0"))) + (search-path-specification + (variable "GUILE_LOAD_COMPILED_PATH") + (files '("lib/guile/2.0/site-ccache"))))))) + +(define gash-boot + (package + (inherit gash) + (name "gash-boot") + (version "0.2.0") + (source (bootstrap-origin + (origin (inherit (package-source gash)) + (modules '((guix build utils) + (srfi srfi-26))) + (snippet + '(begin + ;; Remove Guix'y files that we cannot compile. + (delete-file "guix.scm") + (delete-file-recursively "tests") + #t))))) + (build-system guile-build-system) + (native-inputs `(("bash" ,(bootstrap-executable "bash" (%current-system))) + ("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) + ("guile-source" ,(bootstrap-origin + (package-source guile-2.0))))) + (inputs `(("guile" ,%bootstrap-guile+guild))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile+guild + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-guile-source + (lambda _ + (let ((guile-source (assoc-ref %build-inputs "guile-source")) + (bin (string-append (getcwd) "/zee-bin"))) + (mkdir-p bin) + (with-directory-excursion bin + (invoke "tar" "--strip-components=2" + + "-xvf" guile-source + (string-append "guile-" + ,(package-version guile-2.0) + "/meta/guild.in")) + (copy-file "guild.in" "guild") + (chmod "guild" #o555)) + #t))) + (add-before 'unpack 'set-path + (lambda _ + (let ((bash (assoc-ref %build-inputs "bash")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (bin (string-append (getcwd) "/zee-bin"))) + (mkdir-p bin) + (setenv "PATH" (string-append bin ":" (getenv "PATH"))) + (copy-file bash (string-append bin "/bash")) + (copy-file bash (string-append bin "/sh")) + (copy-file tar (string-append bin "/tar")) + (copy-file xz (string-append bin "/xz")) + #t))) + (add-after 'build 'build-scripts + (lambda _ + (let* ((guile (assoc-ref %build-inputs "guile")) + (guile (string-append guile "/bin/guile")) + (out (assoc-ref %outputs "out")) + (effective "2.0") + (moddir (string-append out "/share/guile/site/" effective "/")) + (godir (string-append out "/lib/guile/" effective "/site-ccache/"))) + (copy-file "scripts/gash.in" "scripts/gash") + (chmod "scripts/gash" #o555) + (substitute* "scripts/gash" + (("@GUILE@") guile) + (("@MODDIR@") moddir) + (("@GODIR") godir)) + #t))) + (add-after 'install 'install-scripts + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (install-file "scripts/gash" bin) + (copy-file "scripts/gash" "scripts/sh") + (install-file "scripts/sh" bin) + (copy-file "scripts/gash" "scripts/bash") + (install-file "scripts/bash" bin) + #t)))))))) (define mes-boot (package -- cgit v1.2.3 From 9f5a22b9de807da98b63badc7710325fcfe5f3fd Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 6 Dec 2019 07:22:06 +0100 Subject: gnu: commencement: Add gash-core-utils-boot. * gnu/packages/commencement.scm (gash-core-utils-boot): New variable. (%boot-gash-inputs): New variable. --- gnu/packages/commencement.scm | 166 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index e077fe63d5..bf320c1761 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -222,6 +222,172 @@ (install-file "scripts/bash" bin) #t)))))))) +(define gash-core-utils-boot + (package + (inherit gash-core-utils) + (name "gash-core-utils-boot") + (version "0.0.213-3f6eb") + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append "http://lilypond.org/janneke/" + "/gash-core-utils-" version ".tar.gz")) + (modules '((guix build utils))) + (snippet + '(begin + ;; The Guile build system compiles *.scm; avoid + ;; compiling included lalr. + (delete-file "guix.scm") + (delete-file-recursively "tests") + (substitute* "system/base/lalr.scm" + (("system/base/lalr.upstream.scm") "lalr.upstream.scm")) + #t)) + (sha256 + (base32 + "0601c9hqbjrjjsllr2m3zmkglkd53d97in7a5c22ikd8islddp76"))))) + (build-system guile-build-system) + (native-inputs `(("bash" ,(bootstrap-executable "bash" (%current-system))) + ("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) + ("guile-source" ,(bootstrap-origin + (package-source guile-2.0))) + ;; We need the 2.0.9 lalr for %bootstrap-guile + ("lalr.upstream" + ,(origin + (method url-fetch) + (uri (string-append "http://git.savannah.gnu.org/cgit/guile.git/plain/module/system/base/lalr.upstream.scm?h=v2.0.9")) + (file-name "lalr.upstream.scm") + (sha256 + (base32 + "0h7gyjj8nr2qrgzwma146s7l22scp8bbcqzdy9wqf12bgyhbw7d5")))))) + (inputs `(("guile" ,%bootstrap-guile+guild) + ("gash" ,gash-boot))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile+guild + #:not-compiled-file-regexp "upstream\\.scm$" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-guile-source + (lambda _ + (let ((guile-source (assoc-ref %build-inputs "guile-source")) + (bin (string-append (getcwd) "/zee-bin"))) + (mkdir-p bin) + (with-directory-excursion bin + (invoke "tar" "--strip-components=2" + + "-xvf" guile-source + (string-append "guile-" + ,(package-version guile-2.0) + "/meta/guild.in")) + (copy-file "guild.in" "guild") + (chmod "guild" #o555)) + #t))) + (add-before 'unpack 'set-path + (lambda _ + (let ((bash (assoc-ref %build-inputs "bash")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (bin (string-append (getcwd) "/zee-bin"))) + (mkdir-p bin) + (setenv "PATH" (string-append bin ":" (getenv "PATH"))) + (copy-file bash (string-append bin "/bash")) + (copy-file bash (string-append bin "/sh")) + (copy-file tar (string-append bin "/tar")) + (copy-file xz (string-append bin "/xz")) + #t))) + (add-before 'build 'set-env + (lambda _ + (let ((gash (assoc-ref %build-inputs "gash"))) + (setenv "LANG" "C") + (setenv "LC_ALL" "C") + (setenv "GUILE_LOAD_PATH" + (string-append (getcwd) + ":" (getcwd) "/system/base" + ":" gash "/share/guile/2.0")) + (setenv "GUILE_LOAD_COMPILED_PATH" + (string-append ".:" gash "/lib/guile/2.0/site-ccache/")) + (format (current-error-port) + "GUILE_LOAD_PATH=~s\n" (getenv "GUILE_LOAD_PATH")) + #t))) + (add-before 'build 'replace-lalr.upstream + (lambda _ + (let ((lalr.upstream (assoc-ref %build-inputs "lalr.upstream"))) + (copy-file lalr.upstream "system/base/lalr.upstream.scm") + #t))) + (add-after 'build 'build-scripts + (lambda _ + (let* ((guile (assoc-ref %build-inputs "guile")) + (guile (string-append guile "/bin/guile")) + (gash (string-append guile "gash")) + (out (assoc-ref %outputs "out")) + (effective "2.0") + (guilemoduledir (string-append gash "/share/guile/site/" effective "/")) + (guileobjectdir (string-append gash "/lib/guile/" effective "/site-ccache/")) + (gashmoduledir (string-append out "/share/guile/site/" effective "/")) + (gashobjectdir (string-append out "/lib/guile/" effective "/site-ccache/")) + (bin (string-append out "/bin"))) + (define (wrap name) + (copy-file "command.in" name) + (chmod name #o555) + (substitute* name + (("@GUILE@") guile) + (("@guilemoduledir@") guilemoduledir) + (("@guileobjectdir") guileobjectdir) + (("@gashmoduledir@") gashmoduledir) + (("@gashobjectdir") gashobjectdir) + (("@command@") name)) + (install-file name bin)) + (mkdir-p bin) + (with-directory-excursion "bin" + (for-each wrap '("awk" + "basename" + "cat" + "chmod" + "cmp" + "compress" + "cp" + "cut" + "diff" + "dirname" + "expr" + "false" + "find" + "grep" + "gzip" + "head" + "ln" + "ls" + "mkdir" + "mv" + "pwd" + "reboot" + "rm" + "rmdir" + "sed" + "sleep" + "sort" + "tar" + "test" + "touch" + "tr" + "true" + "uname" + "uniq" + "wc" + "which"))) + (with-directory-excursion bin + (copy-file "grep" "fgrep") + (copy-file "grep" "egrep") + (copy-file "test" "[")) + #t)))))))) + +(define (%boot-gash-inputs) + `(("bash" , gash-boot) ; gnu-build-system wants "bash" + ("coreutils" , gash-core-utils-boot) + ("guile" ,%bootstrap-guile) + ("guile+guild" ,%bootstrap-guile+guild))) + (define mes-boot (package (inherit mes) -- cgit v1.2.3 From da2ae09b4289cfd7e05dfd50538ef72bcae9c45f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 8 Dec 2019 20:37:55 +0100 Subject: gnu: commencement: Add %bootstrap-mes-rewired. * gnu/packages/commencement.scm (%bootstrap-mes-rewired): New variable. --- gnu/packages/commencement.scm | 109 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index bf320c1761..f666dbe924 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -388,6 +388,115 @@ ("guile" ,%bootstrap-guile) ("guile+guild" ,%bootstrap-guile+guild))) +(define %bootstrap-mes-rewired + (package + (inherit mes) + (name "bootstrap-mes-rewired") + (version "0.19") + (source #f) + (native-inputs `(("mes" ,(@ (gnu packages bootstrap) %bootstrap-mes)) + ("gash" ,gash-boot))) + (inputs '()) + (propagated-inputs '()) + (outputs '("out")) + (build-system trivial-build-system) + (arguments + `(#:guile ,%bootstrap-guile + #:modules ((guix build utils) + (srfi srfi-26)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-26)) + (let* ((mes (assoc-ref %build-inputs "mes")) + (gash (assoc-ref %build-inputs "gash")) + (mes-bin (string-append mes "/bin")) + (guile (string-append mes-bin "/mes")) + (mes-module (string-append mes "/share/mes/module")) + (out (assoc-ref %outputs "out")) + (bin (string-append out "/bin")) + (mescc (string-append bin "/mescc")) + (module (string-append out "/share/mes/module"))) + (define (rewire file) + (substitute* file + ((mes) out) + (("/gnu/store[^ ]+mes-minimal-[^/)}\"]*") out) + (("/gnu/store[^ ]+guile-[^/]*/bin/guile") guile) + (("/gnu/store[^ ]+bash-[^/)}\"]*") gash))) + + (mkdir-p bin) + (for-each (lambda (file) (install-file file bin)) + (find-files mes-bin)) + (mkdir-p module) + (copy-recursively (string-append mes-module "/mes") + (string-append module "/mes")) + (copy-recursively (string-append mes-module "/srfi") + (string-append module "/srfi")) + (for-each rewire + ;; Cannot easily rewire "mes" because it + ;; contains NUL characters; would require + ;; remove-store-references alike trick + (filter (negate (cut string-suffix? "/mes" <>)) + (find-files bin))) + (rewire (string-append module "/mes/boot-0.scm")) + + (delete-file mescc) + (with-output-to-file mescc + (lambda _ + (display (string-append + "\ +#! " gash "/bin/sh +LANG=C +LC_ALL=C +export LANG LC_ALL + +MES_PREFIX=${MES_REWIRED_PREFIX-" out "/share/mes} +MES=" bin "/mes +export MES MES_PREFIX + +MES_ARENA=${MES_REWIRED_ARENA-10000000} +MES_MAX_ARENA=${MES_REWIRED_ARENA-10000000} +MES_STACK=${MES_REWIRED_STACK-1000000} +export MES_ARENA MES_MAX_ARENA MES_STACK + +$MES -e '(mescc)' module/mescc.scm -- \"$@\" +")))) + (chmod mescc #o555) + + (with-directory-excursion module + (chmod "mes/base.mes" #o644) + (copy-file "mes/base.mes" "mes/base.mes.orig") + (let ((base.mes (open-file "mes/base.mes" "a"))) + (display " +;; A fixed map, from Mes 0.21, required to bootstrap Mes 0.21 +(define (map f h . t) + (if (or (null? h) + (and (pair? t) (null? (car t))) + (and (pair? t) (pair? (cdr t)) (null? (cadr t)))) '() + (if (null? t) (cons (f (car h)) (map f (cdr h))) + (if (null? (cdr t)) + (cons (f (car h) (caar t)) (map f (cdr h) (cdar t))) + (if (null? (cddr t)) + (cons (f (car h) (caar t) (caadr t)) (map f (cdr h) (cdar t) (cdadr t))) + (if (null? (cdddr t)) + (cons (f (car h) (caar t) (caadr t) (car (caddr t))) (map f (cdr h) (cdar t) (cdadr t) (cdr (caddr t)))) + (error 'unsupported (cons* 'map-5: f h t))) ))))) +" base.mes) + (close base.mes)) + + (chmod "mes/guile.mes" #o644) + (copy-file "mes/guile.mes" "mes/guile.mes.orig") + (let ((guile.mes (open-file "mes/guile.mes" "a"))) + (display " +;; After booting guile.scm; use Mes 0.21; especially: MesCC 0.21 +(let* ((self (car (command-line))) + (prefix (dirname (dirname self)))) + (set! %moduledir (string-append prefix \"/mes/module/\")) + (setenv \"%numbered_arch\" \"true\")) + +" guile.mes) + (close guile.mes))) + #t)))))) + (define mes-boot (package (inherit mes) -- cgit v1.2.3 From c9c1cbf60d64f2f2169b2025495e60c22d283193 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 3 Jan 2019 21:50:10 +0100 Subject: gnu: commencement: mes-boot: Use Gash instead of coretutils&co. * gnu/packages/commencement.scm (mes-boot): Update to 0.21-32-g51c7e5f6f. Use Gash instead of coretutils&co. --- gnu/packages/commencement.scm | 96 +++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 41 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index f666dbe924..14647dfc87 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -477,9 +477,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (cons (f (car h) (caar t)) (map f (cdr h) (cdar t))) (if (null? (cddr t)) (cons (f (car h) (caar t) (caadr t)) (map f (cdr h) (cdar t) (cdadr t))) - (if (null? (cdddr t)) - (cons (f (car h) (caar t) (caadr t) (car (caddr t))) (map f (cdr h) (cdar t) (cdadr t) (cdr (caddr t)))) - (error 'unsupported (cons* 'map-5: f h t))) ))))) + (error 'unsupported (cons* 'map-4: f h t))b ))))) " base.mes) (close base.mes)) @@ -501,72 +499,88 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (package (inherit mes) (name "mes-boot") - (version "0.19") + (version "0.21-33-g6d493b90d") (source (origin (method url-fetch) - (uri (string-append "mirror://gnu/mes/" + (uri (string-append "http://lilypond.org/janneke/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) + "0nr74zyam5n82svjwfbcz2mycj88vvsqab12x0mxv1lm6yqxqmmj")))) (inputs '()) (propagated-inputs '()) (native-inputs - `(("mescc-tools" ,%bootstrap-mescc-tools) - ("nyacc-source" ,(bootstrap-origin - (package-source nyacc-0.86))) - - ("coreutils" , %bootstrap-coreutils&co) - ("bootstrap-mes" ,%bootstrap-mes))) + `(("nyacc-source" ,(origin (inherit (package-source nyacc)) + (snippet #f))) + ("mes" ,%bootstrap-mes-rewired) + ("mescc-tools" ,%bootstrap-mescc-tools) + ,@(%boot-gash-inputs))) (arguments `(#:implicit-inputs? #f + #:tests? #f #:guile ,%bootstrap-guile #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-seeds (lambda _ - (let ((nyacc-source (assoc-ref %build-inputs "nyacc-source")) - (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) + (let ((nyacc-source (assoc-ref %build-inputs "nyacc-source"))) (with-directory-excursion ".." - (mkdir-p "nyacc-source") - (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed")) - #t))) + (invoke "tar" "-xvf" nyacc-source))))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref %outputs "out"))) - (setenv "GUILE" "mes") - (setenv "GUILE_EFFECTIVE_VERSION" "2.2") - (setenv "GUILE_LOAD_PATH" "nyacc") - (symlink (string-append "../nyacc-source/module") "nyacc") - (invoke "bash" "configure.sh" - (string-append "--prefix=" out))))) + (let ((out (assoc-ref %outputs "out")) + (gash (assoc-ref %build-inputs "bash")) + (mes (assoc-ref %build-inputs "mes")) + (dir (with-directory-excursion ".." (getcwd)))) + (setenv "AR" (string-append "gash " (getcwd) "/scripts/mesar")) + (setenv "BASH" (string-append gash "/bin/bash")) + (setenv "CC" (string-append mes "/bin/mescc")) + (setenv "GUILE_LOAD_PATH" + (string-append + mes "/share/mes/module" + ":" dir "/nyacc-0.99.0/module" + ":" (getenv "GUILE_LOAD_PATH"))) + (invoke "gash" "configure.sh" + (string-append "--prefix=" out) + (string-append "--host=i686-linux-gnu"))))) (replace 'build (lambda _ - (let ((mes (assoc-ref %build-inputs "bootstrap-mes"))) - (setenv "MES_PREFIX" (string-append mes "/share/mes")) - (setenv "MES_ARENA" "100000000") - (setenv "MES_MAX_ARENA" "100000000") - (setenv "MES_STACK" "10000000") - (invoke "sh" "bootstrap.sh")))) - (replace 'check - (lambda _ - (setenv "DIFF" "sh scripts/diff.scm") - ;; fail fast tests - ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") - ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") - (invoke "sh" "check.sh"))) + (invoke "sh" "bootstrap.sh"))) + (delete 'check) (replace 'install (lambda _ - (invoke "sh" "install.sh")))))) + (substitute* "install.sh" ; show some progress + ((" -xf") " -xvf") + (("^( *)((cp|mkdir|tar) [^']*[^\\])\n" all space cmd) + (string-append space "echo '" cmd "'\n" + space cmd "\n"))) + (invoke "sh" "install.sh") + ;; Keep ASCII output, for friendlier comparison and bisection + (let* ((out (assoc-ref %outputs "out")) + (cache (string-append out "/lib/cache"))) + (define (objects-in-dir dir) + (find-files dir + (lambda (name stat) + (and (equal? (dirname name) dir) + (or (string-suffix? ".o" name) + (string-suffix? ".s" name)))))) + (for-each (lambda (x) (install-file x cache)) + (append (objects-in-dir ".") + (objects-in-dir "mescc-lib")))) + #t))))) (native-search-paths (list (search-path-specification (variable "C_INCLUDE_PATH") - (files '("share/mes/include"))) + (files '("include"))) (search-path-specification (variable "LIBRARY_PATH") - (files '("share/mes/lib"))))))) + (files '("lib"))) + (search-path-specification + (variable "MES_PREFIX") + (separator #f) + (files '(""))))))) + (define tcc-boot0 ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 11 -- cgit v1.2.3 From 5dedce047c97d5ac17daa284b56c74bf4e1a29b2 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 4 Dec 2018 23:19:56 +0100 Subject: gnu: commencement: tcc-boot0: Use Gash instead of coretutils&co. * gnu/packages/commencement.scm (tcc-boot0): Use Gash instead of coretutils&co. --- gnu/packages/commencement.scm | 187 +++++++++++++++++++----------------------- 1 file changed, 83 insertions(+), 104 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 14647dfc87..1444c70e3d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -589,111 +589,90 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" ;; bootstrappable effort; we will try again later. These patches have been ;; ported to 0.9.27, alas the resulting tcc is buggy. Once MesCC is more ;; mature, this package should use the 0.9.27 sources (or later). - (let ((version "0.9.26") - (revision "6") - (commit "c004e9a34fb026bb44d211ab98bb768e79900eef")) - (package - (inherit tcc) - (name "tcc-boot0") - (version (string-append version "-" revision "." (string-take commit 7))) - (source (origin - (method url-fetch) - (uri (list (string-append "mirror://gnu/guix/mirror" - "/tinycc-" commit ".tar.gz") - (string-append "https://gitlab.com/janneke/tinycc" - "/-/archive/" commit - "/tinycc-" commit ".tar.gz"))) - (sha256 - (base32 - "1hmzn1pq0x22ppd80hyrn5qzqq94mxd0ychzj6vrr2vnj2frjv5b")))) - (build-system gnu-build-system) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (native-inputs - `(("mes" ,mes-boot) - ("mescc-tools" ,%bootstrap-mescc-tools) - ("nyacc-source" ,(bootstrap-origin - (package-source nyacc-0.86))) + (package + (inherit tcc) + (name "tcc-boot0") + (version "0.9.26-1103-g6e62e0e") + (source (origin + (method url-fetch) + (uri (string-append + "http://lilypond.org/janneke/mes/20191117/" + "/tcc-" version ".tar.gz")) + (sha256 + (base32 + "1qbybw7mxbgkv3sazvz1v7c8byq998vk8f1h25ik8w3d2l63lxng")))) + (build-system gnu-build-system) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mes" ,mes-boot) + ("nyacc-source" ,(origin (inherit (package-source nyacc)) + (snippet #f))) + ("mescc-tools" ,%bootstrap-mescc-tools) + ,@(%boot-gash-inputs))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:validate-runpath? #f ; no dynamic executables + #:strip-binaries? #f ; no strip yet + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-seeds + (lambda* (#:key outputs #:allow-other-keys) + (let ((nyacc-source (assoc-ref %build-inputs "nyacc-source"))) + (with-directory-excursion ".." + (invoke "tar" "-xvf" nyacc-source))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (dir (with-directory-excursion ".." (getcwd))) + (interpreter "/lib/mes-loader")) - ("coreutils" , %bootstrap-coreutils&co) - ("bootstrap-mes" ,%bootstrap-mes))) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-seeds - (lambda* (#:key outputs #:allow-other-keys) - (let* ((coreutils (assoc-ref %build-inputs "coreutils")) - (nyacc-source (assoc-ref %build-inputs "nyacc-source")) - (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) - (setenv "PATH" (string-append - coreutils "/bin")) - (format (current-error-port) "PATH=~s\n" (getenv "PATH")) - (with-directory-excursion ".." - (mkdir-p "nyacc-source") - (invoke "tar" "--strip=1" "-C" "nyacc-source" - "-xvf" nyacc-source) - (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed")) - #t))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out")) - (dir (with-directory-excursion ".." (getcwd))) - (coreutils (assoc-ref %build-inputs "coreutils")) - (mes (assoc-ref %build-inputs "mes")) - (mescc-tools (assoc-ref %build-inputs "mescc-tools")) - (libc (assoc-ref %build-inputs "libc")) - (interpreter (if libc - ;; also for x86_64-linux, we are still on i686-linux - (string-append libc ,(glibc-dynamic-linker "i686-linux")) - (string-append mes "/lib/mes-loader")))) - (setenv "PATH" (string-append - coreutils "/bin" - ":" mes "/bin" - ":" mescc-tools "/bin")) - (format (current-error-port) "PATH=~s\n" (getenv "PATH")) - - (setenv "PREFIX" out) - (symlink (string-append mes "/share/mes") "mes") - (symlink (string-append "../nyacc-source/module") "nyacc") - (setenv "MES_PREFIX" "mes") - (setenv "MES_ARENA" "100000000") - (setenv "MES_MAX_ARENA" "100000000") - (setenv "MES_STACK" "10000000") - (setenv "MES" "mes") - (setenv "GUILE_LOAD_PATH" "nyacc") - (invoke "sh" "configure" - "--prefix=$PREFIX" - (string-append "--elfinterp=" interpreter) - "--crtprefix=." - "--tccdir=.")))) - (replace 'build - (lambda _ - (substitute* "bootstrap.sh" - (("^ cmp") "# cmp")) - (invoke "sh" "bootstrap.sh"))) - (replace 'check - (lambda _ - (setenv "DIFF" "diff.scm") - (setenv "OBJDUMP" "true") - ;; fail fast tests - ;; (invoke "sh" "test.sh" "mes/scaffold/tests/30-strlen") - ;; (invoke "sh" "-x" "test.sh" "mes/scaffold/tinycc/00_assignment") - (setenv "TCC" "./tcc") - (invoke "sh" "check.sh"))) - (replace 'install - (lambda _ - (invoke "sh" "install.sh")))))) - (native-search-paths - (list (search-path-specification - (variable "C_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib")))))))) + (setenv "prefix" out) + (setenv "GUILE_LOAD_PATH" + (string-append dir "/nyacc-0.99.0/module")) + + (substitute* "conftest.c" + (("volatile") "")) + + (invoke "sh" "configure" + "--cc=mescc" + (string-append "--prefix=" out) + (string-append "--elfinterp=" interpreter) + "--crtprefix=." + "--tccdir=.")))) + (replace 'build + (lambda _ + (substitute* "bootstrap.sh" ; Show some progress + (("^( *)((cp|ls|mkdir|rm|[.]/tcc|[.]/[$][{PROGRAM_PREFIX[}]tcc) [^\"]*[^\\])\n" all space cmd) + (string-append space "echo \"" cmd "\"\n" + space cmd "\n"))) + (invoke "sh" "bootstrap.sh"))) + (replace 'check + (lambda _ + ;; fail fast tests + (system* "./tcc" "--help") ; --help exits 1 + ;; (invoke "sh" "test.sh" "mes/scaffold/tests/30-strlen") + ;; (invoke "sh" "-x" "test.sh" "mes/scaffold/tinycc/00_assignment") + ;; TODO: add sensible check target (without depending on make) + ;; (invoke "sh" "check.sh") + #t)) + (replace 'install + (lambda _ + (substitute* "install.sh" ; Show some progress + (("^( *)((cp|ls|mkdir|rm|tar|./[$][{PROGRAM_PREFIX[}]tcc) [^\"]*[^\\])\n" all space cmd) + (string-append space "echo \"" cmd "\"\n" + space cmd "\n"))) + + (invoke "sh" "install.sh")))))) + (native-search-paths + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib"))))))) (define tcc-boot (package -- cgit v1.2.3 From b022827de5440d64bf1ee57915bafadbca3a3dbe Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 21 Sep 2019 22:03:44 +0200 Subject: gnu: commencement: Add gzip-mesboot. * gnu/packages/commencement.scm (gzip-mesboot): New variable. --- gnu/packages/commencement.scm | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1444c70e3d..0f952286f2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -674,6 +674,61 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (variable "LIBRARY_PATH") (files '("lib"))))))) +(define gzip-mesboot + ;; The initial gzip. We keep this scripted gzip build before building make + ;; to soften the dependency on Gash Core Utils gzip. + (package + (inherit gzip) + (version "1.2.4") + (name "gzip-mesboot") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gzip/gzip-" version ".tar")) + (sha256 + (base32 + "1rhgk2vvmdvnn6vygf0dja92ryyng00knl0kz5srb77k2kryjb2d")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("tcc" ,tcc-boot0) + ,@(%boot-gash-inputs))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; no strip yet + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'scripted-patch + (lambda _ + (substitute* "util.c" + (("^char [*]strlwr" all) (string-append all "_tcc_cannot_handle_dupe"))) + #t)) + (replace 'build + (lambda _ + (let ((files '("bits" "crypt" "deflate" "getopt" "gzip" + "inflate" "lzw" "trees" "unlzh" "unlzw" + "unpack" "unzip" "util" "zip"))) + (define (compile x) + (invoke "tcc" "-c" "-D NO_UTIME=1" "-D HAVE_UNISTD_H=1" + (string-append x ".c"))) + (for-each compile files) + (apply invoke + (cons* "tcc" "-o" "gzip" + (map (lambda (x) (string-append x ".o")) files))) + (link "gzip" "gunzip")))) + (replace 'install + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (install-file "gzip" bin) + (install-file "gunzip" bin)))) + (replace 'check + (lambda _ + (invoke "./gzip" "--version"))) + ;; no gzip yet + (delete 'compress-documentation)))))) + (define tcc-boot (package (inherit tcc-boot0) -- cgit v1.2.3 From 19be1dc65b99449703741e5e5b37436540ca0894 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 21 Sep 2019 13:34:42 +0200 Subject: gnu: commencement: make-mesboot0: Use Gash instead of coreutils&co. * gnu/packages/commencement.scm (make-mesboot0): Use Gash instead of coreutils&co. (%boot-tcc0-inputs): New variable. --- gnu/packages/commencement.scm | 107 +++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 47 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 0f952286f2..8f7c95b976 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -729,6 +729,66 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" ;; no gzip yet (delete 'compress-documentation)))))) +(define make-mesboot0 + ;; The initial make + (package + (inherit gnu-make) + (name "make-mesboot0") + (version "3.80") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/make/make-" version ".tar.gz")) + (sha256 + (base32 + "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("tcc" ,tcc-boot0) + ,@(%boot-gash-inputs))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:configure-flags '("CC=tcc" + "CPP=tcc -E" + "LD=tcc" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--disable-nls") + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:strip-binaries? #f ; no strip yet + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'scripted-patch + (lambda _ + (substitute* "build.sh.in" + (("@LIBOBJS@") "getloadavg.o") + (("@REMOTE@") "stub")) + #t)) + (add-after 'configure 'configure-fixup + (lambda _ + (substitute* "make.h" + (("^extern long int lseek.*" all) (string-append "// " all))) + #t)) + (replace 'build + (lambda _ + (invoke "sh" "./build.sh"))) + (replace 'check ; proper check needs awk + (lambda _ + (invoke "./make" "--version"))) + (replace 'install + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (install-file "make" bin))))))))) + +(define (%boot-tcc0-inputs) + `(("make" ,make-mesboot0) + ("tcc" ,tcc-boot0) + ,@(%boot-gash-inputs))) + (define tcc-boot (package (inherit tcc-boot0) @@ -830,53 +890,6 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) #t)))))))) -(define make-mesboot0 - (package - (inherit gnu-make) - (name "make-mesboot0") - (version "3.80") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/make/make-" - version ".tar.gz")) - (sha256 - (base32 - "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4")))) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (native-inputs `(("tcc" ,tcc-boot) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co))) - (arguments - `(#:implicit-inputs? #f - #:tests? #f ; check depends on perl - #:guile ,%bootstrap-guile - #:configure-flags `("CC=tcc -DO_RDONLY=0" - "LD=tcc" - "--disable-nls") - #:phases - (modify-phases %standard-phases - (add-after 'configure 'configure-fixup - (lambda _ - (substitute* "build.sh" - (("^REMOTE=.*") "REMOTE=stub\n") - (("^extras=.*") "extras=getloadavg.c\n")) - (substitute* "make.h" - (("^extern long int lseek.*" all) (string-append "// " all))) - #t)) - (delete 'patch-generated-file-shebangs) ; no perl - (replace 'build - (lambda _ - (invoke "sh" "./build.sh"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "make" bin) - #t)))))))) - (define diffutils-mesboot (package (inherit diffutils) -- cgit v1.2.3 From 0bf3466372afd981c55396e14a11c3eccaf1924e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 21 Sep 2019 22:32:18 +0200 Subject: gnu: commencement: Add bzip2-mesboot. * gnu/packages/commencement.scm (bzip2-mesboot): New variable. --- gnu/packages/commencement.scm | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8f7c95b976..b9f5e6f438 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -789,6 +789,56 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" ("tcc" ,tcc-boot0) ,@(%boot-gash-inputs))) +(define bzip2-mesboot + ;; The initial bzip2 + (package + (inherit bzip2) + (name "bzip2-mesboot") + (version (package-version bzip2)) + (source (bootstrap-origin (package-source bzip2))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs (%boot-tcc0-inputs)) + (outputs '("out")) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + #:tests? #f ; check is naive, also checks non-built PROGRAMS + #:strip-binaries? #f ; no strip yet + #:make-flags (list "CC=tcc -I ." "AR=tcc -ar" "bzip2" + (string-append "PREFIX=" + (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'scripted-patch + (lambda _ + (substitute* "Makefile" + (("\tln " all) + (string-append "\t#" all))) + (substitute* "bzip2.c" + (("struct utimbuf uTimBuf;" all) + (string-append "// " all)) + (("uTimBuf[.]" all) + (string-append "// " all)) + (("retVal = utime [(] dstName, &uTimBuf [)];" all) + (string-append "retVal = 0; // " all))) + #t)) + (replace 'configure + (lambda _ + (with-output-to-file "utime.h" + (lambda _ (display " +#define fchown(filedes, owner, group) 0 +#define fchmod(filedes, mode) 0 +"))) + #t)) + (replace 'check + (lambda _ + (invoke "./bzip2" "--help"))) + ;; FIXME: no compressing gzip yet + (delete 'compress-documentation)))))) + (define tcc-boot (package (inherit tcc-boot0) -- cgit v1.2.3 From d9484fba91bc360ad18fe82cb9f4963ccb32c580 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 22 Sep 2019 00:53:54 +0200 Subject: gnu: commencement: Add bash-mesboot0. * gnu/packages/commencement.scm (bash-mesboot0): New variable. --- gnu/packages/commencement.scm | 102 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b9f5e6f438..80fff013e2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -940,6 +940,108 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) #t)))))))) +(define bash-mesboot0 + ;; The initial Bash + (package + (inherit static-bash) + (name "bash-mesboot0") + (version "2.05b") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/bash/bash-" + version ".tar.gz")) + (sha256 + (base32 + "1r1z2qdw3rz668nxrzwa14vk2zcn00hw7mpjn384picck49d80xs")))) + (inputs '()) + (propagated-inputs '()) + (native-inputs (%boot-tcc0-inputs)) + (outputs '("out")) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + #:strip-binaries? #f ; no strip yet + #:configure-flags + (list "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + + "--without-bash-malloc" + "--disable-readline" + "--disable-history" + "--disable-help-builtin" + "--disable-progcomp" + "--disable-net-redirections" + "--disable-nls" + + ;; Pretend 'dlopen' is missing so we don't build loadable + ;; modules and related code. + "ac_cv_func_dlopen=no") + #:make-flags '("bash") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (let* ((gash (assoc-ref %build-inputs "bash")) + (shell (string-append gash "/bin/gash"))) + (setenv "CONFIG_SHELL" shell) + (setenv "SHELL" shell) + (setenv "CC" "tcc") + (setenv "LD" "tcc") + (setenv "AR" "tcc -ar") + (setenv "CFLAGS" "-D _POSIX_VERSION=1") + #t))) + (add-after 'unpack 'scripted-patch + (lambda _ + (substitute* "Makefile.in" + (("mksyntax\\.c\n") "mksyntax.c -lgetopt\n") + (("buildversion[.]o\n") "buildversion.o -lgetopt\n") + ;; No size in Gash + (("\tsize ") "#\tsize")) + (substitute* "lib/sh/oslib.c" + (("int name, namelen;") "char *name; int namelen;")) + (substitute* "lib/sh/snprintf.c" + (("^#if (defined [(]HAVE_LOCALE_H[)])" all define) (string-append "#if 0 //" define))) + (substitute* "configure" + ((" egrep") " grep")) + #t)) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (let ((configure-flags (filter (lambda (x) + (and (not (string-prefix? "CONFIG_SHELL=" x)) + (not (string-prefix? "SHELL=" x)))) + configure-flags))) + (format (current-error-port) + "running ./configure ~a\n" (string-join configure-flags))) + (apply invoke (cons "./configure" configure-flags)))) + (add-after 'configure 'configure-fixups + (lambda _ + (substitute* "config.h" + (("#define GETCWD_BROKEN 1") "#undef GETCWD_BROKEN")) + (let ((config.h (open-file "config.h" "a"))) + (display (string-append " +// tcc: error: undefined symbol 'enable_hostname_completion' +#define enable_hostname_completion(on_or_off) 0 + +// /gnu/store/cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: 'sigprocmask' defined twice +#define HAVE_POSIX_SIGNALS 1 +#define endpwent(x) 0 +") + config.h) + (close config.h)) + #t)) + (replace 'check + (lambda _ + (invoke "./bash" "--version"))) + (replace 'install + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (copy-file "bash" (string-append bin "/bash")) + (copy-file "bash" (string-append bin "/sh")) + #t)))))))) + (define diffutils-mesboot (package (inherit diffutils) -- cgit v1.2.3 From 1be3efb39713004e901b200f1c0be9c4b17f6b94 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 21 Sep 2019 10:43:18 +0200 Subject: gnu: commencement: tcc-boot: Use Gash instead of coretutils&co. * gnu/packages/commencement.scm (tcc-boot): Use Gash instead of coretutils&co. --- gnu/packages/commencement.scm | 208 ++++++++++++++++++++++-------------------- 1 file changed, 107 insertions(+), 101 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 80fff013e2..21b78063be 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -839,107 +839,6 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" ;; FIXME: no compressing gzip yet (delete 'compress-documentation)))))) -(define tcc-boot - (package - (inherit tcc-boot0) - (name "tcc-boot") - (version "0.9.27") - (source (bootstrap-origin - (origin - (inherit (package-source tcc)) - (patches (search-patches "tcc-boot-0.9.27.patch"))))) - (build-system gnu-build-system) - (inputs '()) - (propagated-inputs '()) - (native-inputs - `(("mes" ,mes-boot) - ("tcc" ,tcc-boot0) - - ("coreutils" , %bootstrap-coreutils&co))) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - - ;; Binutils' 'strip' b0rkes MesCC/M1/hex2 binaries, tcc-boot also comes - ;; with MesCC/M1/hex2-built binaries. - #:strip-binaries? #f - - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out")) - (coreutils (assoc-ref %build-inputs "coreutils")) - (mes (assoc-ref %build-inputs "mes")) - (tcc (assoc-ref %build-inputs "tcc")) - (libc (assoc-ref %build-inputs "libc")) - (interpreter (if libc - ;; also for x86_64-linux, we are still on i686-linux - (string-append libc ,(glibc-dynamic-linker "i686-linux")) - (string-append mes "/lib/mes-loader")))) - ;; unpack - (setenv "PATH" (string-append - coreutils "/bin" - ":" tcc "/bin")) - (format (current-error-port) "PATH=~s\n" (getenv "PATH")) - (invoke "sh" "configure" - (string-append "--cc=tcc") - (string-append "--cpu=i386") - (string-append "--prefix=" out) - (string-append "--elfinterp=" interpreter) - (string-append "--crtprefix=" tcc "/lib") - (string-append "--sysincludepaths=" tcc "/include") - (string-append "--libpaths=" tcc "/lib"))))) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out")) - (mes (assoc-ref %build-inputs "mes")) - (tcc (assoc-ref %build-inputs "tcc")) - (libc (assoc-ref %build-inputs "libc")) - (interpreter (if libc - ;; also for x86_64-linux, we are still on i686-linux - (string-append libc ,(glibc-dynamic-linker "i686-linux")) - (string-append mes "/lib/mes-loader")))) - (invoke "tcc" - "-vvv" - "-D" "BOOTSTRAP=1" - "-D" "ONE_SOURCE=1" - "-D" "TCC_TARGET_I386=1" - "-D" "CONFIG_TCC_STATIC=1" - "-D" "CONFIG_USE_LIBGCC=1" - "-D" (string-append "CONFIG_TCCDIR=\"" out "/lib/tcc\"") - "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out "/lib:{B}/lib:.\"") - "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out - "/lib:{B}/lib:.\"") - "-D" (string-append "CONFIG_TCC_ELFINTERP=\"" interpreter "\"") - "-D" (string-append "CONFIG_TCC_LIBPATHS=\"" tcc "/lib:{B}/lib:.\"") - "-D" (string-append "CONFIG_TCC_SYSINCLUDEPATHS=\"" tcc "/include" ":/include:{B}/include\"") - "-D" (string-append "TCC_LIBGCC=\"" tcc "/lib/libc.a\"") - "-o" "tcc" - "tcc.c")))) - (replace 'check - (lambda _ - ;; FIXME: add sensible check target (without depending on make) - ;; ./check.sh ? - (= 1 (status:exit-val (system* "./tcc" "--help"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref %outputs "out")) - (tcc (assoc-ref %build-inputs "tcc"))) - (mkdir-p (string-append out "/bin")) - (copy-file "tcc" (string-append out "/bin/tcc")) - (mkdir-p (string-append out "/lib/tcc")) - (copy-recursively (string-append tcc "/include") - (string-append out "/include")) - (copy-recursively (string-append tcc "/lib") - (string-append out "/lib")) - (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") - (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") - (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) - (delete-file (string-append out "/lib/tcc/libtcc1.a")) - (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) - #t)))))))) - (define bash-mesboot0 ;; The initial Bash (package @@ -1042,6 +941,113 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (copy-file "bash" (string-append bin "/sh")) #t)))))))) +(define tcc-boot + ;; The final tcc. + (package + (inherit tcc-boot0) + (name "tcc-boot") + (version "0.9.27") + (source (origin + (inherit (package-source tcc)) + ;; `patches' needs XZ + ;; (patches (search-patches "tcc-boot-0.9.27.patch")) + )) + (build-system gnu-build-system) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(;;("boot-patch" ,(search-patch "tcc-boot-0.9.27.patch")) + ("bzip2" ,bzip2-mesboot) + ,@(%boot-tcc0-inputs))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:validate-runpath? #f ; no dynamic executables + #:strip-binaries? #f ; no strip yet + #:phases + (modify-phases %standard-phases + ;; tar xvf ..bz2 gives + ;; bzip2: PANIC -- internal consistency error + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (copy-file source "tarball.tar.bz2") + (invoke "bzip2" "-d" "tarball.tar.bz2") + (invoke "tar" "xvf" "tarball.tar") + (chdir (string-append "tcc-" ,version)) + #t)) + ;; no patch yet + ;; (add-after 'unpack 'apply-boot-patch + ;; (lambda* (#:key inputs #:allow-other-keys) + ;; (let ((patch-file (assoc-ref inputs "boot-patch"))) + ;; (invoke "patch" "-p1" "-i" patch-file)))) + (add-after 'unpack 'scripted-patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "libtcc.c" + (("s->alacarte_link = 1;" all) + (string-append all " + s->static_link = 1;"))) + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (tcc (assoc-ref %build-inputs "tcc")) + (libc (assoc-ref %build-inputs "libc")) + (interpreter "/mes/loader")) + (invoke "sh" "configure" + (string-append "--cc=tcc") + (string-append "--cpu=i386") + (string-append "--prefix=" out) + (string-append "--elfinterp=" interpreter) + (string-append "--crtprefix=" tcc "/lib") + (string-append "--sysincludepaths=" tcc "/include") + (string-append "--libpaths=" tcc "/lib"))))) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (tcc (assoc-ref %build-inputs "tcc")) + (libc (assoc-ref %build-inputs "libc")) + (interpreter "/mes/loader")) + (invoke + "tcc" + "-vvv" + "-D" "BOOTSTRAP=1" + "-D" "ONE_SOURCE=1" + "-D" "TCC_TARGET_I386=1" + "-D" "CONFIG_TCC_STATIC=1" + "-D" "CONFIG_USE_LIBGCC=1" + "-D" (string-append "CONFIG_TCCDIR=\"" out "/lib/tcc\"") + "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out "/lib:{B}/lib:.\"") + "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out "/lib:{B}/lib:.\"") + "-D" (string-append "CONFIG_TCC_ELFINTERP=\"" interpreter "\"") + "-D" (string-append "CONFIG_TCC_LIBPATHS=\"" tcc "/lib:{B}/lib:.\"") + "-D" (string-append "CONFIG_TCC_SYSINCLUDEPATHS=\"" + tcc "/include" ":/include:{B}/include\"") + "-D" (string-append "TCC_LIBGCC=\"" tcc "/lib/libc.a\"") + "-o" "tcc" + "tcc.c")))) + (replace 'check + (lambda _ + ;; FIXME: add sensible check target (without depending on make) + ;; ./check.sh ? + (= 1 (status:exit-val (system* "./tcc" "--help"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out")) + (tcc (assoc-ref %build-inputs "tcc"))) + (and + (mkdir-p (string-append out "/bin")) + (copy-file "tcc" (string-append out "/bin/tcc")) + (mkdir-p (string-append out "/lib/tcc")) + (copy-recursively (string-append tcc "/include") + (string-append out "/include")) + (copy-recursively (string-append tcc "/lib") + (string-append out "/lib")) + (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") + (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") + (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) + (delete-file (string-append out "/lib/tcc/libtcc1.a")) + (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) + #t))))))))) + (define diffutils-mesboot (package (inherit diffutils) -- cgit v1.2.3 From aa196f1f02afee706c4583d07a1fa34bdc18f0c8 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 22 Sep 2019 00:56:46 +0200 Subject: gnu: commencement: diffutils-mesboot: Use Gash instead of coretutils&co. * gnu/packages/commencement.scm (diffutils-mesboot): Use Gash instead of coretutils&co. --- gnu/packages/commencement.scm | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 21b78063be..9fcb69f433 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1049,6 +1049,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" #t))))))))) (define diffutils-mesboot + ;; The initial diffutils. (package (inherit diffutils) (name "diffutils-mesboot") @@ -1063,12 +1064,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) - (native-inputs `(("mes" ,mes-boot) - ("tcc" ,tcc-boot) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("make" ,make-mesboot0))) + (native-inputs (%boot-tcc0-inputs)) (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile @@ -1077,20 +1073,29 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" #:strip-binaries? #f ; no strip yet #:phases (modify-phases %standard-phases - ;; diffutils-2.7 needs more traditional configure - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bash (assoc-ref %build-inputs "bash"))) - (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) - (setenv "CC" "tcc") - (setenv "LD" "tcc") - (invoke "./configure" (string-append "--prefix=" out))))) (add-before 'configure 'remove-diff3-sdiff (lambda* (#:key outputs #:allow-other-keys) (substitute* "Makefile.in" - (("PROGRAMS = .*" all) "PROGRAMS = cmp diff")) - #t))))))) + (("PROGRAMS = .*" all) "PROGRAMS = cmp diff")))) + (replace 'configure ; needs classic invocation of configure + (lambda* (#:key configure-flags #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (setenv "CONFIG_SHELL" shell) + (setenv "CC" "tcc") + (setenv "LD" "tcc") + (format (current-error-port) + "running ./configure ~a\n" (string-join configure-flags)) + (apply invoke (cons "./configure" configure-flags))))) + (replace 'install + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (install-file "cmp" bin) + (install-file "diff" bin) + #t)))))))) (define binutils-mesboot0 (package -- cgit v1.2.3 From 1a433d396400577aa6da5c18507dfbe09645acc9 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 6 Oct 2019 14:57:54 +0200 Subject: gnu: commencement: Add patch-mesboot. * gnu/packages/commencement.scm (patch-mesboot): New variable. --- gnu/packages/commencement.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9fcb69f433..d930063cf2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1097,6 +1097,42 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (install-file "diff" bin) #t)))))))) +(define patch-mesboot + ;; The initial patch. + (package + (inherit patch) + (name "patch-mesboot") + (version "2.5.9") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/patch/patch-" + version ".tar.gz")) + (sha256 + (base32 + "12nv7jx3gxfp50y11nxzlnmqqrpicjggw6pcsq0wyavkkm3cddgc")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs (%boot-tcc0-inputs)) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + #:tests? #f ; check is naive, also checks non-built PROGRAMS + #:strip-binaries? #f ; no strip yet + #:configure-flags '("AR=tcc -ar" "CC=tcc" "LD-tcc") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'scripted-patch + (lambda _ + ;; avoid another segfault + (substitute* "pch.c" + (("while [(]p_end >= 0[)]" all) + "p_end = -1;\nwhile (0)")) + #t)) + ;; FIXME: no compressing gzip yet + (delete 'compress-documentation)))))) + (define binutils-mesboot0 (package (inherit binutils) -- cgit v1.2.3 From b755ffef0a61dfb3c522baa8f4b6f19f2c97d851 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 6 Oct 2019 17:47:24 +0200 Subject: gnu: commencement: Add sed-mesboot0. * gnu/packages/commencement.scm (sed-mesboot0): New variable. * gnu/packages/commencement.scm (%boot-tcc-inputs): New variable. --- gnu/packages/commencement.scm | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d930063cf2..49ed14d158 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1133,6 +1133,60 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" ;; FIXME: no compressing gzip yet (delete 'compress-documentation)))))) +(define sed-mesboot0 + ;; The initial sed. + (package + (inherit sed) + (name "sed-mesboot0") + (version "1.18") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/sed/sed-" + version ".tar.gz")) + (sha256 + (base32 + "1hyv7i82jd0q18xcql51ylc8jwadp3gb3irgcqlis3v61p35jsv2")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs (%boot-tcc0-inputs)) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + #:configure-flags '("CC=tcc") + #:make-flags '("CC=tcc" "extra_objs=" "DEFS=-D HAVE_BCOPY") + #:strip-binaries? #f ; no strip yet + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'scripted-patch + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (substitute* "configure" + (("/bin/sh") shell)) + #t))) + (replace 'check + (lambda _ + (invoke "./sed" "--version"))) + (replace 'install + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (install-file "sed" bin) + #t)))))))) + +(define (%boot-tcc-inputs) + `(("bash" ,bash-mesboot0) + ("bzip2" ,bzip2-mesboot) + ("diffutils" ,diffutils-mesboot) + ("gzip" ,gzip-mesboot) + ("patch" ,patch-mesboot) + ("sed" ,sed-mesboot0) + ("tcc" ,tcc-boot) + ,@(alist-delete "tcc" (%boot-tcc0-inputs)))) + (define binutils-mesboot0 (package (inherit binutils) -- cgit v1.2.3 From cb167958ea904fc79913b883cb771e2d691402e0 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 6 Oct 2019 15:22:01 +0200 Subject: gnu: commencement: binutils-mesboot0: Use Gash instead of coretutils&co. * gnu/packages/commencement.scm (binutils-mesboot0): Use Gash instead of coretutils&co; downgrade to 2.14.0. --- gnu/packages/commencement.scm | 77 ++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 49ed14d158..c5b473f546 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1188,50 +1188,65 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" ,@(alist-delete "tcc" (%boot-tcc0-inputs)))) (define binutils-mesboot0 + ;; The initial Binutils (package (inherit binutils) (name "binutils-mesboot0") - (version "2.20.1a") - (source (bootstrap-origin - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/binutils/binutils-" - version ".tar.bz2")) - (patches (search-patches "binutils-boot-2.20.1a.patch")) - (sha256 - (base32 - "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi"))))) + (version "2.14") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/binutils/binutils-" + version ".tar.gz")) + (sha256 + (base32 + "1w8xp7k44bkijr974x9918i4p1sw4g2fcd5mxvspkjpg38m214ds")))) (inputs '()) (propagated-inputs '()) - (native-inputs `(("tcc" ,tcc-boot) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("diffutils" ,diffutils-mesboot) - ("make" ,make-mesboot0))) + (native-inputs (%boot-tcc-inputs)) (supported-systems '("i686-linux" "x86_64-linux")) (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile - #:tests? #f ; runtest: command not found + #:tests? #f ; runtest: command not found #:parallel-build? #f - #:strip-binaries? #f ; no strip yet + #:strip-binaries? #f ; no strip yet #:configure-flags - (let ((cppflags (string-append " -D __GLIBC_MINOR__=6" - " -D MES_BOOTSTRAP=1")) - (bash (assoc-ref %build-inputs "bash"))) - `(,(string-append "CONFIG_SHELL=" bash "/bin/sh") - ,(string-append "CPPFLAGS=" cppflags) - "AR=tcc -ar" - "CXX=false" - "RANLIB=true" - ,(string-append "CC=tcc" cppflags) - "--disable-nls" + (let ((out (assoc-ref %outputs "out"))) + `("--disable-nls" "--disable-shared" "--disable-werror" - "--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - "--with-sysroot=/")))))) + "--build=i386-unknown-linux" + "--host=i386-unknown-linux" + "--target=i386-unknown-linux" + "--with-sysroot=/" + ,(string-append "--prefix=" out))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (setenv "CONFIG_SHELL" shell) + (setenv "SHELL" shell) + (setenv "AR" "tcc -ar") + (setenv "RANLIB" "true") + (setenv "CC" "tcc -D __GLIBC_MINOR__=6") + #t))) + (add-after 'unpack 'scripted-patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "bfd/configure" + (("^sed -e '/SRC-POTFILES.*" all) + "echo -e 'all:\\n\\ttrue\\n\\ninstall:\\n\\ttrue\\n' > po/Makefile\n")) + #t)) + (replace 'configure ; needs classic invocation of configure + (lambda* (#:key configure-flags #:allow-other-keys) + (format (current-error-port) + "running ./configure ~a\n" (string-join configure-flags)) + (apply system* "./configure" configure-flags) + (substitute* "config.status" + (("[.]//dev/null") "/dev/null")) + (invoke "sh" "./config.status")))))))) (define gcc-core-mesboot ;; Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C -- cgit v1.2.3 From 066169601c6c3ad59394e004944efa4ae8485a4e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 6 Oct 2019 19:29:01 +0200 Subject: gnu: commencement: gcc-core-mesboot0: Use Gash instead of coretutils&co. * gnu/packages/commencement.scm (gcc-core-mesboot0): Rename from gcc-core-mesboot; Use Gash instead of coretutils&co. --- gnu/packages/commencement.scm | 119 ++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 56 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c5b473f546..3a8ac428c3 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1248,36 +1248,32 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (("[.]//dev/null") "/dev/null")) (invoke "sh" "./config.status")))))))) -(define gcc-core-mesboot +(define gcc-core-mesboot0 ;; Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C ;; Library v0.16 offers. Gcc-3.x (and 4.x) place higher demands on a C ;; library, such as dir.h/struct DIR/readdir, locales, signals... Also, - ;; with gcc-2.95.3, binutils-boot-2.20.1a and glibc-2.2.5 we found a GNU - ;; toolchain triplet "that works". + ;; with gcc-2.95.3, binutils (2.14.0, 2.20.1a) and glibc-2.2.5 we found a + ;; GNU toolchain triplet "that works". (package (inherit gcc) - (name "gcc-core-mesboot") + (name "gcc-core-mesboot0") (version "2.95.3") - (source (bootstrap-origin - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-" - version - ".tar.gz")) - (patches (search-patches "gcc-boot-2.95.3.patch")) - (sha256 - (base32 - "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"))))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-" + version + ".tar.gz")) + ;; `patches' needs XZ + ;; (patches (search-patches "gcc-boot-2.95.3.patch")) + (sha256 + (base32 + "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an")))) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) - (native-inputs `(("binutils" ,binutils-mesboot0) - ("tcc" ,tcc-boot) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("diffutils" ,diffutils-mesboot) - ("make" ,make-mesboot0))) + (native-inputs `(("boot-patch" ,(search-patch "gcc-boot-2.95.3.patch")) + ("binutils" ,binutils-mesboot0) + ,@(%boot-tcc-inputs))) (outputs '("out")) (arguments `(#:implicit-inputs? #f @@ -1293,32 +1289,37 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" "--build=i686-unknown-linux-gnu" "--host=i686-unknown-linux-gnu" ,(string-append "--prefix=" out))) - #:make-flags (list - "CC=tcc -static -D __GLIBC_MINOR__=6" - "OLDCC=tcc -static -D __GLIBC_MINOR__=6" - "CC_FOR_BUILD=tcc -static -D __GLIBC_MINOR__=6" - "AR=ar" - "RANLIB=ranlib" - (string-append "LIBGCC2_INCLUDES=-I " - (assoc-ref %build-inputs "tcc") - "/include") - "LANGUAGES=c" - (string-append "BOOT_LDFLAGS=" - " -B" (assoc-ref %build-inputs "tcc") - "/lib/")) + #:make-flags + `("CC=tcc -static -D __GLIBC_MINOR__=6" + "OLDCC=tcc -static -D __GLIBC_MINOR__=6" + "CC_FOR_BUILD=tcc -static -D __GLIBC_MINOR__=6" + "AR=ar" + "RANLIB=ranlib" + ,(string-append "LIBGCC2_INCLUDES=-I " + (assoc-ref %build-inputs "tcc") + "/include") + "LANGUAGES=c" + ,(string-append "BOOT_LDFLAGS=" + " -B" (assoc-ref %build-inputs "tcc") + "/lib/")) #:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1)) #:phases (modify-phases %standard-phases - ;; gcc-2.95.3 needs more traditional configure + (add-after 'unpack 'apply-boot-patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch-file (assoc-ref inputs "boot-patch"))) + (system* "patch" "--force" "-p1" "-i" patch-file) + #t))) (add-before 'configure 'setenv (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (tcc (assoc-ref %build-inputs "tcc")) - (cppflags " -D __GLIBC_MINOR__=6")) - (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (let* ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash")) + (tcc (assoc-ref %build-inputs "tcc")) + (cppflags " -D __GLIBC_MINOR__=6")) + (setenv "CONFIG_SHELL" shell) (setenv "CPPFLAGS" cppflags) (setenv "CC" (string-append "tcc" cppflags)) (setenv "CC_FOR_BUILD" (string-append "tcc" cppflags)) @@ -1327,9 +1328,9 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (lambda _ (display " ac_cv_c_float_format='IEEE (little-endian)' -"))) - #t))) - (replace 'configure +")))))) + ;; gcc-2.95.3 + (replace 'configure ; needs classic invocation of configure (lambda* (#:key configure-flags #:allow-other-keys) (format (current-error-port) "running ./configure ~a\n" (string-join configure-flags)) @@ -1347,18 +1348,18 @@ ac_cv_c_float_format='IEEE (little-endian)' (gcc-dir (string-append out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) (mkdir-p "tmp") - (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) - (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) + (with-directory-excursion "tmp" + (invoke "ar" "x" (string-append "../gcc/libgcc2.a")) + (invoke "ar" "x" (string-append tcc "/lib/libtcc1.a")) + (apply invoke "ar" "r" (string-append gcc-dir "/libgcc.a") + (find-files "." "\\.o"))) (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) (copy-file (string-append tcc "/lib/libtcc1.a") (string-append out "/lib/libtcc1.a")) + (invoke "ar" "x" (string-append tcc "/lib/libtcc1.a")) + (invoke "ar" "x" (string-append tcc "/lib/libc.a")) (invoke "ar" "r" (string-append gcc-dir "/libc.a") - (string-append tcc-lib "/libc+gnu.o") - (string-append tcc-lib "/libtcc1.o")) - (invoke "ar" "r" (string-append out "/lib/libc.a") - (string-append tcc-lib "/libc+gnu.o") - (string-append tcc-lib "/libtcc1.o")) - (invoke "ls" "-ltrF" gcc-dir) + "libc.o" "libtcc1.o") #t)))))) (native-search-paths (list (search-path-specification @@ -1371,6 +1372,12 @@ ac_cv_c_float_format='IEEE (little-endian)' (variable "LIBRARY_PATH") (files '("lib"))))))) +(define (%boot-mesboot-core-inputs) + `(("binutils" ,binutils-mesboot0) + ("gawk" ,gawk-mesboot0) + ("gcc" ,gcc-core-mesboot0) + ,@(alist-delete "tcc" (%boot-tcc-inputs)))) + (define mesboot-headers (package (inherit mes-boot) @@ -1421,7 +1428,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (inputs '()) (propagated-inputs '()) (native-inputs `(("binutils" ,binutils-mesboot0) - ("gcc" ,gcc-core-mesboot) + ("gcc" ,gcc-core-mesboot0) ("bash" ,%bootstrap-coreutils&co) ("coreutils" ,%bootstrap-coreutils&co) @@ -1483,7 +1490,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (define gcc-mesboot0 (package - (inherit gcc-core-mesboot) + (inherit gcc-core-mesboot0) (name "gcc-mesboot0") (native-inputs `(("binutils" ,binutils-mesboot0) @@ -1491,14 +1498,14 @@ ac_cv_c_float_format='IEEE (little-endian)' ;; #include_next purposes. ("libc" ,glibc-mesboot0) ("kernel-headers" ,%bootstrap-linux-libre-headers) - ("gcc" ,gcc-core-mesboot) + ("gcc" ,gcc-core-mesboot0) ("bash" ,%bootstrap-coreutils&co) ("coreutils" ,%bootstrap-coreutils&co) ("diffutils" ,diffutils-mesboot) ("make" ,make-mesboot0))) (arguments - (substitute-keyword-arguments (package-arguments gcc-core-mesboot) + (substitute-keyword-arguments (package-arguments gcc-core-mesboot0) ((#:phases phases) `(modify-phases ,phases (replace 'setenv @@ -1645,7 +1652,7 @@ ac_cv_c_float_format='IEEE (little-endian)' ("diffutils" ,diffutils-mesboot) ("make" ,make-mesboot))) (arguments - (substitute-keyword-arguments (package-arguments gcc-core-mesboot) + (substitute-keyword-arguments (package-arguments gcc-core-mesboot0) ((#:make-flags make-flags) `(let* ((libc (assoc-ref %build-inputs "libc")) (ldflags (string-append -- cgit v1.2.3 From 2c6728148143dc5ec543ef69d7e80cef7675e556 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 6 Oct 2019 22:08:05 +0200 Subject: gnu: commencement: Add gawk-mesboot0. * gnu/packages/commencement.scm (gawk-mesboot0): New variable. --- gnu/packages/commencement.scm | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3a8ac428c3..1cfbbd9eb6 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1406,6 +1406,74 @@ ac_cv_c_float_format='IEEE (little-endian)' (copy-recursively headers out) #t)))))))) +(define gawk-mesboot0 + ;; The initial Gawk. + (package + (inherit gawk) + (name "gawk-mesboot0") + (version "3.0.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gawk/gawk-" + version ".tar.gz")) + (sha256 + (base32 + "087s7vpc8zawn3l7bwv9f44bf59rc398hvaiid63klw6fkbvabr3")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs (%boot-tcc-inputs)) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:configure-flags '("--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--disable-nls") + #:make-flags '("gawk") + #:parallel-build? #f + #:parallel-tests? #f + #:strip-binaries? #f ; no strip yet + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'scripted-patch + (lambda _ + (substitute* "Makefile.in" + (("date ") "echo today ") + ((" autoheader") "true") + ((" -lm ") " ")) + (substitute* "test/Makefile.in" + (("^bigtest:.*") "bigtest: basic\n") + (("( |\t)(childin|convfmt|fflush|longwrds|math|negexp)" all sep) sep)))) + (add-before 'configure 'setenv + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (setenv "CONFIG_SHELL" shell) + (setenv "SHELL" shell) + (setenv "CC" "tcc") + (setenv "CPP" "tcc -E") + (setenv "LD" "tcc") + (setenv "ac_cv_func_getpgrp_void" "yes") + (setenv "ac_cv_func_tzset" "yes")) + #t)) + (replace 'configure ; needs classic invocation of configure + (lambda* (#:key configure-flags #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (configure-flags + `(,@configure-flags + ,(string-append "--prefix=" out)))) + (format (current-error-port) "running ./configure ~a\n" (string-join configure-flags)) + (system* "touch" "configure") ; aclocal.m4 is newer than configure + (apply invoke (cons "./configure" configure-flags))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "gawk" bin) + (symlink "gawk" (string-append bin "/awk")) + #t)))))))) + (define glibc-mesboot0 ;; GNU C Library 2.2.5 is the most recent glibc that we managed to build ;; using gcc-2.95.3. Newer versions (2.3.x, 2.6, 2.1x) seem to need a newer -- cgit v1.2.3 From 562c6e3c52863a15bc22f57d2cea323fc39b452e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 16:03:50 +0100 Subject: gnu: commencement: mesboot-headers: Use Gash instead of coretutils&co. * gnu/packages/commencement.scm (mesboot-headers): Use Gash instead of coretutils&co. --- gnu/packages/commencement.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1cfbbd9eb6..2542231b82 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1385,8 +1385,8 @@ ac_cv_c_float_format='IEEE (little-endian)' (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) - (native-inputs `(("coreutils" ,%bootstrap-coreutils&co) - ("headers" ,%bootstrap-linux-libre-headers))) + (native-inputs `(("kernel-headers" ,%bootstrap-linux-libre-headers) + ,@(%boot-tcc-inputs))) (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile @@ -1400,7 +1400,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (include (string-append out "/include")) - (headers (assoc-ref %build-inputs "headers" ))) + (headers (assoc-ref %build-inputs "kernel-headers"))) (mkdir-p include) (copy-recursively "include" out) (copy-recursively headers out) -- cgit v1.2.3 From f6b911fb5f99b0677c0f94b195b140e464195e9b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 6 Oct 2019 21:19:35 +0200 Subject: gnu: commencement: glibc-mesboot0: Use Gash instead of coretutils&co. * gnu/packages/commencement.scm (glibc-mesboot0): Use Gash instead of coretutils&co. --- gnu/packages/commencement.scm | 101 +++++++++++++-------- .../patches/glibc-bootstrap-system-2.2.5.patch | 30 ++++++ 2 files changed, 95 insertions(+), 36 deletions(-) create mode 100644 gnu/packages/patches/glibc-bootstrap-system-2.2.5.patch diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2542231b82..1ee974840b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1482,33 +1482,31 @@ ac_cv_c_float_format='IEEE (little-endian)' (inherit glibc) (name "glibc-mesboot0") (version "2.2.5") - (source (bootstrap-origin - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/glibc/glibc-" - version - ".tar.gz")) - (patches (search-patches "glibc-boot-2.2.5.patch")) - (sha256 - (base32 - "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q"))))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/glibc/glibc-" + version + ".tar.gz")) + ;; Patch needs XZ + ;; (patches (search-patches "glibc-boot-2.2.5.patch")) + (sha256 + (base32 + "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q")))) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) - (native-inputs `(("binutils" ,binutils-mesboot0) - ("gcc" ,gcc-core-mesboot0) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("diffutils" ,diffutils-mesboot) + (native-inputs `(("boot-patch" ,(search-patch "glibc-boot-2.2.5.patch")) + ("system-patch" ,(search-patch "glibc-bootstrap-system-2.2.5.patch")) ("headers" ,mesboot-headers) - ("make" ,make-mesboot0))) + ,@(%boot-mesboot-core-inputs) + ("gash" ,gash-boot))) (outputs '("out")) (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile #:tests? #f #:strip-binaries? #f + #:validate-runpath? #f ; no dynamic executables #:parallel-build? #f ; gcc-2.95.3 ICEs on massively parallel builds #:make-flags (list (string-append "SHELL=" @@ -1517,25 +1515,31 @@ ac_cv_c_float_format='IEEE (little-endian)' #:configure-flags (let ((out (assoc-ref %outputs "out")) (headers (assoc-ref %build-inputs "headers"))) - (list - "--disable-shared" - "--enable-static" - "--disable-sanity-checks" - "--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - (string-append "--with-headers=" headers "/include") - "--enable-static-nss" - "--without-__thread" - "--without-cvs" - "--without-gd" - "--without-tls" - (string-append "--prefix=" out))) + `("--disable-shared" + "--enable-static" + "--disable-sanity-checks" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + ,(string-append "--with-headers=" headers "/include") + "--enable-static-nss" + "--without-__thread" + "--without-cvs" + "--without-gd" + "--without-tls" + ,(string-append "--prefix=" out))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'apply-boot-patch + (lambda* (#:key inputs #:allow-other-keys) + (and (let ((patch (assoc-ref inputs "boot-patch"))) + (invoke "patch" "--force" "-p1" "-i" patch)) + (let ((patch (assoc-ref inputs "system-patch"))) + (invoke "patch" "--force" "-p1" "-i" patch))))) (add-before 'configure 'setenv (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash")) (gcc (assoc-ref %build-inputs "gcc")) (headers (assoc-ref %build-inputs "headers")) (cppflags (string-append @@ -1543,18 +1547,43 @@ ac_cv_c_float_format='IEEE (little-endian)' " -D MES_BOOTSTRAP=1" " -D BOOTSTRAP_GLIBC=1")) (cflags (string-append " -L " (getcwd)))) - (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) - (setenv "SHELL" (getenv "CONFIG_SHELL")) + (setenv "CONFIG_SHELL" shell) + (setenv "SHELL" shell) (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) #t))) - ;; glibc-2.2.5 needs a more classic invocation of configure - ;; configure: warning: CONFIG_SHELL=/gnu/store/…-bash-minimal-4.4.12/bin/bash: invalid host type - (replace 'configure + (replace 'configure ; needs classic invocation of configure (lambda* (#:key configure-flags #:allow-other-keys) (format (current-error-port) "running ./configure ~a\n" (string-join configure-flags)) - (apply invoke "./configure" configure-flags)))))))) + (apply invoke "./configure" configure-flags))) + (add-after 'configure 'fixup-configure + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash")) + (gash (assoc-ref %build-inputs "gash")) + (gash (string-append gash "/bin/gash"))) + (substitute* "config.make" + (("INSTALL = scripts/") "INSTALL = $(..)./scripts/")) + (substitute* "config.make" + (("INSTALL = scripts/") "INSTALL = $(..)./scripts/") + (("BASH = ") (string-append + "SHELL = " shell " +BASH = "))) + ;; XXX: make-syscalls.sh does not run correctly with + ;; bash-mesboot0, producing a wrong sysd-syscalls. + + ;; This leads to posix/uname.c getting compiled where it + ;; shouldn't: + + ;; ../sysdeps/generic/uname.c:25: config-name.h: error 02 + (substitute* "sysdeps/unix/make-syscalls.sh" + (("#!/gnu/store.*/bin/bash") (string-append "#! " gash))) + + (substitute* "sysdeps/unix/Makefile" + ((" [{] [$][(]SHELL[)]") (string-append " { " gash)))) + #t))))))) (define gcc-mesboot0 (package diff --git a/gnu/packages/patches/glibc-bootstrap-system-2.2.5.patch b/gnu/packages/patches/glibc-bootstrap-system-2.2.5.patch new file mode 100644 index 0000000000..d11fc00c75 --- /dev/null +++ b/gnu/packages/patches/glibc-bootstrap-system-2.2.5.patch @@ -0,0 +1,30 @@ +We want to allow builds in chroots that lack /bin/sh. Thus, system(3) +and popen(3) need to be tweaked to use the right shell. For the bootstrap +glibc, we just use whatever `sh' can be found in $PATH. The final glibc +instead uses the hard-coded absolute file name of `bash'. + +--- a/sysdeps/posix/system.c ++++ b/sysdeps/posix/system.c +@@ -106,8 +106,8 @@ do_system (const char *line) + (void) UNBLOCK; + + /* Exec the shell. */ +- (void) __execve (SHELL_PATH, (char *const *) new_argv, __environ); ++ (void) execvp (SHELL_NAME, (char *const *) new_argv); + _exit (127); + } + else if (pid < (pid_t) 0) + /* The fork failed. */ +--- a/libio/iopopen.c ++++ b/libio/iopopen.c +@@ -170,7 +170,7 @@ _IO_new_proc_open (fp, command, mode) + for (p = proc_file_chain; p; p = p->next) + _IO_close (_IO_fileno ((_IO_FILE *) p)); + +- _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0); ++ execlp ("sh", "sh", "-c", command, (char *) 0); + _IO__exit (127); + } + _IO_close (child_end); + + -- cgit v1.2.3 From 71fb04a5e31ed9fb1310bfdf26897ddf0df99266 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 16:16:59 +0100 Subject: gnu: commencement: gcc-mesboot0: Use Gash instead of coretutils&co. * gnu/packages/commencement.scm (gcc-mesboot0): Use Gash instead of coretutils&co. * gnu/packages/commencement.scm (%boot-mesboot0-inputs): New variable. --- gnu/packages/commencement.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1ee974840b..1427c69dc7 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1589,18 +1589,12 @@ BASH = "))) (package (inherit gcc-core-mesboot0) (name "gcc-mesboot0") - (native-inputs `(("binutils" ,binutils-mesboot0) - + (native-inputs `(("boot-patch" ,(search-patch "gcc-boot-2.95.3.patch")) ;; Packages are given in an order that's relevant for ;; #include_next purposes. ("libc" ,glibc-mesboot0) ("kernel-headers" ,%bootstrap-linux-libre-headers) - ("gcc" ,gcc-core-mesboot0) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("diffutils" ,diffutils-mesboot) - ("make" ,make-mesboot0))) + ,@(%boot-mesboot-core-inputs))) (arguments (substitute-keyword-arguments (package-arguments gcc-core-mesboot0) ((#:phases phases) @@ -1619,11 +1613,11 @@ ac_cv_c_float_format='IEEE (little-endian)' (let* ((out (assoc-ref outputs "out")) (gcc-dir (string-append out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) - (mkdir-p "tmp") - (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) - (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) - (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) - #t))))) + (and + (mkdir-p "tmp") + (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) + (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) + (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")))))))) ((#:configure-flags configure-flags) `(let ((out (assoc-ref %outputs "out"))) `("--disable-shared" @@ -1637,6 +1631,12 @@ ac_cv_c_float_format='IEEE (little-endian)' ,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include") "LANGUAGES=c"))))))) +(define (%boot-mesboot0-inputs) + `(("gcc" ,gcc-mesboot0) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("libc" ,glibc-mesboot0) + ,@(alist-delete "gcc" (%boot-mesboot-core-inputs)))) + (define binutils-mesboot (package (inherit binutils-mesboot0) -- cgit v1.2.3 From 125d7c587199f10b184aef102ed3eabedf0d4382 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 20:09:17 +0100 Subject: gnu: commencement: Add tar-mesboot. * gnu/packages/commencement.scm (tar-mesboot): New variable. --- gnu/packages/commencement.scm | 56 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1427c69dc7..6cf7b0a368 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1637,6 +1637,62 @@ ac_cv_c_float_format='IEEE (little-endian)' ("libc" ,glibc-mesboot0) ,@(alist-delete "gcc" (%boot-mesboot-core-inputs)))) +(define tar-mesboot + ;; Initial tar with support for xz compression. + (package + (inherit tar) + (name "tar-mesboot") + (version "1.22") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/tar/tar-" + version ".tar.gz")) + (sha256 + (base32 + "19nvix64y95n5v6rr5g9g3fn08zz85cb5anzd7csfv4a4sz9lw4y")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs (%boot-mesboot0-inputs)) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + #:tests? #f ; check is naive, also checks non-built PROGRAMS + #:strip-binaries? #f ; no strip yet + #:configure-flags '("--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--disable-nls") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (setenv "CONFIG_SHELL" shell) + (setenv "SHELL" shell) + (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv") + (setenv "gl_cv_func_rename_dest_works" "yes") + (format (current-error-port) + "running ./configure ~a\n" (string-join configure-flags)) + (apply invoke (cons "./configure" configure-flags))))) + (add-after 'unpack 'scripted-patch + (lambda _ + (let* ((bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (substitute* "configure" + ((" /bin/sh") shell))) + (substitute* "Makefile.in" + (("^SUBDIRS = doc") "SUBDIRS =")) + #t)) + (replace 'install + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (install-file "src/tar" bin) + #t)))))))) + (define binutils-mesboot (package (inherit binutils-mesboot0) -- cgit v1.2.3 From fa638c18b61db9b9340c35f54f8438d6fabe352b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 20:32:10 +0100 Subject: gnu: commencement: Add grep-mesboot. * gnu/packages/commencement.scm (grep-mesboot): New variable. --- gnu/packages/commencement.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 6cf7b0a368..4633051fc7 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1693,6 +1693,44 @@ ac_cv_c_float_format='IEEE (little-endian)' (install-file "src/tar" bin) #t)))))))) +(define grep-mesboot + ;; The initial grep. + (package + (inherit grep) + (name "grep-mesboot") + (version "2.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/grep/grep-" + version ".tar.gz")) + (sha256 + (base32 + "1w862l80lgc5mxvpiy4cfwk761d6xxavn0m3xd2l7xs2kmzvp6lq")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs (%boot-mesboot0-inputs)) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-configure + (lambda _ + (let* ((bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (substitute* "configure" + ((" [|][|] ./config.status") " || sh ./config.status"))))) + (replace 'install + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (install-file "grep" bin) + (symlink "grep" (string-append bin "/egrep")) + (symlink "grep" (string-append bin "/fgrep")) + #t)))))))) + (define binutils-mesboot (package (inherit binutils-mesboot0) -- cgit v1.2.3 From e7c7326873b9d4f9c45d77cf4ad2ec370d4f00da Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 20:37:30 +0100 Subject: gnu: commencement: Add binutils-mesboot1. * gnu/packages/commencement.scm (binutils-mesboot1): New variable. --- gnu/packages/commencement.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4633051fc7..eb43356665 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1731,6 +1731,32 @@ ac_cv_c_float_format='IEEE (little-endian)' (symlink "grep" (string-append bin "/fgrep")) #t)))))))) +(define binutils-mesboot1 + (package + (inherit binutils-mesboot0) + (name "binutils-mesboot1") + (native-inputs (%boot-mesboot0-inputs)) + (arguments + (substitute-keyword-arguments (package-arguments binutils-mesboot0) + ((#:configure-flags configure-flags) + '(let ((out (assoc-ref %outputs "out"))) + `("--disable-nls" + "--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--with-sysroot=/" + ,(string-append "--prefix=" out)))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'setenv + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (setenv "CONFIG_SHELL" shell) + #t))))))))) + (define binutils-mesboot (package (inherit binutils-mesboot0) -- cgit v1.2.3 From e6c7d14ab32a0cf54885fab0ccb026ffbfa5734c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 20:49:50 +0100 Subject: gnu: commencement: Add coreutils-mesboot0. * gnu/packages/commencement.scm (coreutils-mesboot0): New variable. --- gnu/packages/commencement.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index eb43356665..85ce6d6599 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1757,6 +1757,37 @@ ac_cv_c_float_format='IEEE (little-endian)' (setenv "CONFIG_SHELL" shell) #t))))))))) +(define coreutils-mesboot0 + (package + (inherit coreutils) + (name "coreutils-mesboot0") + ;; The latest .gz release of Coreutils is 8.13; which does not build with gcc-2.95.3: + ;; randperm.c: In function `sparse_swap': + ;; randperm.c:117: invalid lvalue in unary `&' + (version "5.0") ; 2003-04 + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/coreutils/coreutils-" + version ".tar.gz")) + (sha256 + (base32 + "10wq6k66i8adr4k08p0xmg87ff4ypiazvwzlmi7myib27xgffz62")))) + (native-inputs (%boot-mesboot0-inputs)) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (arguments + `(#:implicit-inputs? #f + #:tests? #f ; WARNING: `perl' is needed, ... + #:parallel-build? #f + #:strip-binaries? #f ; strip: unrecognized option `--only-keep-debug' + #:guile ,%bootstrap-guile + #:configure-flags + '("--disable-doc" + "LIBS=-lc -lnss_files -lnss_dns -lresolv" + "ac_cv_func_gethostbyname=no" + "gl_cv_func_rename_dest_works=yes"))))) + (define binutils-mesboot (package (inherit binutils-mesboot0) -- cgit v1.2.3 From 635ec0f43a727ff59656a6e1f995fa2192fef3d0 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 20:52:44 +0100 Subject: gnu: commencement: Add make-mesboot. * gnu/packages/commencement.scm (make-mesboot): New variable. --- gnu/packages/commencement.scm | 66 +++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 85ce6d6599..f7ab3e79df 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1788,6 +1788,39 @@ ac_cv_c_float_format='IEEE (little-endian)' "ac_cv_func_gethostbyname=no" "gl_cv_func_rename_dest_works=yes"))))) +(define make-mesboot + (package + (inherit gnu-make) + (name "make-mesboot") + (version "3.82") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/make/make-" + version ".tar.gz")) + (sha256 + (base32 + "1rs2f9hmvy3q6zkl15jnlmnpgffm0bhw5ax0h5c7q604wqrip69x")))) + (native-inputs (%boot-mesboot0-inputs)) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (arguments + `(#:implicit-inputs? #f + #:parallel-build? #f + #:guile ,%bootstrap-guile + #:configure-flags '("LIBS=-lc -lnss_files -lnss_dns -lresolv") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "./make" "--version"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "make" bin) + #t)))))))) + (define binutils-mesboot (package (inherit binutils-mesboot0) @@ -1811,39 +1844,6 @@ ac_cv_c_float_format='IEEE (little-endian)' "--host=i686-unknown-linux-gnu" "--with-sysroot=/")))))) -(define make-mesboot - (package - (inherit make-mesboot0) - (name "make-mesboot") - (version "3.82") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/make/make-" - version ".tar.gz")) - (sha256 - (base32 - "1rs2f9hmvy3q6zkl15jnlmnpgffm0bhw5ax0h5c7q604wqrip69x")))) - (native-inputs `(("binutils" ,binutils-mesboot0) - ("libc" ,glibc-mesboot0) - ("gcc" ,gcc-mesboot0) - ("make" ,make-mesboot0) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("kernel-headers" ,%bootstrap-linux-libre-headers))) - (arguments - (substitute-keyword-arguments (package-arguments make-mesboot0) - ((#:configure-flags configure-flags) - `(let ((out (assoc-ref %outputs "out"))) - `(,(string-append "--prefix=" out)))) - ((#:phases phases) - `(modify-phases ,phases - (delete 'configure-fixup) - (add-before 'configure 'setenv - (lambda _ - (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv") - #t)))))))) - (define gmp-boot (package (inherit gmp) -- cgit v1.2.3 From 53d5cb253b9c220a5798053fd78812b715853620 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 20:56:32 +0100 Subject: gnu: commencement: Add gawk-mesboot. * gnu/packages/commencement.scm (gawk-mesboot): New variable. --- gnu/packages/commencement.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index f7ab3e79df..e03ec2df2a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1821,6 +1821,42 @@ ac_cv_c_float_format='IEEE (little-endian)' (install-file "make" bin) #t)))))))) +(define gawk-mesboot + (package + (inherit gawk) + (name "gawk-mesboot") + (version "3.1.8") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gawk/gawk-" + version ".tar.gz")) + (sha256 + (base32 + "03d5y7jabq7p2s7ys9alay9446mm7i5g2wvy8nlicardgb6b6ii1")))) + (native-inputs `(,@(%boot-mesboot0-inputs) + ("mesboot-headers" ,mesboot-headers))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (arguments + `(#:implicit-inputs? #f + #:parallel-build? #f + #:guile ,%bootstrap-guile + #:configure-flags '("ac_cv_func_connect=no") + #:make-flags '("gawk") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "./gawk" "--version"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "gawk" bin) + (symlink "gawk" (string-append bin "/awk")) + #t)))))))) + (define binutils-mesboot (package (inherit binutils-mesboot0) -- cgit v1.2.3 From aad146a0bb8269b9c40da419da6afa76cd2a6187 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 21:00:15 +0100 Subject: gnu: commencement: Add sed-mesboot. * gnu/packages/commencement.scm (sed-mesboot): New variable. --- gnu/packages/commencement.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index e03ec2df2a..52562f1e7a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1857,6 +1857,38 @@ ac_cv_c_float_format='IEEE (little-endian)' (symlink "gawk" (string-append bin "/awk")) #t)))))))) +(define sed-mesboot + (package + (inherit sed) + (name "sed-mesboot") + (version "4.0.6") ; 2003-04 + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/sed/sed-" + version ".tar.gz")) + (sha256 + (base32 + "0861ij94cqc4vaaki6r2wlapwcmhpx4ggp4r70f46mb21a8fkvf1")))) + (native-inputs (%boot-mesboot0-inputs)) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (arguments + `(#:implicit-inputs? #f + #:parallel-build? #f + #:guile ,%bootstrap-guile + #:tests? #f ; 8to7 fails + #:phases + (modify-phases %standard-phases + (add-after 'unpack '/bin/sh + (lambda _ + (let* ((bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (substitute* "testsuite/Makefile.tests" + (("^SHELL = /bin/sh") + (string-append "SHELL = " shell))) + #t)))))))) + (define binutils-mesboot (package (inherit binutils-mesboot0) -- cgit v1.2.3 From 9a935f664e229b642eb8e3b9567d4c5f2e4f0d1b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 21:06:06 +0100 Subject: gnu: commencement: Add gcc-core-mesboot1. * gnu/packages/commencement.scm (gcc-core-mesboot1): New variable. (gmp-boot, mpfr-boot, mpc-boot): Scheme-only bootstrap. * gnu/packages/patches/gcc-boot-4.6.4.patch: New file. * gnu/packages/patches/gcc-boot-4.7.4.patch: Remove. * gnu/local.mk (dist_patch_DATA): Update. --- gnu/local.mk | 2 +- gnu/packages/commencement.scm | 170 ++++++++++++++++++++++++++---- gnu/packages/patches/gcc-boot-4.6.4.patch | 55 ++++++++++ gnu/packages/patches/gcc-boot-4.7.4.patch | 68 ------------ 4 files changed, 203 insertions(+), 92 deletions(-) create mode 100644 gnu/packages/patches/gcc-boot-4.6.4.patch delete mode 100644 gnu/packages/patches/gcc-boot-4.7.4.patch diff --git a/gnu/local.mk b/gnu/local.mk index dcdcef9875..c6eccd7e4a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -877,7 +877,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \ %D%/packages/patches/gcc-asan-missing-include.patch \ %D%/packages/patches/gcc-boot-2.95.3.patch \ - %D%/packages/patches/gcc-boot-4.7.4.patch \ + %D%/packages/patches/gcc-boot-4.6.4.patch \ %D%/packages/patches/gcc-cross-environment-variables.patch \ %D%/packages/patches/gcc-fix-texi2pod.patch \ %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 52562f1e7a..bb42d97b65 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1889,29 +1889,6 @@ ac_cv_c_float_format='IEEE (little-endian)' (string-append "SHELL = " shell))) #t)))))))) -(define binutils-mesboot - (package - (inherit binutils-mesboot0) - (name "binutils-mesboot") - (native-inputs `(("binutils" ,binutils-mesboot0) - ("libc" ,glibc-mesboot0) - ("gcc" ,gcc-mesboot0) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("diffutils" ,diffutils-mesboot) - ("kernel-headers" ,%bootstrap-linux-libre-headers) - ("make" ,make-mesboot0))) - (arguments - (substitute-keyword-arguments (package-arguments binutils-mesboot0) - ((#:configure-flags configure-flags) - '(list "--disable-nls" - "--disable-shared" - "--disable-werror" - "--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - "--with-sysroot=/")))))) - (define gmp-boot (package (inherit gmp) @@ -1946,6 +1923,153 @@ ac_cv_c_float_format='IEEE (little-endian)' (base32 "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1")))))) +(define gcc-core-mesboot1 + ;; GCC 4.6.4 is the latest modular distribution. This package is not + ;; stricly needed, but very helpful for development because it builds + ;; relatively fast. If this configures and builds then gcc-mesboot1 also + ;; builds. + (package + (inherit gcc-mesboot0) + (name "gcc-core-mesboot1") + (version "4.6.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-" + version "/gcc-core-" version ".tar.gz")) + (sha256 + (base32 + "173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75")) + ;; Patch needs XZ + ;; (patches (search-patches "gcc-boot-4.6.4.patch")) + )) + (inputs `(("gmp-source" ,(package-source gmp-boot)) + ("mpfr-source" ,(package-source mpfr-boot)) + ("mpc-source" ,(package-source mpc-boot)))) + (native-inputs `(("boot-patch" ,(search-patch "gcc-boot-4.6.4.patch")) + ,@(%boot-mesboot1-inputs))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:parallel-build? #f ; for debugging + #:make-flags + (let* ((libc (assoc-ref %build-inputs "libc")) + (ldflags (string-append + "-B" libc "/lib " + "-Wl,-dynamic-linker " + "-Wl," libc + ,(glibc-dynamic-linker "i686-linux")))) + (list (string-append "LDFLAGS=" ldflags) + (string-append "LDFLAGS_FOR_TARGET=" ldflags))) + #:configure-flags + (let ((out (assoc-ref %outputs "out")) + (glibc (assoc-ref %build-inputs "libc"))) + (list (string-append "--prefix=" out) + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + (string-append "--with-native-system-header-dir=" glibc "/include") + (string-append "--with-build-sysroot=" glibc "/include") + "--disable-bootstrap" + "--disable-decimal-float" + "--disable-libatomic" + "--disable-libcilkrts" + "--disable-libgomp" + "--disable-libitm" + "--disable-libmudflap" + "--disable-libquadmath" + "--disable-libsanitizer" + "--disable-libssp" + "--disable-libvtv" + "--disable-lto" + "--disable-lto-plugin" + "--disable-multilib" + "--disable-plugin" + "--disable-threads" + "--enable-languages=c" + "--enable-static" + "--disable-shared" + "--enable-threads=single" + "--disable-libstdcxx-pch" + "--disable-build-with-cxx")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'apply-boot-patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch-file (assoc-ref inputs "boot-patch"))) + (format (current-error-port) "patch file=~s\n" patch-file) + (system* "patch" "--force" "-p1" "-i" patch-file)) + #t)) + ;; c&p from commencement.scm:gcc-boot0 + (add-after 'unpack 'unpack-gmp&co + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmp (assoc-ref %build-inputs "gmp-source")) + (mpfr (assoc-ref %build-inputs "mpfr-source")) + (mpc (assoc-ref %build-inputs "mpc-source"))) + + ;; To reduce the set of pre-built bootstrap inputs, build + ;; GMP & co. from GCC. + (for-each (lambda (source) + (or (invoke "tar" "xvf" source) + (error "failed to unpack tarball" + source))) + (list gmp mpfr mpc)) + + ;; Create symlinks like `gmp' -> `gmp-x.y.z'. + ,@(map (lambda (lib) + ;; Drop trailing letters, as gmp-6.0.0a unpacks + ;; into gmp-6.0.0. + `(symlink ,(string-trim-right + (package-full-name lib "-") + char-set:letter) + ,(package-name lib))) + (list gmp-boot mpfr-boot mpc-boot)) + #t))) + (add-before 'configure 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (binutils (assoc-ref %build-inputs "binutils")) + (bash (assoc-ref %build-inputs "bash")) + (gcc (assoc-ref %build-inputs "gcc")) + (glibc (assoc-ref %build-inputs "libc")) + (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "C_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include" + ":" kernel-headers "/include" + ":" glibc "/include" + ":" (getcwd) "/mpfr/src")) + (setenv "LIBRARY_PATH" (string-append glibc "/lib" + ":" gcc "/lib")) + (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) + (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) + #t)))))))) + +(define binutils-mesboot + (package + (inherit binutils-mesboot0) + (name "binutils-mesboot") + (native-inputs `(("binutils" ,binutils-mesboot0) + ("libc" ,glibc-mesboot0) + ("gcc" ,gcc-mesboot0) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot0))) + (arguments + (substitute-keyword-arguments (package-arguments binutils-mesboot0) + ((#:configure-flags configure-flags) + '(list "--disable-nls" + "--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--with-sysroot=/")))))) + (define gcc-mesboot1 (package (inherit gcc-mesboot0) diff --git a/gnu/packages/patches/gcc-boot-4.6.4.patch b/gnu/packages/patches/gcc-boot-4.6.4.patch new file mode 100644 index 0000000000..4ab0bf8641 --- /dev/null +++ b/gnu/packages/patches/gcc-boot-4.6.4.patch @@ -0,0 +1,55 @@ +This patch enables building gcc-4.6.4 using gcc-2.95.3 and glibc-2.2.5 + + * Tweak Makefile to allow overriding NATIVE_SYSTEM_HEADER_DIR using #:makeflags + * Add missing limits.h include. + * Add SSIZE_MAX define. The SSIZE_MAX define has been added to Mes + upstream and can be removed with the next Mes release. + * Remove -fbuilding-libgcc flag, it assumes features being present from a + newer gcc or glibc. + * [MES_BOOTSTRAP_GCC]: Disable threads harder. + +Upstream status: not presented upstream. + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index f3cc49fdb18..bc5718fc9a6 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -440,7 +440,7 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h + LTO_SYMTAB_H = $(srcdir)/../include/lto-symtab.h + + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. +-NATIVE_SYSTEM_HEADER_DIR = /usr/include ++# NATIVE_SYSTEM_HEADER_DIR = /usr/include + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. + CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + +diff --git a/gcc/config/host-linux.c b/gcc/config/host-linux.c +index 94b7a0b89a7..ab2baab55ca 100644 +--- a/gcc/config/host-linux.c ++++ b/gcc/config/host-linux.c +@@ -23,6 +23,12 @@ + #include "hosthooks.h" + #include "hosthooks-def.h" + ++// ../.././gcc/config/host-linux.c:213: `SSIZE_MAX' undeclared (first ++// use in this function) ++#include ++#ifndef SSIZE_MAX ++# define SSIZE_MAX LONG_MAX ++#endif + + /* Linux has a feature called exec-shield-randomize that perturbs the + address of non-fixed mapped segments by a (relatively) small amount. +diff --git a/libgcc/generic-morestack-thread.c b/libgcc/generic-morestack-thread.c +index bbe6dd12b5a..1d1d48223d7 100644 +--- a/libgcc/generic-morestack-thread.c ++++ b/libgcc/generic-morestack-thread.c +@@ -34,7 +34,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + will want to define inhibit_libc while building a compiler which + can build glibc. */ + +-#ifndef inhibit_libc ++#if 0 //!defined (inhibit_libc) && !MES_BOOTSTRAP_GCC + + #include + #include diff --git a/gnu/packages/patches/gcc-boot-4.7.4.patch b/gnu/packages/patches/gcc-boot-4.7.4.patch deleted file mode 100644 index 3e51e31fdf..0000000000 --- a/gnu/packages/patches/gcc-boot-4.7.4.patch +++ /dev/null @@ -1,68 +0,0 @@ -This patch enables building gcc-4.7.4 using gcc-2.95.3 and glibc-2.2.5 - - * Tweak Makefile to allow overriding NATIVE_SYSTEM_HEADER_DIR using #:makeflags - * Add missing limits.h include. - * Add SSIZE_MAX define. The SSIZE_MAX define has been added to Mes - upstream and can be removed with the next Mes release. - * Remove -fbuilding-libgcc flag, it assumes features being present from a - newer gcc or glibc. - * [MES_BOOTSTRAP_GCC]: Disable threads harder. - -Upstream status: not presented upstream. - -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index f3cc49fdb18..bc5718fc9a6 100644 ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -458,7 +458,7 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h - LTO_SYMTAB_H = $(srcdir)/../include/lto-symtab.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. --NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@ -+# NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@ - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - -diff --git a/gcc/config/host-linux.c b/gcc/config/host-linux.c -index 94b7a0b89a7..ab2baab55ca 100644 ---- a/gcc/config/host-linux.c -+++ b/gcc/config/host-linux.c -@@ -23,6 +23,12 @@ - #include "hosthooks.h" - #include "hosthooks-def.h" - -+// ../.././gcc/config/host-linux.c:213: `SSIZE_MAX' undeclared (first -+// use in this function) -+#include -+#ifndef SSIZE_MAX -+# define SSIZE_MAX LONG_MAX -+#endif - - /* Linux has a feature called exec-shield-randomize that perturbs the - address of non-fixed mapped segments by a (relatively) small amount. -diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in -index c301ff03cae..f86318c3bd5 100644 ---- a/libgcc/Makefile.in -+++ b/libgcc/Makefile.in -@@ -225,7 +225,7 @@ endif - LIBGCC2_DEBUG_CFLAGS = -g - LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \ - $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \ -- -fbuilding-libgcc -fno-stack-protector \ -+ -fno-stack-protector \ - $(INHIBIT_LIBC_CFLAGS) - - # Additional options to use when compiling libgcc2.a. -diff --git a/libgcc/generic-morestack-thread.c b/libgcc/generic-morestack-thread.c -index bbe6dd12b5a..1d1d48223d7 100644 ---- a/libgcc/generic-morestack-thread.c -+++ b/libgcc/generic-morestack-thread.c -@@ -35,7 +35,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - will want to define inhibit_libc while building a compiler which - can build glibc. */ - --#ifndef inhibit_libc -+#if 0 //!defined (inhibit_libc) && !MES_BOOTSTRAP_GCC - - #include - #include -- cgit v1.2.3 From c1deb838503ec0e9e7c53498fc09549a35dc6dbc Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 21:22:14 +0100 Subject: gnu: commencement: Add bash-mesboot. * gnu/packages/commencement.scm (bash-mesboot): New variable. --- gnu/packages/commencement.scm | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index bb42d97b65..7f2aee97c5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1889,6 +1889,89 @@ ac_cv_c_float_format='IEEE (little-endian)' (string-append "SHELL = " shell))) #t)))))))) +(define bash-mesboot + (package + (inherit bash-mesboot0) + (version "4.4") + (name "bash-mesboot") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/bash/bash-" + version ".tar.gz")) + (sha256 + (base32 + "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq")))) + (inputs '()) + (propagated-inputs '()) + (native-inputs (%boot-mesboot0-inputs)) + (outputs '("out")) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + #:configure-flags + '("--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + + "--without-bash-malloc" + "--disable-readline" + "--disable-history" + "--disable-help-builtin" + "--disable-progcomp" + "--disable-net-redirections" + "--disable-nls" + + ;; Pretend 'dlopen' is missing so we don't build loadable + ;; modules and related code. + "ac_cv_func_dlopen=no") + #:make-flags '("bash") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'scripted-patch + (lambda _ + (substitute* "shell.c" + ((";;") ";")) + #t)) + (add-before 'configure 'setenv + (lambda _ + (setenv "AWK" "gawk") + (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv") + (setenv "gl_cv_func_rename_dest_works" "yes") + #t)) + (add-after 'configure 'configure-fixups + (lambda _ + (let ((config.h (open-file "config.h" "a"))) + (display (string-append " +#define enable_hostname_completion(on_or_off) 0 +") + config.h) + (close config.h)) + #t)) + (replace 'check + (lambda _ + (invoke "./bash" "--version"))) + (replace 'install + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (copy-file "bash" (string-append bin "/bash")) + (copy-file "bash" (string-append bin "/sh")) + #t)))))))) + +(define (%boot-mesboot1-inputs) + `(("bash" ,bash-mesboot) + ("binutils" ,binutils-mesboot1) + ("coreutils" ,coreutils-mesboot0) + ("gawk" ,gawk-mesboot) + ("grep" ,grep-mesboot) + ("make" ,make-mesboot) + ("sed" ,sed-mesboot) + ("tar" ,tar-mesboot) + ,@(fold alist-delete (%boot-mesboot0-inputs) + '("bash" "bash" "binutils" "coreutils" "gash" "gawk" "grep " "guile" + "make" "sed" "tar")))) + (define gmp-boot (package (inherit gmp) -- cgit v1.2.3 From f48fe4e9e139b485f8d2633b707e1c4494564137 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 21:31:23 +0100 Subject: gnu: commencement: Add gcc-mesboot1: Use Gash instead of coreutils&co. * gnu/packages/commencement.scm (gcc-mesboot1): Use Gash instead of coreutils&co. --- gnu/packages/commencement.scm | 161 +++++++++++++----------------------------- 1 file changed, 48 insertions(+), 113 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7f2aee97c5..2e5b889099 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2130,6 +2130,54 @@ ac_cv_c_float_format='IEEE (little-endian)' (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) #t)))))))) +(define gcc-mesboot1 + (package + (inherit gcc-core-mesboot1) + (name "gcc-mesboot1") + (version "4.6.4") + (native-inputs + `(("gcc-g++" + ,(origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-" + version "/gcc-g++-" version ".tar.gz")) + (sha256 + (base32 + "1fqqk5zkmdg4vmqzdmip9i42q6b82i3f6yc0n86n9021cr7ms2k9")))) + ,@(package-native-inputs gcc-core-mesboot1))) + (arguments + (substitute-keyword-arguments (package-arguments gcc-core-mesboot1) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out"))) + `("--enable-languages=c,c++" + ,@(filter + (negate (lambda (x) (string-prefix? "--enable-languages=" x))) + ,configure-flags)))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'unpack 'unpack-g++ + (lambda _ + (let ((source-g++ (assoc-ref %build-inputs "gcc-g++"))) + (invoke "tar" "xvf" source-g++)) + #t)) + (replace 'setenv + (lambda _ + (setenv "CONFIG_SHELL" (which "sh")) + + ;; Allow MPFR headers to be found. + (setenv "C_INCLUDE_PATH" + (string-append (getcwd) "/mpfr/src:" + (getenv "C_INCLUDE_PATH"))) + + ;; Set the C++ search path so that C headers can be found as + ;; libstdc++ is being compiled. + (setenv "CPLUS_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) + #t)))))))) + +(define (%boot-mesboot2-inputs) + `(("gcc" ,gcc-mesboot1) + ,@(alist-delete "gcc" (%boot-mesboot1-inputs)))) + (define binutils-mesboot (package (inherit binutils-mesboot0) @@ -2153,119 +2201,6 @@ ac_cv_c_float_format='IEEE (little-endian)' "--host=i686-unknown-linux-gnu" "--with-sysroot=/")))))) -(define gcc-mesboot1 - (package - (inherit gcc-mesboot0) - (name "gcc-mesboot1") - (version (package-version gcc-4.7)) - (source (bootstrap-origin - (origin (inherit (package-source gcc-4.7)) - (patches (search-patches "gcc-boot-4.7.4.patch"))))) - (inputs `(("gmp-source" ,(package-source gmp-boot)) - ("mpfr-source" ,(package-source mpfr-boot)) - ("mpc-source" ,(package-source mpc-boot)))) - (native-inputs `(("binutils" ,binutils-mesboot) - - ("libc" ,glibc-mesboot0) - ("kernel-headers" ,%bootstrap-linux-libre-headers) - ("gcc" ,gcc-mesboot0) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("diffutils" ,diffutils-mesboot) - ("make" ,make-mesboot))) - (arguments - (substitute-keyword-arguments (package-arguments gcc-core-mesboot0) - ((#:make-flags make-flags) - `(let* ((libc (assoc-ref %build-inputs "libc")) - (ldflags (string-append - "-B" libc "/lib " - "-Wl,-dynamic-linker " - "-Wl," libc - ,(glibc-dynamic-linker "i686-linux")))) - (list (string-append "LDFLAGS=" ldflags) - (string-append "LDFLAGS_FOR_TARGET=" ldflags)))) - ((#:phases phases) - `(modify-phases ,phases - ;; c&p from commencement.scm:gcc-boot0 - (add-after 'unpack 'unpack-gmp&co - (lambda* (#:key inputs #:allow-other-keys) - (let ((gmp (assoc-ref %build-inputs "gmp-source")) - (mpfr (assoc-ref %build-inputs "mpfr-source")) - (mpc (assoc-ref %build-inputs "mpc-source"))) - - ;; To reduce the set of pre-built bootstrap inputs, build - ;; GMP & co. from GCC. - (for-each (lambda (source) - (or (invoke "tar" "xvf" source) - (error "failed to unpack tarball" - source))) - (list gmp mpfr mpc)) - - ;; Create symlinks like `gmp' -> `gmp-x.y.z'. - ,@(map (lambda (lib) - ;; Drop trailing letters, as gmp-6.0.0a unpacks - ;; into gmp-6.0.0. - `(symlink ,(string-trim-right - (package-full-name lib "-") - char-set:letter) - ,(package-name lib))) - (list gmp-boot mpfr-boot mpc-boot)) - #t))) - (delete 'remove-info) - (replace 'setenv - (lambda _ - (setenv "CONFIG_SHELL" (which "sh")) - - ;; Allow MPFR headers to be found. - (setenv "C_INCLUDE_PATH" - (string-append (getcwd) "/mpfr/src:" - (getenv "C_INCLUDE_PATH"))) - - ;; Set the C++ search path so that C headers can be found as - ;; libstdc++ is being compiled. - (setenv "CPLUS_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) - #t)) - (delete 'install2))) - ((#:configure-flags configure-flags) - `(let ((out (assoc-ref %outputs "out")) - (glibc (assoc-ref %build-inputs "libc"))) - (list (string-append "--prefix=" out) - "--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - - (string-append "--with-native-system-header-dir=" glibc "/include") - (string-append "--with-build-sysroot=" glibc "/include") - - "--disable-bootstrap" - "--disable-decimal-float" - "--disable-libatomic" - "--disable-libcilkrts" - "--disable-libgomp" - "--disable-libitm" - "--disable-libmudflap" - "--disable-libquadmath" - "--disable-libsanitizer" - "--disable-libssp" - "--disable-libvtv" - "--disable-lto" - "--disable-lto-plugin" - "--disable-multilib" - "--disable-plugin" - "--disable-threads" - "--enable-languages=c,c++" - - "--enable-static" - ;; libstdc++.so: error: depends on 'libgcc_s.so.1', which cannot be found in RUNPATH () - "--disable-shared" - "--enable-threads=single" - - ;; No pre-compiled libstdc++ headers, to save space. - "--disable-libstdcxx-pch" - - ;; for libcpp ... - "--disable-build-with-cxx"))))))) - (define gcc-mesboot1-wrapper ;; We need this so gcc-mesboot1 can be used to create shared binaries that ;; have the correct interpreter, otherwise configuring gcc-mesboot using -- cgit v1.2.3 From 9c4a021211244c0c2c927908495cabcb9d0db192 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 21:51:49 +0100 Subject: gnu: commencement: Add xz-mesboot. * gnu/packages/commencement.scm (xz-mesboot): New variable. --- gnu/packages/commencement.scm | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2e5b889099..371866b0fa 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2178,6 +2178,52 @@ ac_cv_c_float_format='IEEE (little-endian)' `(("gcc" ,gcc-mesboot1) ,@(alist-delete "gcc" (%boot-mesboot1-inputs)))) +(define xz-mesboot + ;; Finally, we can build xz. + (package + (inherit xz) + (name "xz-mesboot") + (version "5.0.0") + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (list (string-append "http://tukaani.org/xz/xz-" version + ".tar.gz") + (string-append "http://multiprecision.org/guix/xz-" + version ".tar.gz"))) + (sha256 + (base32 + "0kf40ggbs1vaaj5s9k4csycahzqcf65n20pa6lngqhm6j0cj3agb"))))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (outputs '("out")) + (propagated-inputs '()) + (native-inputs (%boot-mesboot2-inputs)) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + #:configure-flags + `("--disable-assembler" + "--disable-shared" + "--enable-small" + "--disable-threads" + "--disable-xzdec" + "--disable-lzmadec" + "--disable-lzmainfo" + "--disable-lzma-links" + "--disable-scripts" + "--disable-doc" + "--disable-nls" + "--disable-symbol-versions" + ;; configure disqualifies BASH, CPP, GCC and GREP + ;; all of which seem fine for the build + "ac_cv_prog_cc_c99=-std=gnu9x" + "ac_cv_path_GREP=grep" + "gl_cv_posix_shell=bash" + "ac_cv_have_decl_optreset=no" + "CPPFLAGS=-D__GNUC__=1"))))) + (define binutils-mesboot (package (inherit binutils-mesboot0) -- cgit v1.2.3 From 079b2cf3a2d9a4ec17fe5515f2c6fe17c3c17fec Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 21:55:45 +0100 Subject: gnu: commencement: Add hello-mesboot. * gnu/packages/commencement.scm (hello-mesboot): New variable. --- gnu/packages/commencement.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 371866b0fa..eb486fddbb 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2224,6 +2224,28 @@ ac_cv_c_float_format='IEEE (little-endian)' "ac_cv_have_decl_optreset=no" "CPPFLAGS=-D__GNUC__=1"))))) +(define hello-mesboot + ;; Check for Scheme-only bootstrap. + (package + (inherit hello) + (name "hello-mesboot") + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs (%boot-mesboot2-inputs)) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + ;; checking for grep that handles long lines and -e... + ;; configure: error: no acceptable grep could be found + #:configure-flags '("ac_cv_path_GREP=grep") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "./hello")))))))) + (define binutils-mesboot (package (inherit binutils-mesboot0) -- cgit v1.2.3 From 8bf7b7030733f922c4eb30ed4b20c7e621f29e5e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 22:00:58 +0100 Subject: gnu: commencement: binutils-mesboot: Use Gash instead of coreutils&co. * gnu/packages/commencement.scm (binutils-mesboot): Use Gash instead of coreutils&co. * gnu/packages/commencement.scm (%boot-mesboot3-inputs): New variable. --- gnu/packages/commencement.scm | 88 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 18 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index eb486fddbb..5f34d5b49f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2248,26 +2248,73 @@ ac_cv_c_float_format='IEEE (little-endian)' (define binutils-mesboot (package - (inherit binutils-mesboot0) + (inherit binutils) (name "binutils-mesboot") - (native-inputs `(("binutils" ,binutils-mesboot0) - ("libc" ,glibc-mesboot0) - ("gcc" ,gcc-mesboot0) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("diffutils" ,diffutils-mesboot) - ("kernel-headers" ,%bootstrap-linux-libre-headers) - ("make" ,make-mesboot0))) + (version "2.20.1a") + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/binutils/binutils-" + version ".tar.bz2")) + (patches (search-patches "binutils-boot-2.20.1a.patch")) + (sha256 + (base32 + "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi"))))) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("xz" ,xz-mesboot) + ,@(%boot-mesboot2-inputs))) + (supported-systems '("i686-linux" "x86_64-linux")) (arguments - (substitute-keyword-arguments (package-arguments binutils-mesboot0) - ((#:configure-flags configure-flags) - '(list "--disable-nls" - "--disable-shared" - "--disable-werror" - "--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - "--with-sysroot=/")))))) + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f ; runtest: command not found + #:parallel-build? #f + #:strip-binaries? #f ; no strip yet + #:configure-flags + `("CC=gcc" + "CXX=false" + "RANLIB=true" + "--disable-doc" + "--disable-nls" + "--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--with-sysroot=/" + ;; checking for grep that handles long lines and -e + "ac_cv_path_GREP=grep") + ;; FIXME: ac_cv_path_GREP=grep doesn't seem to be forwarded to + ;; cascading configure's? + #:make-flags '("ac_cv_path_GREP=grep") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'scripted-patch + (lambda _ + ;; sed-mesboot0 cannot build these + (copy-file "binutils/Makefile.in" "binutils/Makefile.in.orig") + (substitute* "binutils/Makefile.in" + ;; binutils/binutils uses an amazingly complex install + ;; command, using FOR, SED, READ, IF, ECHO, SED, SED, AWK, + ;; READ, and then LIBTOOL (to do something like + ;; `mkdir $DESTDIR$bindir; cp readline $DESTDIR$bindir ...') + + ;; Some tool [debugme!] cannot handle two escaped newlines + ;; (bash?), and the install stops after $(am__EXEEXT_11) + ;; ("objcopy"), so $(am__EXEEXT_13) ("readelf") and others do + ;; not get installed. Remove the stray newline: + (("^\t@BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ .*") "")) + (substitute* "opcodes/Makefile.in" + (("^SUBDIRS = [.] po") "SUBDIRS = .")) + (substitute* "binutils/Makefile.in" + (("^SUBDIRS = doc po") "SUBDIRS =")) + (substitute* "gas/Makefile.in" + (("^SUBDIRS = doc po") "SUBDIRS =")) + (substitute* "gprof/Makefile.in" + (("^SUBDIRS = po") "SUBDIRS =")) + (substitute* "ld/Makefile.in" + (("^SUBDIRS = po") "SUBDIRS =")) + #t))))))) (define gcc-mesboot1-wrapper ;; We need this so gcc-mesboot1 can be used to create shared binaries that @@ -2326,6 +2373,11 @@ exec " gcc "/bin/" program (program (string-append bin "/gcc"))) (invoke program "--help"))))))))) +(define (%boot-mesboot3-inputs) + `(("binutils" ,binutils-mesboot) + ("xz" ,xz-mesboot) + ,@(alist-delete "binutils" (%boot-mesboot2-inputs)))) + (define glibc-headers-mesboot (package (inherit glibc-mesboot0) -- cgit v1.2.3 From c8a2128a1ffa5934b407c5ebdc2fbe749e9ee199 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 22:10:16 +0100 Subject: gnu: commencement: glibc-headers-mesboot: Use Gash instead of coreutils&co. * gnu/packages/commencement.scm (glibc-headers-mesboot): Use Gash instead of coreutils&co. --- gnu/packages/commencement.scm | 70 ++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 5f34d5b49f..9a20add6ac 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2394,17 +2394,8 @@ exec " gcc "/bin/" program (sha256 (base32 "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7"))))) - (native-inputs `(("binutils" ,binutils-mesboot) - ("libc" ,glibc-mesboot0) - ("gcc" ,gcc-mesboot1) - ("headers" ,mesboot-headers) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("diffutils" ,diffutils-mesboot) - ("kernel-headers" ,%bootstrap-linux-libre-headers) - ("make" ,make-mesboot))) - + (native-inputs `(("headers" ,mesboot-headers) + ,@(%boot-mesboot3-inputs))) (arguments (substitute-keyword-arguments (package-arguments glibc-mesboot0) ((#:configure-flags configure-flags) @@ -2419,13 +2410,21 @@ exec " gcc "/bin/" program "--with-pthread" "--without-cvs" "--without-gd" - "--enable-add-ons=nptl"))) + "--enable-add-ons=nptl" + ;; avoid: configure: error: confusing output from nm -u + "libc_cv_predef_stack_protector=no"))) ((#:make-flags make-flags) - `(let ((bash (assoc-ref %build-inputs "bash"))) - (list (string-append "SHELL=" bash "/bin/sh") - "install-bootstrap-headers=yes" "install-headers"))) + '(list "install-bootstrap-headers=yes" "install-headers")) ((#:phases phases) `(modify-phases ,phases + (delete 'apply-boot-patch) + (delete 'fixup-configure) + (delete 'set-path) + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (invoke "tar" "xvf" source) + (chdir (string-append "glibc-" ,version)) + #t)) (replace 'setenv (lambda* (#:key inputs #:allow-other-keys) (let* ((headers (assoc-ref inputs "headers")) @@ -2442,6 +2441,7 @@ exec " gcc "/bin/" program (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) + (setenv "LD" "gcc") ;; avoid -fstack-protector (setenv "libc_cv_ssp" "false") @@ -2452,9 +2452,9 @@ exec " gcc "/bin/" program (lambda* (#:key outputs make-flags #:allow-other-keys) (let ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) (out (assoc-ref outputs "out"))) - (apply invoke "make" make-flags) - (copy-recursively kernel-headers out) - #t))) + (and (apply invoke "make" make-flags) + (copy-recursively kernel-headers out) + #t)))) (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) (format (current-error-port) "running ../configure ~a\n" (string-join configure-flags)) @@ -2463,18 +2463,28 @@ exec " gcc "/bin/" program (apply invoke "../configure" configure-flags))) (add-after 'configure 'remove-sunrpc (lambda _ - (invoke "make" (string-append (getcwd) "/sysd-sorted" ) - (string-append "SHELL=" (getenv "CONFIG_SHELL"))) - (substitute* "sysd-sorted" - ((" sunrpc") " ") - ((" nis") " ")) - ;; 'rpcgen' needs native libc headers to be built. - (substitute* "../Makefile" - (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL")))) - (substitute* "../Makeconfig" - (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL")))) - (substitute* "../elf/Makefile" - (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL")))))))))))) + (let* ((out (assoc-ref %outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + + (let ((Makefile (open-file "Makefile" "a"))) + (display (string-append " + +SHELL := " shell " +") + Makefile) + (close Makefile)) + (substitute* "../Makefile" + (("^SHELL := /bin/sh") (string-append "SHELL := " shell))) + (substitute* "../Makeconfig" + (("^SHELL := /bin/sh") (string-append "SHELL := " shell))) + (substitute* "../elf/Makefile" + (("^SHELL := /bin/sh") (string-append "SHELL := " shell))) + (invoke "make" (string-append (getcwd) "/sysd-sorted" )) + (substitute* "sysd-sorted" + ((" sunrpc") " ") + ((" nis") " ")) + #t))))))))) (define glibc-mesboot (package -- cgit v1.2.3 From 6ff41881953046cf1b775560e82b59ca8ef17c23 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 22:16:22 +0100 Subject: gnu: commencement: glibc-mesboot: Use Gash instead of coreutils&co. * gnu/packages/commencement.scm (glibc-mesboot): Use Gash instead of coreutils&co. --- gnu/packages/commencement.scm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9a20add6ac..c6b05d48b5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2490,19 +2490,10 @@ SHELL := " shell " (package (inherit glibc-headers-mesboot) (name "glibc-mesboot") - (native-inputs `(("binutils" ,binutils-mesboot) - ("libc" ,glibc-mesboot0) - ("headers" ,glibc-headers-mesboot) - ("gcc" ,gcc-mesboot1) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("diffutils" ,diffutils-mesboot) - ("kernel-headers" ,%bootstrap-linux-libre-headers) - ("make" ,make-mesboot))) - + (native-inputs `(("headers" ,glibc-headers-mesboot) + ,@(%boot-mesboot3-inputs))) (arguments - `(#:validate-runpath? #f ; fails when using --enable-shared + `(#:validate-runpath? #f ; fails when using --enable-shared ,@(substitute-keyword-arguments (package-arguments glibc-headers-mesboot) ((#:make-flags make-flags) `(let ((bash (assoc-ref %build-inputs "bash"))) @@ -2514,9 +2505,13 @@ SHELL := " shell " (let* ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) (out (assoc-ref outputs "out")) (install-flags (cons "install" make-flags))) - (apply invoke "make" install-flags) - (copy-recursively kernel-headers out) - #t)))))))))) + (and (apply invoke "make" install-flags) + (copy-recursively kernel-headers out) + #t))))))))))) + +(define (%boot-mesboot4-inputs) + `(("libc" ,glibc-mesboot) + ,@(alist-delete "libc" (%boot-mesboot3-inputs)))) (define gcc-mesboot (package -- cgit v1.2.3 From 8b58e499cb68f6e9082e8dedbd9b5642f95b5022 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 22:27:22 +0100 Subject: gnu: commencement: gcc-mesboot1-wrapper: Use Gash instead of coreutils&co. * gnu/packages/commencement.scm (gcc-mesboot1-wrapper): Use Gash instead of coreutils&co. --- gnu/packages/commencement.scm | 115 +++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c6b05d48b5..fa18616899 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2316,63 +2316,6 @@ ac_cv_c_float_format='IEEE (little-endian)' (("^SUBDIRS = po") "SUBDIRS =")) #t))))))) -(define gcc-mesboot1-wrapper - ;; We need this so gcc-mesboot1 can be used to create shared binaries that - ;; have the correct interpreter, otherwise configuring gcc-mesboot using - ;; --enable-shared will fail. - (package - (inherit gcc-mesboot1) - (name "gcc-mesboot1-wrapper") - (source #f) - (inputs '()) - (native-inputs `(("bash" ,%bootstrap-coreutils&co) - ("libc" ,glibc-mesboot) - ("gcc" ,gcc-mesboot1))) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:phases - (modify-phases %standard-phases - (delete 'unpack) - (delete 'configure) - (delete 'install) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (libc (assoc-ref %build-inputs "libc")) - (gcc (assoc-ref %build-inputs "gcc")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (for-each - (lambda (program) - (let ((wrapper (string-append bin "/" program))) - (with-output-to-file wrapper - (lambda _ - (display (string-append "#! " bash "/bin/bash -exec " gcc "/bin/" program -" -Wl,--dynamic-linker" -;; also for x86_64-linux, we are still on i686-linux -" -Wl," libc ,(glibc-dynamic-linker "i686-linux") -" -Wl,--rpath" -" -Wl," libc "/lib" -" \"$@\" -")) - (chmod wrapper #o555))))) - '( - "gcc" - "g++" - "i686-unknown-linux-gnu-gcc" - "i686-unknown-linux-gnu-g++" - )) - #t))) - (replace 'check - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (program (string-append bin "/gcc"))) - (invoke program "--help"))))))))) - (define (%boot-mesboot3-inputs) `(("binutils" ,binutils-mesboot) ("xz" ,xz-mesboot) @@ -2513,6 +2456,64 @@ SHELL := " shell " `(("libc" ,glibc-mesboot) ,@(alist-delete "libc" (%boot-mesboot3-inputs)))) +(define gcc-mesboot1-wrapper + ;; We need this so gcc-mesboot1 can be used to create shared binaries that + ;; have the correct interpreter, otherwise configuring gcc-mesboot using + ;; --enable-shared will fail. + (package + (inherit gcc-mesboot1) + (name "gcc-mesboot1-wrapper") + (source #f) + (inputs '()) + (native-inputs `(("bash" ,bash-mesboot) + ("coreutils" ,coreutils-mesboot0) + ("libc" ,glibc-mesboot) + ("gcc" ,gcc-mesboot1))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:phases + (modify-phases %standard-phases + (delete 'unpack) + (delete 'configure) + (delete 'install) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (libc (assoc-ref %build-inputs "libc")) + (gcc (assoc-ref %build-inputs "gcc")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (for-each + (lambda (program) + (let ((wrapper (string-append bin "/" program))) + (with-output-to-file wrapper + (lambda _ + (display (string-append "#! " bash "/bin/bash +exec " gcc "/bin/" program +" -Wl,--dynamic-linker" +;; also for x86_64-linux, we are still on i686-linux +" -Wl," libc ,(glibc-dynamic-linker "i686-linux") +" -Wl,--rpath" +" -Wl," libc "/lib" +" \"$@\" +")) + (chmod wrapper #o555))))) + '("cpp" + "gcc" + "g++" + "i686-unknown-linux-gnu-cpp" + "i686-unknown-linux-gnu-gcc" + "i686-unknown-linux-gnu-g++")) + #t))) + (replace 'check + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (program (string-append bin "/gcc"))) + (invoke program "--help"))))))))) + (define gcc-mesboot (package (inherit gcc-mesboot1) -- cgit v1.2.3 From d9de3abcab11e14264126212176bce3345009ed3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 22:31:06 +0100 Subject: gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co. * gnu/packages/commencement.scm (gcc-mesboot): Use Gash instead of coreutils&co. --- gnu/packages/commencement.scm | 45 ++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index fa18616899..735bb7b99d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2520,17 +2520,10 @@ exec " gcc "/bin/" program (name "gcc-mesboot") (version (package-version gcc-4.9)) (source (bootstrap-origin (package-source gcc-4.9))) - (native-inputs `(("binutils" ,binutils-mesboot) - - ("libc" ,glibc-mesboot) - ("kernel-headers" ,%bootstrap-linux-libre-headers) - ("gcc-wrapper" ,gcc-mesboot1-wrapper) + (native-inputs `(("gcc-wrapper" ,gcc-mesboot1-wrapper) ("gcc" ,gcc-mesboot1) - - ("bash" ,%bootstrap-coreutils&co) - ("coreutils" ,%bootstrap-coreutils&co) - ("diffutils" ,diffutils-mesboot) - ("make" ,make-mesboot))) + ("headers" ,glibc-headers-mesboot) + ,@(%boot-mesboot4-inputs))) (arguments `(#:validate-runpath? #f ,@(substitute-keyword-arguments (package-arguments gcc-mesboot1) @@ -2572,7 +2565,37 @@ exec " gcc "/bin/" program "--disable-libstdcxx-pch" ;; for libcpp ... - "--disable-build-with-cxx")))))))) + "--disable-build-with-cxx"))) + ((#:phases phases) + `(modify-phases ,phases + (delete 'apply-boot-patch) + (delete 'unpack-g++) ; sadly, gcc-4.9.4 does not provide + ; modular core/language downloads + (replace 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (binutils (assoc-ref %build-inputs "binutils")) + (bash (assoc-ref %build-inputs "bash")) + (gcc (assoc-ref %build-inputs "gcc")) + (glibc (assoc-ref %build-inputs "libc")) + (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "C_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.6.4/include" + ":" kernel-headers "/include" + ":" glibc "/include" + ":" (getcwd) "/mpfr/src")) + (setenv "CPLUS_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.6.4/include" + ":" kernel-headers "/include" + ":" glibc "/include" + ":" (getcwd) "/mpfr/src")) + (setenv "LIBRARY_PATH" (string-append glibc "/lib" + ":" gcc "/lib")) + (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) + (format (current-error-port) "CPLUS_INCLUDE_PATH=~a\n" (getenv "CPLUS_INCLUDE_PATH")) + (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) + #t)))))))))) (define gcc-mesboot-wrapper ;; We need this so gcc-mesboot can be used to create shared binaries that -- cgit v1.2.3 From d7e8467f97c411696dd46e4f332f80cac422db4d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 22:34:32 +0100 Subject: gnu: commencement: gcc-mesboot-wrapper: Use Gash instead of coreutils&co. * gnu/packages/commencement.scm (gcc-mesboot-wrapper): Use Gash instead of coreutils&co. (%boot-mesboot5-inputs): New variable. --- gnu/packages/commencement.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 735bb7b99d..bbba99b307 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2606,10 +2606,16 @@ exec " gcc "/bin/" program (version (package-version gcc-mesboot)) (source #f) (inputs '()) - (native-inputs `(("bash" ,%bootstrap-coreutils&co) + (native-inputs `(("bash" ,bash-mesboot) + ("coreutils" ,coreutils-mesboot0) ("libc" ,glibc-mesboot) ("gcc" ,gcc-mesboot))))) +(define (%boot-mesboot5-inputs) + `(("gcc-wrapper" ,gcc-mesboot-wrapper) + ("gcc" ,gcc-mesboot) + ,@(fold alist-delete (%boot-mesboot4-inputs) '("gcc" "gcc-wrapper")))) + (define m4-mesboot (package (inherit m4) -- cgit v1.2.3 From 15af8e1d9d5a1b3db7cdab84dae791b357f229b6 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 22:36:22 +0100 Subject: gnu: commencement: Add coreutils-mesboot. * gnu/packages/commencement.scm (coreutils-mesboot): New variable. (%boot-mesboot6-inputs): New variable. --- gnu/packages/commencement.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index bbba99b307..6aed8e595b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2616,6 +2616,25 @@ exec " gcc "/bin/" program ("gcc" ,gcc-mesboot) ,@(fold alist-delete (%boot-mesboot4-inputs) '("gcc" "gcc-wrapper")))) +(define-public coreutils-mesboot + (package + (inherit coreutils) + (name "coreutils-mesboot") + (source (bootstrap-origin (package-source coreutils))) + (native-inputs (%boot-mesboot5-inputs)) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f)))) + +(define (%boot-mesboot6-inputs) + `(("coreutils" ,coreutils-mesboot) + ,@(fold alist-delete (%boot-mesboot5-inputs) + '("coreutils" "kernel-headers")))) + (define m4-mesboot (package (inherit m4) -- cgit v1.2.3 From 47fb2466b810afbd5d2d741f26a7e1bca8838b49 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 11 Dec 2019 01:07:46 +0100 Subject: gnu: commencement: Remove m4-mesboot. * gnu/packages/commencement.scm (m4-mesboot): Remove. --- gnu/packages/commencement.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 6aed8e595b..6149b848a0 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2635,34 +2635,6 @@ exec " gcc "/bin/" program ,@(fold alist-delete (%boot-mesboot5-inputs) '("coreutils" "kernel-headers")))) -(define m4-mesboot - (package - (inherit m4) - (name "m4-mesboot") - (version "1.4") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/m4/m4-" - version ".tar.gz")) - (sha256 - (base32 - "1f9bxj176kf3pvs350w2dfs8jgwhminywri5pyn01b11yc4yhsjw")))) - (supported-systems '("i686-linux" "x86_64-linux")) - (native-inputs `(("mes" ,mes-boot) - ("tcc" ,tcc-boot))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "CONFIG_SHELL" (string-append - (assoc-ref %build-inputs "bash") - "/bin/sh")) - (setenv "CC" "tcc -static") - (setenv "CPP" "tcc -E") - (invoke "./configure" (string-append "--prefix=" out)))))))))) - (define (%bootstrap-inputs+toolchain) ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed ;; the actual reduced set with bootstrapped toolchain. -- cgit v1.2.3 From f29fdd4e00cc41b13a1d5e5033d7525e4dbf8d04 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 22:39:14 +0100 Subject: gnu: commencement: %bootstrap-inputs+toolchain: Use Gash instead of coreutils&co. * gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): Use Gash instead of coreutils&co. --- gnu/packages/commencement.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 6149b848a0..2c0ddfce78 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2636,16 +2636,11 @@ exec " gcc "/bin/" program '("coreutils" "kernel-headers")))) (define (%bootstrap-inputs+toolchain) - ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed - ;; the actual reduced set with bootstrapped toolchain. + ;; The traditional bootstrap-inputs. For the i686-linux, x86_64-linux + ;; Scheme-only bootstrap the actual reduced set with bootstrapped toolchain. (match (%current-system) ((or "i686-linux" "x86_64-linux") - `(("libc" ,glibc-mesboot) - ("binutils" ,binutils-mesboot) - ("gcc-wrapper" ,gcc-mesboot-wrapper) - ("gcc" ,gcc-mesboot) - ,@(fold alist-delete (%bootstrap-inputs) - '("bootstrap-mescc-tools" "mes")))) + (%boot-mesboot6-inputs)) (_ (%bootstrap-inputs)))) -- cgit v1.2.3 From f8d1a95ea45475d106289b32cb07e5aa762ebd30 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 17 Feb 2020 21:56:05 +0100 Subject: gnu: commencement: file: Build file without bzip2. * gnu/packages/commencement.scm (file): New variable. Use it instead of (gnu packages file), removing failing bzip2 extension. --- gnu/packages/commencement.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2c0ddfce78..b5d27e8f96 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2017 Mark H Weaver ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -31,7 +31,6 @@ #:use-module (gnu packages c) #:use-module (gnu packages gcc) #:use-module (gnu packages m4) - #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages bison) #:use-module (gnu packages flex) @@ -2709,6 +2708,12 @@ exec " gcc "/bin/" program ,flags))) (package-arguments findutils)))))) +(define file + (package + (inherit (@ (gnu packages file) file)) + (arguments + `(#:configure-flags '("--disable-bzlib"))))) + (define file-boot0 (package (inherit file) @@ -2718,10 +2723,12 @@ exec " gcc "/bin/" program `(("make" ,gnu-make-boot0) ,@(%bootstrap-inputs+toolchain))) (arguments - `(#:implicit-inputs? #f + `(#:tests? #f ; merge test fails + #:implicit-inputs? #f #:guile ,%bootstrap-guile #:strip-binaries? #f - #:validate-runpath? #f)))) + #:validate-runpath? #f + ,@(package-arguments file))))) (define (%boot0-inputs) `(("make" ,gnu-make-boot0) -- cgit v1.2.3 From 4bfce839f9595750960e3bf2e789e351eb74e279 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 11 Dec 2019 17:24:21 +0100 Subject: gnu: commencement: Add gawk-boot0. * gnu/packages/commencement.scm (gawk-boot0): New variable. (%boot0-inputs): Add it. --- gnu/packages/commencement.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b5d27e8f96..8ab3c3ad31 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2730,11 +2730,28 @@ exec " gcc "/bin/" program #:validate-runpath? #f ,@(package-arguments file))))) +(define gawk-boot0 + (package + (inherit patch) + (source (bootstrap-origin (package-source gawk))) + (name "gawk-boot0") + (native-inputs '()) + (inputs + `(("make" ,gnu-make-boot0) + ,@(%bootstrap-inputs+toolchain))) + (arguments + `(#:tests? #f + #:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f + #:validate-runpath? #f)))) + (define (%boot0-inputs) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) ("file" ,file-boot0) + ("gawk" ,gawk-boot0) ,@(%bootstrap-inputs+toolchain))) (define* (boot-triplet #:optional (system (%current-system))) -- cgit v1.2.3 From fdab061994a5f6f737fe8219d7cc2f936f790f5c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 23:56:32 +0100 Subject: gnu: commencement: Add sed-boot0. linux-libre-headers depends on `sed -E', introduced in sed 4.1.5. * gnu/packages/commencement.scm (sed-boot0): New variable. (%boot0-inputs): Add it. --- gnu/packages/commencement.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8ab3c3ad31..2e91ded693 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2746,12 +2746,28 @@ exec " gcc "/bin/" program #:strip-binaries? #f #:validate-runpath? #f)))) +(define sed-boot0 + (package + (inherit sed) + (name "sed-boot0") + (source (bootstrap-origin (package-source sed))) + (native-inputs '()) + (inputs + `(("make" ,gnu-make-boot0) + ,@(%bootstrap-inputs+toolchain))) + (arguments + `(#:implicit-inputs? #f + #:tests? #f + #:guile ,%bootstrap-guile + ,@(package-arguments sed))))) + (define (%boot0-inputs) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) ("file" ,file-boot0) ("gawk" ,gawk-boot0) + ("sed" ,sed-boot0) ,@(%bootstrap-inputs+toolchain))) (define* (boot-triplet #:optional (system (%current-system))) -- cgit v1.2.3 From 31a3db77e96d91cc75bb7c5703c9f16effe190ee Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 23 Nov 2019 08:48:03 +0100 Subject: gnu: commencement: Add patch-boot0. * gnu/packages/commencement.scm (patch-boot0): New variable: patch without lzip dependency (via ed). (%boot0-inputs): Add it. --- gnu/packages/commencement.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2e91ded693..8c9cd7c037 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2746,6 +2746,22 @@ exec " gcc "/bin/" program #:strip-binaries? #f #:validate-runpath? #f)))) +(define patch-boot0 + (package + (inherit patch) + (source (bootstrap-origin (package-source patch))) + (name "patch-boot0") + (native-inputs '()) + (inputs + `(("make" ,gnu-make-boot0) + ,@(%bootstrap-inputs+toolchain))) + (arguments + `(#:tests? #f ; merge test fails + #:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f + #:validate-runpath? #f)))) + (define sed-boot0 (package (inherit sed) @@ -2767,6 +2783,7 @@ exec " gcc "/bin/" program ("findutils" ,findutils-boot0) ("file" ,file-boot0) ("gawk" ,gawk-boot0) + ("patch" ,patch-boot0) ("sed" ,sed-boot0) ,@(%bootstrap-inputs+toolchain))) -- cgit v1.2.3 From 2e41da947b960941304b42473c1757aef41d772a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 23 Nov 2019 09:11:57 +0100 Subject: gnu: commencement: Add bzip2-boot0. * gnu/packages/commencement.scm (bzip2-boot0): New variable. (%boot0-inputs): Add it. --- gnu/packages/commencement.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8c9cd7c037..9383e7c20b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2672,6 +2672,19 @@ exec " gcc "/bin/" program (native-inputs '()) ; no need for 'pkg-config' (inputs (%bootstrap-inputs+toolchain)))) +(define bzip2-boot0 + (package + (inherit bzip2) + (name "bzip2-boot0") + (native-inputs `()) + (inputs + `(("make" ,gnu-make-boot0) + ,@(%bootstrap-inputs+toolchain))) + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + ,@(package-arguments bzip2))))) + (define diffutils-boot0 (package (inherit diffutils) @@ -2778,11 +2791,12 @@ exec " gcc "/bin/" program ,@(package-arguments sed))))) (define (%boot0-inputs) - `(("make" ,gnu-make-boot0) + `(("bzip2" ,bzip2-boot0) ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) ("file" ,file-boot0) ("gawk" ,gawk-boot0) + ("make" ,gnu-make-boot0) ("patch" ,patch-boot0) ("sed" ,sed-boot0) ,@(%bootstrap-inputs+toolchain))) -- cgit v1.2.3 From 1d313d6d88556f1b110d09d1e0e7b2e967a403ca Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 23 Nov 2019 09:13:50 +0100 Subject: gnu: commencement: Add tar-boot0. * gnu/packages/commencement.scm (tar-boot0): New variable. (%boot0-inputs): Add it. --- gnu/packages/commencement.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9383e7c20b..9d4880f924 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2790,6 +2790,21 @@ exec " gcc "/bin/" program #:guile ,%bootstrap-guile ,@(package-arguments sed))))) +(define tar-boot0 + (package + (inherit tar) + (name "tar-boot0") + (source (bootstrap-origin (package-source tar))) + (native-inputs '()) + (inputs + `(("make" ,gnu-make-boot0) + ,@(%bootstrap-inputs+toolchain))) + (arguments + `(#:implicit-inputs? #f + #:tests? #f + #:guile ,%bootstrap-guile + ,@(package-arguments tar))))) + (define (%boot0-inputs) `(("bzip2" ,bzip2-boot0) ("diffutils" ,diffutils-boot0) @@ -2799,6 +2814,7 @@ exec " gcc "/bin/" program ("make" ,gnu-make-boot0) ("patch" ,patch-boot0) ("sed" ,sed-boot0) + ("tar" ,tar-boot0) ,@(%bootstrap-inputs+toolchain))) (define* (boot-triplet #:optional (system (%current-system))) -- cgit v1.2.3 From cacb6b903d6d45606a9d7d91e461e58348e3b80c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 23 Nov 2019 11:18:12 +0100 Subject: gnu: commencement: Add coreutils-boot0. (coreutils-boot0): New variable. * gnu/packages/commencement.scm (%boot0-inputs): Add it. --- gnu/packages/commencement.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9d4880f924..8555249c17 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2685,6 +2685,21 @@ exec " gcc "/bin/" program #:implicit-inputs? #f ,@(package-arguments bzip2))))) +(define coreutils-boot0 + (package + (inherit coreutils) + (source (bootstrap-origin (package-source coreutils))) + (name "coreutils-boot0") + (native-inputs `()) + (inputs + `(("make" ,gnu-make-boot0) + ,@(%bootstrap-inputs+toolchain))) + (arguments + `(#:tests? #f + #:implicit-inputs? #f + #:guile ,%bootstrap-guile + ,@(package-arguments coreutils))))) + (define diffutils-boot0 (package (inherit diffutils) @@ -2807,6 +2822,7 @@ exec " gcc "/bin/" program (define (%boot0-inputs) `(("bzip2" ,bzip2-boot0) + ("coreutils" ,coreutils-boot0) ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) ("file" ,file-boot0) -- cgit v1.2.3 From f0505fde55aa4f5b62452abeba5898378195cef4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 5 Dec 2019 23:13:34 +0100 Subject: gnu: commencement: coreutils-final: Inherit from coreutils-minimal. * gnu/packages/commencement.scm (coreutils-final): Inherit from coreutils-minimal. --- gnu/packages/commencement.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8555249c17..13b1936260 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3768,7 +3768,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define coreutils-final ;; The final Coreutils. Treat them specially because some packages, such as ;; Findutils, keep a reference to the Coreutils they were built with. - (with-boot5 (package-with-bootstrap-guile coreutils) + (with-boot5 (package-with-bootstrap-guile + (package + (inherit coreutils-minimal) + (name "coreutils"))) ;; Use the final Guile, linked against the ;; final libc with working iconv, so that ;; 'substitute*' works well when touching -- cgit v1.2.3 From 6340afee2852c5b81f6a34678c71d42fa17b4a7c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 13 Dec 2019 23:12:56 +0100 Subject: gnu: commencement: %bootstrap-tarballs: Remove %bootstrap-binaries-tarball. * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[i686-linux, x86_64-linux]: Remove %bootstrap-binaries-tarball. * gnu/packages/commencement.scm (file-boot0): Drop bzlib dependency. --- gnu/packages/commencement.scm | 1 + gnu/packages/make-bootstrap.scm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 13b1936260..3bb0e321f8 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2754,6 +2754,7 @@ exec " gcc "/bin/" program `(#:tests? #f ; merge test fails #:implicit-inputs? #f #:guile ,%bootstrap-guile + #:configure-flags '("--disable-bzlib") #:strip-binaries? #f #:validate-runpath? #f ,@(package-arguments file))))) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index ef274a2ade..335d5c811d 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -889,8 +889,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ,%linux-libre-headers-bootstrap-tarball))) (_ `(("gcc-tarball" ,%gcc-bootstrap-tarball) ("binutils-tarball" ,%binutils-bootstrap-tarball) - ("glibc-tarball" ,(%glibc-bootstrap-tarball))))) - ("coreutils&co-tarball" ,%bootstrap-binaries-tarball))) + ("glibc-tarball" ,(%glibc-bootstrap-tarball)) + ("coreutils&co-tarball" ,%bootstrap-binaries-tarball)))))) (synopsis "Tarballs containing all the bootstrap binaries") (description synopsis) (home-page #f) -- cgit v1.2.3 From d77860dbc8fc9fc494fec68da2b81fecd59db8a1 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 22 Nov 2019 23:05:15 +0100 Subject: gnu: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash. * gnu/packages/bootstrap.scm (%bootstrap-inputs)[i686-linux,x86-linux]: Remove %bootstrap-coreutils&co, %bootstrap-bash. --- gnu/packages/bootstrap.scm | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c097d93693..0fbe8ef64a 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -809,19 +809,18 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (define (%bootstrap-inputs) ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. - `(,@(match (%current-system) - ((or "i686-linux" "x86_64-linux") - `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) - ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools) - ("mes" ,%bootstrap-mes))) - (_ - `(("libc" ,%bootstrap-glibc) - ("gcc" ,%bootstrap-gcc) - ("binutils" ,%bootstrap-binutils)))) - ("coreutils&co" ,%bootstrap-coreutils&co) - - ;; In gnu-build-system.scm, we rely on the availability of Bash. - ("bash" ,%bootstrap-coreutils&co))) + (match (%current-system) + ((or "i686-linux" "x86_64-linux") + `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) + ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools) + ("mes" ,%bootstrap-mes))) + (_ + `(("libc" ,%bootstrap-glibc) + ("gcc" ,%bootstrap-gcc) + ("binutils" ,%bootstrap-binutils) + ("coreutils&co" ,%bootstrap-coreutils&co) + ;; In gnu-build-system.scm, we rely on the availability of Bash. + ("bash" ,%bootstrap-coreutils&co))))) (define %bootstrap-inputs-for-tests ;; These are bootstrap inputs that are cheap to produce (no compilation -- cgit v1.2.3 From 2bb7deff9fc748c789bd424590e48c42c8d8e80e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 16 Dec 2019 13:37:56 +0100 Subject: gnu: commencement: gnu-make-mesboot0: Rename from make-mesboot0. * gnu/packages/commencement.scm (gnu-make-mesboot0): Rename from make-mesboot0. Update users. --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3bb0e321f8..de010c5ef2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -728,7 +728,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" ;; no gzip yet (delete 'compress-documentation)))))) -(define make-mesboot0 +(define gnu-make-mesboot0 ;; The initial make (package (inherit gnu-make) @@ -784,7 +784,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (install-file "make" bin))))))))) (define (%boot-tcc0-inputs) - `(("make" ,make-mesboot0) + `(("make" ,gnu-make-mesboot0) ("tcc" ,tcc-boot0) ,@(%boot-gash-inputs))) -- cgit v1.2.3 From 476614f782eca24dac1422c00f90515f62216f77 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 16 Dec 2019 13:38:20 +0100 Subject: gnu: commencement: gnu-make-mesboot: Rename from make-mesboot. * gnu/packages/commencement.scm (gnu-make-mesboot): Rename from. make-mesboot. Update users. --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index de010c5ef2..a3c770bd00 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1787,7 +1787,7 @@ ac_cv_c_float_format='IEEE (little-endian)' "ac_cv_func_gethostbyname=no" "gl_cv_func_rename_dest_works=yes"))))) -(define make-mesboot +(define gnu-make-mesboot (package (inherit gnu-make) (name "make-mesboot") @@ -1964,7 +1964,7 @@ ac_cv_c_float_format='IEEE (little-endian)' ("coreutils" ,coreutils-mesboot0) ("gawk" ,gawk-mesboot) ("grep" ,grep-mesboot) - ("make" ,make-mesboot) + ("make" ,gnu-make-mesboot) ("sed" ,sed-mesboot) ("tar" ,tar-mesboot) ,@(fold alist-delete (%boot-mesboot0-inputs) -- cgit v1.2.3 From a75a6aa1b8a091966921e3cff53420d59aaaa808 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 16 Dec 2019 22:56:12 +0100 Subject: gnu: commencement: gash-core-utils-boot: Update to 0.0.214-fc1b. * gnu/packages/commencement.scm (gash-core-utils-boot): Update to 0.0.214-fc1b. --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a3c770bd00..7d2d00ee51 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -225,7 +225,7 @@ (package (inherit gash-core-utils) (name "gash-core-utils-boot") - (version "0.0.213-3f6eb") + (version "0.0.214-fc1b") (source (bootstrap-origin (origin (method url-fetch) @@ -243,7 +243,7 @@ #t)) (sha256 (base32 - "0601c9hqbjrjjsllr2m3zmkglkd53d97in7a5c22ikd8islddp76"))))) + "090d8m0b165jf9381nhqpljc5zk22jd6bw03xnyf0na5snk9xp6v"))))) (build-system guile-build-system) (native-inputs `(("bash" ,(bootstrap-executable "bash" (%current-system))) ("tar" ,(bootstrap-executable "tar" (%current-system))) -- cgit v1.2.3 From 062bc721176a3b21b7b8e6564e9a5706adc9879c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 17 Dec 2019 09:12:07 +0100 Subject: gnu: commencement: glibc-mesboot: Use gash only, instead of bash/gash mix. While this works and is much cleaner, it is also much slower. * gnu/packages/commencement.scm (glibc-mesboot0): Use gash only, instead of bash/gash mix. --- gnu/packages/commencement.scm | 49 ++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7d2d00ee51..07d78ad51d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1497,8 +1497,13 @@ ac_cv_c_float_format='IEEE (little-endian)' (native-inputs `(("boot-patch" ,(search-patch "glibc-boot-2.2.5.patch")) ("system-patch" ,(search-patch "glibc-bootstrap-system-2.2.5.patch")) ("headers" ,mesboot-headers) - ,@(%boot-mesboot-core-inputs) - ("gash" ,gash-boot))) + ;; XXX: make-syscalls.sh does not run correctly with + ;; bash-mesboot0, producing a wrong sysd-syscalls. + ;; This leads to posix/uname.c getting compiled where it + ;; shouldn't: + ;; ../sysdeps/generic/uname.c:25: config-name.h: error 02 + ("bash" ,gash-boot) + ,@(%boot-mesboot-core-inputs))) (outputs '("out")) (arguments `(#:implicit-inputs? #f @@ -1556,33 +1561,19 @@ ac_cv_c_float_format='IEEE (little-endian)' (format (current-error-port) "running ./configure ~a\n" (string-join configure-flags)) (apply invoke "./configure" configure-flags))) - (add-after 'configure 'fixup-configure - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash")) - (gash (assoc-ref %build-inputs "gash")) - (gash (string-append gash "/bin/gash"))) - (substitute* "config.make" - (("INSTALL = scripts/") "INSTALL = $(..)./scripts/")) - (substitute* "config.make" - (("INSTALL = scripts/") "INSTALL = $(..)./scripts/") - (("BASH = ") (string-append - "SHELL = " shell " -BASH = "))) - ;; XXX: make-syscalls.sh does not run correctly with - ;; bash-mesboot0, producing a wrong sysd-syscalls. - - ;; This leads to posix/uname.c getting compiled where it - ;; shouldn't: - - ;; ../sysdeps/generic/uname.c:25: config-name.h: error 02 - (substitute* "sysdeps/unix/make-syscalls.sh" - (("#!/gnu/store.*/bin/bash") (string-append "#! " gash))) - - (substitute* "sysdeps/unix/Makefile" - ((" [{] [$][(]SHELL[)]") (string-append " { " gash)))) - #t))))))) + (add-after 'configure 'fixup-configure + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (substitute* "config.make" + (("INSTALL = scripts/") "INSTALL = $(..)./scripts/")) + (substitute* "config.make" + (("INSTALL = scripts/") "INSTALL = $(..)./scripts/") + (("BASH = ") (string-append + "SHELL = " shell " + BASH = "))) + #t)))))))) (define gcc-mesboot0 (package -- cgit v1.2.3 From 1fdc6a3829ab91c7d2124a4a0771788553c61f77 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 18 Dec 2019 17:14:38 +0100 Subject: gnu: commencement: mes-boot: Update to 0.22. * gnu/packages/commencement.scm (mes-boot): Update to 0.22. --- gnu/packages/commencement.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 07d78ad51d..8b01770caa 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -498,14 +498,14 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (package (inherit mes) (name "mes-boot") - (version "0.21-33-g6d493b90d") + (version "0.22") (source (origin (method url-fetch) - (uri (string-append "http://lilypond.org/janneke/mes/" + (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "0nr74zyam5n82svjwfbcz2mycj88vvsqab12x0mxv1lm6yqxqmmj")))) + "0p1jsrrmcbc0zrvbvnjbb6iyxr0in71km293q8qj6gnar6bw09av")))) (inputs '()) (propagated-inputs '()) (native-inputs -- cgit v1.2.3 From a7e514170a26cd2dcb9cfc6615a1372c50cb83be Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 18 Dec 2019 17:14:58 +0100 Subject: gnu: commencement: glibc-boot0: Remove gash, use bash-mesboot0 only. * gnu/packages/commencement.scm (glibc-mesboot0): Use bash-mesboot0 only. --- gnu/packages/commencement.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8b01770caa..d1ad396916 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1497,12 +1497,6 @@ ac_cv_c_float_format='IEEE (little-endian)' (native-inputs `(("boot-patch" ,(search-patch "glibc-boot-2.2.5.patch")) ("system-patch" ,(search-patch "glibc-bootstrap-system-2.2.5.patch")) ("headers" ,mesboot-headers) - ;; XXX: make-syscalls.sh does not run correctly with - ;; bash-mesboot0, producing a wrong sysd-syscalls. - ;; This leads to posix/uname.c getting compiled where it - ;; shouldn't: - ;; ../sysdeps/generic/uname.c:25: config-name.h: error 02 - ("bash" ,gash-boot) ,@(%boot-mesboot-core-inputs))) (outputs '("out")) (arguments -- cgit v1.2.3 From 1681d3f1e040cbf0fb8297fc1f557fb787ec7668 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Feb 2020 11:26:35 -0500 Subject: gnu: Rename 'gash-core-utils' to 'gash-utils'. * gnu/packages/shells.scm (gash-core-utils): Rename this... (gash-utils): ...to this. * gnu/packages/commencement.scm (gash-core-utils): Rename this... (gash-utils): ...to this and update the parent package reference. (%boot-gash-inputs): Update reference. --- gnu/packages/commencement.scm | 10 +++++----- gnu/packages/shells.scm | 32 -------------------------------- 2 files changed, 5 insertions(+), 37 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d1ad396916..21a676b394 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -85,7 +85,7 @@ (define %bootstrap-guile+guild ;; This package combines %bootstrap-guile with guild, which is not included ;; in %bootstrap-guile. Guild is needed to build gash-boot and - ;; gash-core-utils-boot because it is dependency of the Guile build system. + ;; gash-utils-boot because it is dependency of the Guile build system. (package (name "guile-bootstrap+guild") (version "2.0") @@ -221,10 +221,10 @@ (install-file "scripts/bash" bin) #t)))))))) -(define gash-core-utils-boot +(define gash-utils-boot (package - (inherit gash-core-utils) - (name "gash-core-utils-boot") + (inherit gash-utils) + (name "gash-utils-boot") (version "0.0.214-fc1b") (source (bootstrap-origin (origin @@ -383,7 +383,7 @@ (define (%boot-gash-inputs) `(("bash" , gash-boot) ; gnu-build-system wants "bash" - ("coreutils" , gash-core-utils-boot) + ("coreutils" , gash-utils-boot) ("guile" ,%bootstrap-guile) ("guile+guild" ,%bootstrap-guile+guild))) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index a25c15443f..80ef90e111 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -856,35 +856,3 @@ Underpinning these utilities are many Scheme interfaces for manipulating files and text.") (license gpl3+))) -(define-public gash-core-utils - (package - (name "gash-core-utils") - (version "0.0.211-789c3") - (source (origin - (method url-fetch) - (uri (string-append "http://lilypond.org/janneke/guix/20191123/" - "/gash-core-utils-" version ".tar.gz")) - (sha256 - (base32 - "1ycf0ivyn9q3lc9hwq8vxg6wkwpsykvh48a5lrzsmganh0ma8wrr")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) - (inputs - `(("guile" ,guile-2.2) - ("gash" ,gash))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-test - (lambda _ - (substitute* "tests/core-utils.org" - (("ls \\(GASH\\) UNKNOWN") "ls (GASH) 0.0.211-789c3")) - #t))))) - (home-page "https://gitlab.com/janneke/gash-core-utils") - (synopsis "Bootstrappable replacement of core GNU utilities in Guile Scheme") - (description "Gash Core Utils provides core GNU utilities in Guile -Scheme as bootstrappable replacement for GNU coreutils&co.") - (license gpl3+))) -- cgit v1.2.3 From 9c9407f746aa6ad365c0604ef9668009f4dbe8fd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 8 Feb 2020 09:57:21 -0500 Subject: Add (guix build gnu-bootstrap). * guix/build/gnu-bootstrap.scm: New file. * Makefile.am (MODULES): Add it. --- Makefile.am | 1 + guix/build/gnu-bootstrap.scm | 114 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 guix/build/gnu-bootstrap.scm diff --git a/Makefile.am b/Makefile.am index c6a2e6cf6c..0371d92d7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -172,6 +172,7 @@ MODULES = \ guix/build/git.scm \ guix/build/hg.scm \ guix/build/glib-or-gtk-build-system.scm \ + guix/build/gnu-bootstrap.scm \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ guix/build/guile-build-system.scm \ diff --git a/guix/build/gnu-bootstrap.scm b/guix/build/gnu-bootstrap.scm new file mode 100644 index 0000000000..1cb9dc5512 --- /dev/null +++ b/guix/build/gnu-bootstrap.scm @@ -0,0 +1,114 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Timothy Sample +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +;; Commentary: +;; +;; These procedures can be used to adapt the GNU Build System to build +;; pure Scheme packages targeting the bootstrap Guile. +;; +;; Code: + +(define-module (guix build gnu-bootstrap) + #:use-module (guix build utils) + #:use-module (system base compile) + #:export (bootstrap-configure + bootstrap-build + bootstrap-install)) + +(define (bootstrap-configure version modules scripts) + "Create a procedure that configures an early bootstrap package. The +procedure will search the MODULES directory and configure all of the +'.in' files with VERSION. It will then search the SCRIPTS directory and +configure all of the '.in' files with the bootstrap Guile and its module +and object directories." + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (guile-dir (assoc-ref inputs "guile")) + (guile (string-append guile-dir "/bin/guile")) + (moddir (string-append out "/share/guile/site/" + (effective-version))) + (godir (string-append out "/lib/guile/" + (effective-version) + "/site-ccache"))) + (for-each (lambda (template) + (format #t "Configuring ~a~%" template) + (let ((target (string-drop-right template 3))) + (copy-file template target) + (substitute* target + (("@VERSION@") version)))) + (find-files modules + (lambda (fn st) + (string-suffix? ".in" fn)))) + (for-each (lambda (template) + (format #t "Configuring ~a~%" template) + (let ((target (string-drop-right template 3))) + (copy-file template target) + (substitute* target + (("@GUILE@") guile) + (("@MODDIR@") moddir) + (("@GODIR@") godir)) + (chmod target #o755))) + (find-files scripts + (lambda (fn st) + (string-suffix? ".in" fn)))) + #t))) + +(define (bootstrap-build modules) + "Create a procedure that builds an early bootstrap package. The +procedure will search the MODULES directory and compile all of the +'.scm' files." + (lambda _ + (add-to-load-path (getcwd)) + (for-each (lambda (scm) + (let* ((base (string-drop-right scm 4)) + (go (string-append base ".go")) + (dir (dirname scm))) + (format #t "Compiling ~a~%" scm) + (compile-file scm #:output-file go))) + (find-files modules "\\.scm$")) + #t)) + +(define (bootstrap-install modules scripts) + "Create a procedure that installs an early bootstrap package. The +procedure will install all of the '.scm' and '.go' files in the MODULES +directory, and all the executable files in the SCRIPTS directory." + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (guile-dir (assoc-ref inputs "guile")) + (guile (string-append guile-dir "/bin/guile")) + (moddir (string-append out "/share/guile/site/" + (effective-version))) + (godir (string-append out "/lib/guile/" + (effective-version) + "/site-ccache"))) + (for-each (lambda (scm) + (let* ((base (string-drop-right scm 4)) + (go (string-append base ".go")) + (dir (dirname scm))) + (format #t "Installing ~a~%" scm) + (install-file scm (string-append moddir "/" dir)) + (format #t "Installing ~a~%" go) + (install-file go (string-append godir "/" dir)))) + (find-files modules "\\.scm$")) + (for-each (lambda (script) + (format #t "Installing ~a~%" script) + (install-file script (string-append out "/bin"))) + (find-files scripts + (lambda (fn st) + (executable-file? fn)))) + #t))) -- cgit v1.2.3 From 2ca7af43fe17d9acf082dce85d137a27a8ac4887 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Feb 2020 10:51:07 -0500 Subject: gnu: commencement: Simplify Gash and Gash-Utils. This change does three things. First Gash-Utils is updated to 0.1.0. Then, the bootstrap Gash and Gash-Utils packages are arranged to be built without using 'guild'. Finally, instead of using a binary 'tar' via 'bootstrap-executable' to extract Gash and Gash-Utils, a self-extracting Scheme implementation of 'tar' and 'gzip' is used instead. These three changes need to happen in concert to avoid breaking the bootstrap process. * gnu/packages/shells.scm (gash-utils): Update to 0.1.0; remove 'autoconf' and 'automake' from 'native-inputs'; delete 'arguments'; update the home-page, synopsis, and description. * gnu/packages/commencement.scm (bootar): New variable. (gash-boot): Replace 'tar', and 'xz' with 'bootar'; remove 'bash' and 'guile-source'; do not use 'guile-build-system' but rather 'gnu-build-system' with some modified phases; disable tests. (gash-utils-boot): Likewise. (%boot-gash-inputs): Add 'bootar'; replace '%bootstrap-guile+guild' with '%bootstrap-guile'. (mes-boot): In the configure phase, do not reference 'GUILE_LOAD_PATH' as it is no longer set. --- gnu/packages/commencement.scm | 378 +++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 230 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 21a676b394..663c0054db 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020 Marius Bakke +;;; Copyright © 2020 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,8 +52,8 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix build-system guile) #:use-module (guix build-system trivial) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix memoization) #:use-module (guix utils) #:use-module (srfi srfi-1) @@ -140,252 +141,170 @@ (variable "GUILE_LOAD_COMPILED_PATH") (files '("lib/guile/2.0/site-ccache"))))))) +(define bootar + (package + (name "bootar") + (version "1") + (source (origin + (method url-fetch) + (uri "https://files.ngyro.com/bootar/bootar-1.ses") + (sha256 + (base32 + "011p0nky2qp0vmyhvdx220qywxxp7a0m6pvy0lzzg4qxbpyqpf0r")))) + (build-system gnu-build-system) + (arguments + `(#:implicit-inputs? #f + #:tests? #f + #:guile ,%bootstrap-guile + #:imported-modules ((guix build gnu-bootstrap) + ,@%gnu-build-system-modules) + #:phases + (begin + (use-modules (guix build gnu-bootstrap)) + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key inputs #:allow-other-keys) + (let* ((source (assoc-ref inputs "source")) + (guile-dir (assoc-ref inputs "guile")) + (guile (string-append guile-dir "/bin/guile"))) + (invoke guile "--no-auto-compile" source) + (chdir "bootar") + #t))) + (replace 'configure (bootstrap-configure ,version "." "scripts")) + (replace 'build (bootstrap-build ".")) + (replace 'install (bootstrap-install "." "scripts")))))) + (inputs `(("guile" ,%bootstrap-guile))) + (home-page "https://git.ngyro.com/bootar") + (synopsis "Tar decompression and extraction in Guile Scheme") + (description "Bootar is a simple Tar extractor written in Guile +Scheme. It supports running 'tar xvf' on uncompressed tarballs or +tarballs that are compressed with BZip2, GZip, or XZ. It also provides +standalone scripts for 'bzip2', 'gzip', and 'xz' that each support +decompression to standard output. + +What makes this special is that Bootar is distributed as a +self-extracting Scheme (SES) program. That is, a little script that +outputs the source code of Bootar. This makes it possible to go from +pure Scheme to Tar and decompression in one easy step.") + (license license:gpl3+))) + (define gash-boot (package (inherit gash) (name "gash-boot") - (version "0.2.0") - (source (bootstrap-origin - (origin (inherit (package-source gash)) - (modules '((guix build utils) - (srfi srfi-26))) - (snippet - '(begin - ;; Remove Guix'y files that we cannot compile. - (delete-file "guix.scm") - (delete-file-recursively "tests") - #t))))) - (build-system guile-build-system) - (native-inputs `(("bash" ,(bootstrap-executable "bash" (%current-system))) - ("tar" ,(bootstrap-executable "tar" (%current-system))) - ("xz" ,(bootstrap-executable "xz" (%current-system))) - ("guile-source" ,(bootstrap-origin - (package-source guile-2.0))))) - (inputs `(("guile" ,%bootstrap-guile+guild))) + (source (origin + (inherit (package-source gash)) + (modules '()))) (arguments `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile+guild + #:tests? #f + #:guile ,%bootstrap-guile + #:imported-modules ((guix build gnu-bootstrap) + ,@%gnu-build-system-modules) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-guile-source - (lambda _ - (let ((guile-source (assoc-ref %build-inputs "guile-source")) - (bin (string-append (getcwd) "/zee-bin"))) - (mkdir-p bin) - (with-directory-excursion bin - (invoke "tar" "--strip-components=2" - - "-xvf" guile-source - (string-append "guile-" - ,(package-version guile-2.0) - "/meta/guild.in")) - (copy-file "guild.in" "guild") - (chmod "guild" #o555)) - #t))) - (add-before 'unpack 'set-path - (lambda _ - (let ((bash (assoc-ref %build-inputs "bash")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (bin (string-append (getcwd) "/zee-bin"))) - (mkdir-p bin) - (setenv "PATH" (string-append bin ":" (getenv "PATH"))) - (copy-file bash (string-append bin "/bash")) - (copy-file bash (string-append bin "/sh")) - (copy-file tar (string-append bin "/tar")) - (copy-file xz (string-append bin "/xz")) - #t))) - (add-after 'build 'build-scripts - (lambda _ - (let* ((guile (assoc-ref %build-inputs "guile")) - (guile (string-append guile "/bin/guile")) - (out (assoc-ref %outputs "out")) - (effective "2.0") - (moddir (string-append out "/share/guile/site/" effective "/")) - (godir (string-append out "/lib/guile/" effective "/site-ccache/"))) - (copy-file "scripts/gash.in" "scripts/gash") - (chmod "scripts/gash" #o555) - (substitute* "scripts/gash" - (("@GUILE@") guile) - (("@MODDIR@") moddir) - (("@GODIR") godir)) - #t))) - (add-after 'install 'install-scripts - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin"))) - (install-file "scripts/gash" bin) - (copy-file "scripts/gash" "scripts/sh") - (install-file "scripts/sh" bin) - (copy-file "scripts/gash" "scripts/bash") - (install-file "scripts/bash" bin) - #t)))))))) + (begin + (use-modules (guix build gnu-bootstrap)) + (modify-phases %standard-phases + (replace 'configure + (bootstrap-configure ,(version) "gash" "scripts")) + (replace 'build (bootstrap-build "gash")) + (replace 'install (bootstrap-install "gash" "scripts")) + (add-after 'install 'install-symlinks + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (symlink (string-append out "/bin/gash") + (string-append out "/bin/sh")) + (symlink (string-append out "/bin/gash") + (string-append out "/bin/bash")) + #t))))))) + (inputs `(("guile" ,%bootstrap-guile))) + (native-inputs `(("bootar" ,bootar))))) (define gash-utils-boot (package (inherit gash-utils) (name "gash-utils-boot") - (version "0.0.214-fc1b") - (source (bootstrap-origin - (origin - (method url-fetch) - (uri (string-append "http://lilypond.org/janneke/" - "/gash-core-utils-" version ".tar.gz")) - (modules '((guix build utils))) - (snippet - '(begin - ;; The Guile build system compiles *.scm; avoid - ;; compiling included lalr. - (delete-file "guix.scm") - (delete-file-recursively "tests") - (substitute* "system/base/lalr.scm" - (("system/base/lalr.upstream.scm") "lalr.upstream.scm")) - #t)) - (sha256 - (base32 - "090d8m0b165jf9381nhqpljc5zk22jd6bw03xnyf0na5snk9xp6v"))))) - (build-system guile-build-system) - (native-inputs `(("bash" ,(bootstrap-executable "bash" (%current-system))) - ("tar" ,(bootstrap-executable "tar" (%current-system))) - ("xz" ,(bootstrap-executable "xz" (%current-system))) - ("guile-source" ,(bootstrap-origin - (package-source guile-2.0))) - ;; We need the 2.0.9 lalr for %bootstrap-guile - ("lalr.upstream" - ,(origin - (method url-fetch) - (uri (string-append "http://git.savannah.gnu.org/cgit/guile.git/plain/module/system/base/lalr.upstream.scm?h=v2.0.9")) - (file-name "lalr.upstream.scm") - (sha256 - (base32 - "0h7gyjj8nr2qrgzwma146s7l22scp8bbcqzdy9wqf12bgyhbw7d5")))))) - (inputs `(("guile" ,%bootstrap-guile+guild) - ("gash" ,gash-boot))) (arguments `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile+guild - #:not-compiled-file-regexp "upstream\\.scm$" + #:tests? #f + #:guile ,%bootstrap-guile + #:imported-modules ((guix build gnu-bootstrap) + ,@%gnu-build-system-modules) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-guile-source - (lambda _ - (let ((guile-source (assoc-ref %build-inputs "guile-source")) - (bin (string-append (getcwd) "/zee-bin"))) - (mkdir-p bin) - (with-directory-excursion bin - (invoke "tar" "--strip-components=2" - - "-xvf" guile-source - (string-append "guile-" - ,(package-version guile-2.0) - "/meta/guild.in")) - (copy-file "guild.in" "guild") - (chmod "guild" #o555)) - #t))) - (add-before 'unpack 'set-path - (lambda _ - (let ((bash (assoc-ref %build-inputs "bash")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (bin (string-append (getcwd) "/zee-bin"))) - (mkdir-p bin) - (setenv "PATH" (string-append bin ":" (getenv "PATH"))) - (copy-file bash (string-append bin "/bash")) - (copy-file bash (string-append bin "/sh")) - (copy-file tar (string-append bin "/tar")) - (copy-file xz (string-append bin "/xz")) - #t))) - (add-before 'build 'set-env - (lambda _ - (let ((gash (assoc-ref %build-inputs "gash"))) - (setenv "LANG" "C") - (setenv "LC_ALL" "C") - (setenv "GUILE_LOAD_PATH" - (string-append (getcwd) - ":" (getcwd) "/system/base" - ":" gash "/share/guile/2.0")) - (setenv "GUILE_LOAD_COMPILED_PATH" - (string-append ".:" gash "/lib/guile/2.0/site-ccache/")) - (format (current-error-port) - "GUILE_LOAD_PATH=~s\n" (getenv "GUILE_LOAD_PATH")) - #t))) - (add-before 'build 'replace-lalr.upstream - (lambda _ - (let ((lalr.upstream (assoc-ref %build-inputs "lalr.upstream"))) - (copy-file lalr.upstream "system/base/lalr.upstream.scm") - #t))) - (add-after 'build 'build-scripts - (lambda _ - (let* ((guile (assoc-ref %build-inputs "guile")) - (guile (string-append guile "/bin/guile")) - (gash (string-append guile "gash")) - (out (assoc-ref %outputs "out")) - (effective "2.0") - (guilemoduledir (string-append gash "/share/guile/site/" effective "/")) - (guileobjectdir (string-append gash "/lib/guile/" effective "/site-ccache/")) - (gashmoduledir (string-append out "/share/guile/site/" effective "/")) - (gashobjectdir (string-append out "/lib/guile/" effective "/site-ccache/")) - (bin (string-append out "/bin"))) - (define (wrap name) - (copy-file "command.in" name) - (chmod name #o555) - (substitute* name - (("@GUILE@") guile) - (("@guilemoduledir@") guilemoduledir) - (("@guileobjectdir") guileobjectdir) - (("@gashmoduledir@") gashmoduledir) - (("@gashobjectdir") gashobjectdir) - (("@command@") name)) - (install-file name bin)) - (mkdir-p bin) - (with-directory-excursion "bin" - (for-each wrap '("awk" - "basename" - "cat" - "chmod" - "cmp" - "compress" - "cp" - "cut" - "diff" - "dirname" - "expr" - "false" - "find" - "grep" - "gzip" - "head" - "ln" - "ls" - "mkdir" - "mv" - "pwd" - "reboot" - "rm" - "rmdir" - "sed" - "sleep" - "sort" - "tar" - "test" - "touch" - "tr" - "true" - "uname" - "uniq" - "wc" - "which"))) - (with-directory-excursion bin - (copy-file "grep" "fgrep") - (copy-file "grep" "egrep") - (copy-file "test" "[")) - #t)))))))) + (begin + (use-modules (guix build gnu-bootstrap)) + (modify-phases %standard-phases + (add-after 'unpack 'set-load-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gash (assoc-ref inputs "gash"))) + (add-to-load-path (string-append gash "/share/guile/site/" + (effective-version)))) + #t)) + (add-before 'configure 'pre-configure + (lambda _ + (format #t "Creating gash/commands/testb.scm~%") + (copy-file "gash/commands/test.scm" + "gash/commands/testb.scm") + (substitute* "gash/commands/testb.scm" + (("gash commands test") "gash commands testb") + (("apply test [(]cdr") "apply test/bracket (cdr")) + (for-each (lambda (script) + (let ((target (string-append "scripts/" + script ".in"))) + (format #t "Creating scripts/~a~%" target) + (copy-file "scripts/template.in" target) + (substitute* target + (("@UTILITY@") script)))) + '("awk" "basename" "cat" "chmod" "cmp" "command" + "compress" "cp" "cut" "diff" "dirname" "expr" + "false" "find" "grep" "head" "ln" "ls" "mkdir" + "mv" "printf" "pwd" "reboot" "rm" "rmdir" + "sed" "sleep" "sort" "tar" "test" "touch" "tr" + "true" "uname" "uniq" "wc" "which")) + (format #t "Creating scripts/[.in~%") + (copy-file "scripts/template.in" "scripts/[.in") + (substitute* "scripts/[.in" + (("@UTILITY@") "testb")) + (delete-file "scripts/template.in") + #t)) + (replace 'configure + (bootstrap-configure ,(version) "gash" "scripts")) + (replace 'build (bootstrap-build "gash")) + (replace 'install (bootstrap-install "gash" "scripts")) + ;; XXX: The scripts should add Gash to their load paths and + ;; this phase should not exist. + (add-after 'install 'copy-gash + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (moddir (string-append out "/share/guile/site/" + (effective-version))) + (godir (string-append out "/lib/guile/" + (effective-version) + "/site-ccache")) + (gash (assoc-ref inputs "gash")) + (gash-moddir (string-append gash "/share/guile/site/" + (effective-version))) + (gash-godir (string-append gash "/lib/guile/" + (effective-version) + "/site-ccache"))) + (copy-file (string-append gash-moddir "/gash/compat.scm") + (string-append moddir "/gash/compat.scm")) + (copy-recursively (string-append gash-moddir "/gash/compat") + (string-append moddir "/gash/compat")) + (copy-file (string-append gash-godir "/gash/compat.go") + (string-append godir "/gash/compat.go")) + (copy-recursively (string-append gash-godir "/gash/compat") + (string-append godir "/gash/compat")) + #t))))))) + (inputs `(("gash" ,gash-boot) + ("guile" ,%bootstrap-guile))) + (native-inputs `(("bootar" ,bootar))))) (define (%boot-gash-inputs) `(("bash" , gash-boot) ; gnu-build-system wants "bash" ("coreutils" , gash-utils-boot) - ("guile" ,%bootstrap-guile) - ("guile+guild" ,%bootstrap-guile+guild))) + ("bootar" ,bootar) + ("guile" ,%bootstrap-guile))) (define %bootstrap-mes-rewired (package @@ -538,8 +457,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (setenv "GUILE_LOAD_PATH" (string-append mes "/share/mes/module" - ":" dir "/nyacc-0.99.0/module" - ":" (getenv "GUILE_LOAD_PATH"))) + ":" dir "/nyacc-0.99.0/module")) (invoke "gash" "configure.sh" (string-append "--prefix=" out) (string-append "--host=i686-linux-gnu"))))) -- cgit v1.2.3 From 22a9f128ad00586ce0d4ef332e80b14d43b89c54 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Feb 2020 11:46:25 -0500 Subject: gnu: commencement: Remove %bootstrap-guile+guild. * gnu/packages/commencement.scm (%bootstrap-guile+guild): Remove variable. --- gnu/packages/commencement.scm | 58 ------------------------------------------- 1 file changed, 58 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 663c0054db..aa868c9e21 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -83,64 +83,6 @@ ;;; ;;; Code: -(define %bootstrap-guile+guild - ;; This package combines %bootstrap-guile with guild, which is not included - ;; in %bootstrap-guile. Guild is needed to build gash-boot and - ;; gash-utils-boot because it is dependency of the Guile build system. - (package - (name "guile-bootstrap+guild") - (version "2.0") - (source (bootstrap-origin (package-source guile-2.0))) - (native-inputs `(("bash" ,(bootstrap-executable "bash" (%current-system))) - ("tar" ,(bootstrap-executable "tar" (%current-system))) - ("xz" ,(bootstrap-executable "xz" (%current-system))) - ("guile" ,%bootstrap-guile))) - (build-system trivial-build-system) - (arguments - `(#:guile ,%bootstrap-guile - #:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((guile-source (assoc-ref %build-inputs "source")) - (bin (string-append (getcwd) "/bin")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz"))) - (mkdir-p bin) - (setenv "PATH" bin) - (with-directory-excursion bin - (copy-file tar "tar") - (copy-file xz "xz") - (setenv "PATH" bin)) - (let* ((out (assoc-ref %outputs "out")) - (out-bin (string-append out "/bin")) - (guile (assoc-ref %build-inputs "guile")) - (bash (assoc-ref %build-inputs "bash"))) - (mkdir-p out-bin) - (with-directory-excursion out-bin - (symlink (string-append guile "/bin/guile") - "guile") - (invoke "tar" "--strip-components=2" - "-xvf" guile-source - (string-append "guile-" - ,(package-version guile-2.0) - "/meta/guild.in")) - (copy-file "guild.in" "guild") - (substitute* "guild" - (("#!/bin/sh") (string-append "#! " bash)) - (("@installed_guile@") (string-append out-bin "/guile"))) - (chmod "guild" #o555))))))) - (synopsis "Bootstrap Guile plus Guild") - (description "Bootstrap Guile with added Guild") - (home-page #f) - (license (package-license guile-2.0)) - (native-search-paths - (list (search-path-specification - (variable "GUILE_LOAD_PATH") - (files '("share/guile/site/2.0"))) - (search-path-specification - (variable "GUILE_LOAD_COMPILED_PATH") - (files '("lib/guile/2.0/site-ccache"))))))) - (define bootar (package (name "bootar") -- cgit v1.2.3 From e157ed72ec7b673b4204c84a7bf74f13afb44dc7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 8 Feb 2020 10:27:34 -0500 Subject: gnu: commencement: Fix '%boot-mesboot1-inputs'. * gnu/packages/commencement.scm (%boot-mesboot1-inputs): In the list of elements to delete from '%boot-mesboot0-inputs', remove a duplicate 'bash', add 'bootar', and remove an extra space at the end of 'grep'. --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index aa868c9e21..9827b77343 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1813,8 +1813,8 @@ ac_cv_c_float_format='IEEE (little-endian)' ("sed" ,sed-mesboot) ("tar" ,tar-mesboot) ,@(fold alist-delete (%boot-mesboot0-inputs) - '("bash" "bash" "binutils" "coreutils" "gash" "gawk" "grep " "guile" - "make" "sed" "tar")))) + '("bash" "binutils" "bootar" "coreutils" "gash" + "gawk" "grep" "guile" "make" "sed" "tar")))) (define gmp-boot (package -- cgit v1.2.3 From 68bbd213e83ae4167096b0760ef756b941d19a85 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Feb 2020 11:17:18 +0100 Subject: gnu: bootstrap-mes-rewired: Do not import the host's (srfi srfi-26). * gnu/packages/commencement.scm (%bootstrap-mes-rewired): Remove (srfi srfi-26) from #:modules. --- gnu/packages/commencement.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9827b77343..e2dde1b382 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -262,11 +262,12 @@ pure Scheme to Tar and decompression in one easy step.") (build-system trivial-build-system) (arguments `(#:guile ,%bootstrap-guile - #:modules ((guix build utils) - (srfi srfi-26)) + #:modules ((guix build utils)) + #:builder (begin (use-modules (guix build utils) (srfi srfi-26)) + (let* ((mes (assoc-ref %build-inputs "mes")) (gash (assoc-ref %build-inputs "gash")) (mes-bin (string-append mes "/bin")) -- cgit v1.2.3 From 76ad3053aed0f1d04f200d140c42f529dc7af809 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Feb 2020 11:18:03 +0100 Subject: gnu: bootstrap-mes-rewired: Remove unnecessary '@'. * gnu/packages/commencement.scm (%bootstrap-mes-rewired)[native-inputs]: Remove unnecessary use of '@'. --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index e2dde1b382..d06c7055b8 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -254,7 +254,7 @@ pure Scheme to Tar and decompression in one easy step.") (name "bootstrap-mes-rewired") (version "0.19") (source #f) - (native-inputs `(("mes" ,(@ (gnu packages bootstrap) %bootstrap-mes)) + (native-inputs `(("mes" ,%bootstrap-mes) ("gash" ,gash-boot))) (inputs '()) (propagated-inputs '()) -- cgit v1.2.3 From b0966ba20fdb189e50d4cf48834cb1e93591b93f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:25:23 +0100 Subject: gnu: guile-ssh: Update to 0.12.0. * gnu/packages/ssh.scm (guile-ssh): Update to 0.12.0, [source]: remove snippet that were integrated upstream, [arguments]: Add a fix-guile-path phase to fix tests. (guile3.0-ssh)[arguments]: Remove as this is fixed upstream. --- gnu/packages/ssh.scm | 64 ++++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 50 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 2e1ffd76b4..3eda102a56 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits -;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -232,7 +232,7 @@ Additionally, various channel-specific options can be negotiated.") (define-public guile-ssh (package (name "guile-ssh") - (version "0.11.3") + (version "0.12.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -242,31 +242,12 @@ Additionally, various channel-specific options can be negotiated.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03bv3hwp2s8f0bqgfjaan9jx4dyab0abv27n2zn2g0izlidv0vl6")) - (modules '((guix build utils))) - (snippet - '(begin - ;; libssh >= 0.8.0 no longer provides libssh_threads: see - ;; . - (substitute* "libguile-ssh/Makefile.am" - (("-lssh_threads") "")) - - ;; This test would wrongfully pick DSS keys when running on - ;; libssh >= 0.8.0, which fails: - ;; . - (substitute* "tests/server.scm" - (("= %libssh-minor-version 7") - ">= %libssh-minor-version 7")) - - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^GUILE_PKG.*$") - "GUILE_PKG([3.0 2.2 2.0])\n")) - #t)))) + "054hd9rzfhb48gc1hw3rphhp0cnnd4bs5qmidy5ygsyvy9ravlad")) + (modules '((guix build utils))))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - '(;; It makes no sense to build libguile-ssh.a. + `(;; It makes no sense to build libguile-ssh.a. #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases @@ -285,6 +266,15 @@ Additionally, various channel-specific options can be negotiated.") (("\"libguile-ssh\"") (string-append "\"" lib "/libguile-ssh\""))) #t))) + ,@(if (%current-target-system) + '() + '((add-before 'check 'fix-guile-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((guile (assoc-ref inputs "guile"))) + (substitute* "tests/common.scm" + (("/usr/bin/guile") + (string-append guile "/bin/guile"))) + #t))))) (add-after 'install 'remove-bin-directory (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -327,32 +317,6 @@ libssh library.") (package (inherit guile-ssh) (name "guile3.0-ssh") - (arguments - (substitute-keyword-arguments (package-arguments guile-ssh) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'bootstrap 'delete-old-guile-m4 - (lambda _ - ;; The old 'guile.m4' that's shipped would fail to recognize - ;; Guile 2.9 as "3.0". - (delete-file "m4/guile.m4") - #t)) - (add-before 'build 'adjust-for-guile3 - (lambda _ - ;; Adjust for things that are deprecated in 2.2 and removed in - ;; 3.0. - (substitute* "tests/common.scm" - (("define-module \\(tests common\\)") - "define-module (tests common) - #:use-module (ice-9 threads)\n")) - (substitute* "modules/ssh/tunnel.scm" - (("define-module \\(ssh tunnel\\)") - "define-module (ssh tunnel) - #:use-module (ice-9 threads)")) - (substitute* "modules/srfi/srfi-64.upstream.scm" - (("_IOLBF") - "'line")) - #t)))))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -- cgit v1.2.3 From ce59688d33ebddb52cea719efb1d8a51ea13adf0 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:44:16 +0100 Subject: gnu: guile-ssh: Fix cross-compilation. * gnu/packages/ssh.scm (guile-ssh)[native-inputs]: Add guile. --- gnu/packages/ssh.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 3eda102a56..7f56998be2 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -295,7 +295,8 @@ Additionally, various channel-specific options can be negotiated.") ("libtool" ,libtool) ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("which" ,which))) + ("which" ,which) + ("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2) ("libssh" ,libssh) ("libgcrypt" ,libgcrypt))) -- cgit v1.2.3 From 96a9675b55844c8ab3e81ee53ffaad35d289a845 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:47:32 +0100 Subject: gnu: guile-git: Fix cross-compilation. * gnu/packages/guile.scm (guile-git)[native-inputs]: Add guile and guile-bytestructures. --- gnu/packages/guile.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index cb88308278..53d626b9d2 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -647,7 +647,9 @@ type system, elevating types to first-class status.") "0c5i3d16hp7gp9rd78vk9zc45js8bphf92m4lbb5gyi4l1yl7kkm")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("guile" ,guile-2.2) + ("guile-bytestructures" ,guile-bytestructures))) (inputs `(("guile" ,guile-2.2) ("libgit2" ,libgit2))) -- cgit v1.2.3 From bbb219bdfeca80e39fa83813b55340a20849680f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:44:16 +0100 Subject: gnu: guile-ssh: Fix cross-compilation. This is a follow-up of ce59688d33ebddb52cea719efb1d8a51ea13adf0. * gnu/packages/ssh.scm (guile2.0-ssh)[native-inputs]: Replace guile from guile-ssh by guile-2.0, (guile3.0-ssh): replace guile from guile-ssh by guile-next. --- gnu/packages/ssh.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 7f56998be2..2efc6ed7a5 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -296,7 +296,7 @@ Additionally, various channel-specific options can be negotiated.") ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) ("which" ,which) - ("guile" ,guile-2.2))) + ("guile" ,guile-2.2))) ;needed when cross-compiling. (inputs `(("guile" ,guile-2.2) ("libssh" ,libssh) ("libgcrypt" ,libgcrypt))) @@ -311,6 +311,9 @@ libssh library.") (package (inherit guile-ssh) (name "guile2.0-ssh") + (native-inputs + `(("guile" ,guile-2.0) ;needed when cross-compiling. + ,@(alist-delete "guile" (package-native-inputs guile-ssh)))) (inputs `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) @@ -318,6 +321,9 @@ libssh library.") (package (inherit guile-ssh) (name "guile3.0-ssh") + (native-inputs + `(("guile" ,guile-next) ;needed when cross-compiling. + ,@(alist-delete "guile" (package-native-inputs guile-ssh)))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -- cgit v1.2.3 From 0c54440b793e805290a60d6b1b17d4bd2e4f9443 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 18 Feb 2020 11:35:28 +0100 Subject: gnu: commencement: bzip2-boot0: Add diffutils-boot0 dependency. * gnu/packages/commencement.scm (bzip2-boot0): Add diffutils-boot0 dependency; fixes traditional bootstrap mode (non-intel-linux architectures). --- gnu/packages/commencement.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d06c7055b8..0d7611b9fe 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2524,7 +2524,8 @@ exec " gcc "/bin/" program (name "bzip2-boot0") (native-inputs `()) (inputs - `(("make" ,gnu-make-boot0) + `(("diffutils" ,diffutils-boot0) + ("make" ,gnu-make-boot0) ,@(%bootstrap-inputs+toolchain))) (arguments `(#:guile ,%bootstrap-guile -- cgit v1.2.3 From 0a3e8536d983722b464d0b939249d63c409feadb Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 19 Feb 2020 15:33:44 +0100 Subject: gnu: commencement: %boot0-inputs: Soft-code Scheme-only additions. * gnu/packages/commencement.scm (%boot0-inputs)[x86-linux,x86_64-linux]: Include *-boot0 additions for Scheme-only bootstrap. --- gnu/packages/commencement.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 0d7611b9fe..511fdd1b68 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2669,16 +2669,19 @@ exec " gcc "/bin/" program ,@(package-arguments tar))))) (define (%boot0-inputs) - `(("bzip2" ,bzip2-boot0) - ("coreutils" ,coreutils-boot0) + `(,@(match (%current-system) + ((or "i686-linux" "x86_64-linux") + `(("bzip2" ,bzip2-boot0) + ("coreutils" ,coreutils-boot0) + ("gawk" ,gawk-boot0) + ("patch" ,patch-boot0) + ("sed" ,sed-boot0) + ("tar" ,tar-boot0))) + (_ '())) + ("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) ("file" ,file-boot0) - ("gawk" ,gawk-boot0) - ("make" ,gnu-make-boot0) - ("patch" ,patch-boot0) - ("sed" ,sed-boot0) - ("tar" ,tar-boot0) ,@(%bootstrap-inputs+toolchain))) (define* (boot-triplet #:optional (system (%current-system))) -- cgit v1.2.3 From b06199e0e0a8325d9dcad1f1cef740ab6af1a380 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 19 Feb 2020 15:46:44 +0100 Subject: gnu: commencement: diffutils-boot0: Build fix for ARM. * gnu/packages/commencement.scm (diffutils-boot0): Add --disable-dependency-tracking. Fixes arm/aarch64 builds. --- gnu/packages/commencement.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 511fdd1b68..1e873a4fc5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2559,7 +2559,15 @@ exec " gcc "/bin/" program `(#:tests? #f ; the test suite needs diffutils #:guile ,%bootstrap-guile #:implicit-inputs? #f - ,@(package-arguments diffutils))))) + ,@(match (%current-system) + ((or "arm-linux" "aarch64-linux") + (substitute-keyword-arguments (package-arguments diffutils) + ((#:configure-flags flags ''()) + ;; The generated config.status has some problems due to the + ;; bootstrap environment. Disable dependency tracking to work + ;; around it. + `(cons "--disable-dependency-tracking" ,flags)))) + (_ '())))))) (define findutils-boot0 (package -- cgit v1.2.3 From 70a27b445ebc2842c119645bfa721fe310ffcb5f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 19 Feb 2020 16:41:38 +0100 Subject: gnu: commencement: file: Build fix for ARM. * gnu/packages/commencement.scm (file)[arm-linux, aarch64-linux]: Configure with --disable-dependency-tracking. Fixes build on arm/Aarch64. --- gnu/packages/commencement.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1e873a4fc5..45e149ff56 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2595,7 +2595,12 @@ exec " gcc "/bin/" program (package (inherit (@ (gnu packages file) file)) (arguments - `(#:configure-flags '("--disable-bzlib"))))) + `(#:configure-flags + `("--disable-bzlib" + ,,@(match (%current-system) + ((or "arm-linux" "aarch64-linux") + '("--disable-dependency-tracking")) + (_ '()))))))) (define file-boot0 (package -- cgit v1.2.3 From b6aedea9cc1c7eb701eccdb863275bbb01644ace Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 19 Feb 2020 18:52:17 +0100 Subject: gnu: commencement: findutils-boot0: Build fix for ARM. * gnu/packages/commencement.scm (findutils-boot0)[arm-linux, aarch64-linux]: Configure with --disable-dependency-tracking. Fixes build on arm/Aarch64. --- gnu/packages/commencement.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 45e149ff56..e3800d84a5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2584,12 +2584,17 @@ exec " gcc "/bin/" program ;; The build system assumes we have done a mistake when time_t is 32-bit ;; on a 64-bit system. Ignore that for our bootstrap toolchain. - ,@(if (target-64bit?) - (substitute-keyword-arguments (package-arguments findutils) - ((#:configure-flags flags ''()) - `(cons "TIME_T_32_BIT_OK=yes" - ,flags))) - (package-arguments findutils)))))) + ,@(substitute-keyword-arguments (package-arguments findutils) + ((#:configure-flags flags ''()) + `(append + ,(if (target-64bit?) + ''("TIME_T_32_BIT_OK=yes") + ''()) + ,(match (%current-system) + ((or "arm-linux" "aarch64-linux") + ''("--disable-dependency-tracking")) + (_ ''())) + ,flags))))))) (define file (package -- cgit v1.2.3 From 971c8bb0a65a730c566eedacd02b689d79c5d562 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 19 Feb 2020 22:11:47 +0100 Subject: gnu: gnutls: Add dependency on util-linux. * gnu/packages/tls.scm (gnutls)[native-inputs]: Add UTIL-LINUX. --- gnu/packages/tls.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d8a767f73f..ca8838a0d6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -226,7 +226,8 @@ living in the same process.") `(("net-tools" ,net-tools) ("pkg-config" ,pkg-config) ("which" ,which) - ("datefudge" ,datefudge))) ;tests rely on 'datefudge' + ("datefudge" ,datefudge) ;tests rely on 'datefudge' + ("util-linux" ,util-linux))) ;one test needs 'setsid' (inputs `(("guile" ,guile-2.2))) (propagated-inputs -- cgit v1.2.3 From 5f9f034e2fd1694bf92f4c40b405c46b8417e642 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Feb 2020 17:51:57 +0100 Subject: gnu: guile3.0-gnutls: Update to 3.6.12. * gnu/packages/tls.scm (gnutls-3.6.10): Remove variable. (guile3.0-gnutls): Inherit from GNUTLS. [arguments]: Remove. --- gnu/packages/tls.scm | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ca8838a0d6..e498909047 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -266,38 +266,13 @@ required structures.") (inputs `(("unbound" ,unbound) ,@(package-inputs gnutls))))) -(define gnutls-3.6.10 - ;; This is for 'guile3.0-gnutls', below. Version 3.6.10 is the first to - ;; introduce Guile 2.9/3.0 support. - (package - (inherit gnutls) - (version "3.6.10") - (source (origin - (inherit (package-source gnutls)) - (uri (string-append "mirror://gnupg/gnutls/v" - (version-major+minor version) - "/gnutls-" version ".tar.xz")) - (sha256 - (base32 - "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))))) - (define-public guile3.0-gnutls (package - (inherit gnutls-3.6.10) + (inherit gnutls) (name "guile3.0-gnutls") - (arguments - (substitute-keyword-arguments (package-arguments gnutls-3.6.10) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-before 'build 'leave-guile-stdout-open - (lambda _ - ;; Work around . - (substitute* "guile/Makefile" - (("out=-") "out=/dev/null")) - #t)))))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" - (package-inputs gnutls-3.6.10)))))) + (package-inputs gnutls)))))) (define-public openssl (package -- cgit v1.2.3 From 9d14a67d4bd47559c8a63fc7a35af606f821cfff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 20 Feb 2020 21:24:38 +0200 Subject: gnu: guile3.0-gcrypt: Fix compilation. * gnu/packages/gnupg.scm (guile3.0-gcrypt)[native-inputs]: Replace guile with guile-next. --- gnu/packages/gnupg.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 890dd3299b..b957eb66b2 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 ng0 @@ -515,6 +515,9 @@ interface (FFI) of Guile.") (package (inherit guile-gcrypt) (name "guile3.0-gcrypt") + (native-inputs + `(("guile" ,guile-next) + ,@(alist-delete "guile" (package-native-inputs guile-gcrypt)))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) -- cgit v1.2.3 From c7d9abf830c16a00bcec76cdac603f956ecfc9dd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 20 Feb 2020 21:34:49 +0200 Subject: gnu: guile2.0-gcrypt: Don't use guile-2.2. * gnu/packages/gnupg.scm (guile2.0-gcrypt)[native-inputs]: Replace guile with guile-2.0. --- gnu/packages/gnupg.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index b957eb66b2..f4478411e3 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -507,6 +507,9 @@ interface (FFI) of Guile.") (define-public guile2.0-gcrypt (package (inherit guile-gcrypt) (name "guile2.0-gcrypt") + (native-inputs + `(("guile" ,guile-2.0) + ,@(alist-delete "guile" (package-native-inputs guile-gcrypt)))) (inputs `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) -- cgit v1.2.3 From a82cf70e8ae4c8dcf03d2633f09dcfc8bb6d6d1e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 21 Feb 2020 07:46:16 +0100 Subject: gnu: commencement: bootar: Build fix for i686-linux. Fixes . * gnu/packages/commencement.scm (bootar)[i686-linux]: Stub bzip2. --- gnu/packages/commencement.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index e3800d84a5..dc5d9a1bcf 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -111,6 +111,16 @@ (guile (string-append guile-dir "/bin/guile"))) (invoke guile "--no-auto-compile" source) (chdir "bootar") + ;; (commencement bzip2) breaks tar on x86, see + ;; https://bugs.gnu.org/39699 + (delete-file "scripts/bzip2.in") + (delete-file "compression/bzip2.scm") + (with-output-to-file "compression/bzip2.scm" + (lambda _ + (display "(define-module (compression bzip2)) +(define-public is-bzip2-file? (const #f)) +(define-public make-bzip2-input-port (const #f)) +"))) #t))) (replace 'configure (bootstrap-configure ,version "." "scripts")) (replace 'build (bootstrap-build ".")) -- cgit v1.2.3 From 4b807ef87c4634e8bea1431d47ee3df3b519145d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 21 Feb 2020 23:48:37 -0500 Subject: gnu: bootar: Update to 1a. * gnu/packages/commencement.scm (bootar): Update to 1a; remove BZip2 workaround for 32-bit platforms. --- gnu/packages/commencement.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index dc5d9a1bcf..dfc913e537 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -86,13 +86,13 @@ (define bootar (package (name "bootar") - (version "1") + (version "1a") (source (origin (method url-fetch) - (uri "https://files.ngyro.com/bootar/bootar-1.ses") + (uri "https://files.ngyro.com/bootar/bootar-1a.ses") (sha256 (base32 - "011p0nky2qp0vmyhvdx220qywxxp7a0m6pvy0lzzg4qxbpyqpf0r")))) + "0mvp6vgx0q316fvy3z2lddlc5xgq5np3bm1fypgvj6dnayibg9np")))) (build-system gnu-build-system) (arguments `(#:implicit-inputs? #f @@ -111,16 +111,6 @@ (guile (string-append guile-dir "/bin/guile"))) (invoke guile "--no-auto-compile" source) (chdir "bootar") - ;; (commencement bzip2) breaks tar on x86, see - ;; https://bugs.gnu.org/39699 - (delete-file "scripts/bzip2.in") - (delete-file "compression/bzip2.scm") - (with-output-to-file "compression/bzip2.scm" - (lambda _ - (display "(define-module (compression bzip2)) -(define-public is-bzip2-file? (const #f)) -(define-public make-bzip2-input-port (const #f)) -"))) #t))) (replace 'configure (bootstrap-configure ,version "." "scripts")) (replace 'build (bootstrap-build ".")) -- cgit v1.2.3 From 5afcb5caa53615c0a432e0c1781155398d747218 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 22 Feb 2020 21:39:27 +0100 Subject: gnu: bootar: Add ftp.gnu.org URL. * gnu/packages/commencement.scm (bootar)[source]: Add "mirror://gnu" URL. --- gnu/packages/commencement.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index dfc913e537..c9be884d6e 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -89,7 +89,11 @@ (version "1a") (source (origin (method url-fetch) - (uri "https://files.ngyro.com/bootar/bootar-1a.ses") + (uri (list (string-append + "mirror://gnu/guix/mirror/bootar-" version ".ses") + (string-append + "https://files.ngyro.com/bootar/bootar-" + version ".ses"))) (sha256 (base32 "0mvp6vgx0q316fvy3z2lddlc5xgq5np3bm1fypgvj6dnayibg9np")))) -- cgit v1.2.3 From 668a519870237d3472e5724089d570458874e5b5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 24 Feb 2020 15:42:05 +0100 Subject: ci: Don't cross build bootstrap tarballs to MinGW. This makes little sense and it broke in commit 8bd2b15b06f6306e37cc72995b76a7f0754cf1a6 since the mingw libc doesn't have a "static" output. * gnu/ci.scm (%packages-to-cross-build): Remove. (packages-to-cross-build): New procedure. (hydra-jobs)[cross-jobs]: Use it. --- gnu/ci.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index 89f499e25f..33c2e84b27 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -121,8 +121,12 @@ SYSTEM." %guile-bootstrap-tarball %bootstrap-tarballs)) -(define %packages-to-cross-build - %core-packages) +(define (packages-to-cross-build target) + "Return the list of packages to cross-build for TARGET." + ;; Don't cross-build the bootstrap tarballs for MinGW. + (if (string-contains target "mingw") + (drop-right %core-packages 6) + %core-packages)) (define %cross-targets '("mips64el-linux-gnu" @@ -455,7 +459,7 @@ Return #f if no such checkout is found." (map (lambda (package) (package-cross-job store (job-name package) package target system)) - %packages-to-cross-build)) + (packages-to-cross-build target))) (remove (either from-32-to-64? same? pointless?) %cross-targets))) -- cgit v1.2.3 From 0b870f7915f5da43758753fd088a22033936dc50 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 2 Mar 2020 17:24:41 -0500 Subject: gnu: commencement: Fix gash and gash-utils version references. * gnu/packages/commencement.scm (gash-boot): When configuring, use the version of the Gash package instead the version of Guile! (gash-utils-boot): Likewise, but for Gash-Utils. --- gnu/packages/commencement.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c9be884d6e..cebb4b5a68 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -152,7 +152,7 @@ pure Scheme to Tar and decompression in one easy step.") (use-modules (guix build gnu-bootstrap)) (modify-phases %standard-phases (replace 'configure - (bootstrap-configure ,(version) "gash" "scripts")) + (bootstrap-configure ,(package-version gash) "gash" "scripts")) (replace 'build (bootstrap-build "gash")) (replace 'install (bootstrap-install "gash" "scripts")) (add-after 'install 'install-symlinks @@ -214,7 +214,8 @@ pure Scheme to Tar and decompression in one easy step.") (delete-file "scripts/template.in") #t)) (replace 'configure - (bootstrap-configure ,(version) "gash" "scripts")) + (bootstrap-configure ,(package-version gash-utils) + "gash" "scripts")) (replace 'build (bootstrap-build "gash")) (replace 'install (bootstrap-install "gash" "scripts")) ;; XXX: The scripts should add Gash to their load paths and -- cgit v1.2.3 From e6bd8b5e1def33beac3b6b4eb2f1f525f87ad0ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 17:19:54 +0100 Subject: gnu: zziplib: Incorporate grafted changes. * gnu/packages/compression.scm (zziplib)[replacement]: Remove. [source](patches): New field. (zziplib/fixed): Remove variable. --- gnu/packages/compression.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 1f76f9ac1e..b2edca4cd4 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1580,13 +1580,13 @@ recreates the stored directory structure by default.") (package (name "zziplib") (version "0.13.69") - (replacement zziplib/fixed) (home-page "https://github.com/gdraheim/zziplib") (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "zziplib-CVE-2018-16548.patch")) (sha256 (base32 "0fbk9k7ryas2wh2ykwkvm1pbi40i88rfvc3dydh9xyd7w2jcki92")))) @@ -1618,13 +1618,6 @@ recreates the stored directory structure by default.") ;; files carry the Zlib license; see "docs/copying.html" for details. (license (list license:lgpl2.0+ license:mpl1.1)))) -(define zziplib/fixed - (package - (inherit zziplib) - (source (origin - (inherit (package-source zziplib)) - (patches (search-patches "zziplib-CVE-2018-16548.patch")))))) - (define-public libzip (package (name "libzip") -- cgit v1.2.3 From c1cc52a2fe1f43c66204d5225a5c5792e2c68068 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 17:20:59 +0100 Subject: gnu: librsvg: Incorporate grafted changes. * gnu/packages/gnome.scm (librsvg): Update to 2.40.21. [replacement]: Remove. (librsvg/fixed): Remove variable. --- gnu/packages/gnome.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c77a17cff5..ff077904fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2057,9 +2057,8 @@ dealing with different structured file formats.") (define-public librsvg (package - (replacement librsvg/fixed) (name "librsvg") - (version "2.40.20") + (version "2.40.21") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2067,7 +2066,7 @@ dealing with different structured file formats.") name "-" version ".tar.xz")) (sha256 (base32 - "0ay9himvw1l1swcf3h1312d2iqzfl65kpbfgiyfykgvq7cydvx6g")))) + "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -2124,20 +2123,6 @@ dealing with different structured file formats.") library.") (license license:lgpl2.0+))) -(define librsvg/fixed - (package - (inherit librsvg) - (name "librsvg") - (version "2.40.21") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp")))))) - (define* (computed-origin-method gexp-promise hash-algo hash #:optional (name "source") #:key (system (%current-system)) -- cgit v1.2.3 From 08cf730a7ee1b4943f1c1b6a42a6ee9d08ee41c1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 3 Mar 2020 12:45:33 +0100 Subject: gnu: qemu-minimal: Fix build. This fixes . * gnu/packages/virtualization.scm (qemu-minimal)[arguments]: Add a remove-glibc phase to remove glibc from C_INCLUDE_PATH. --- gnu/packages/virtualization.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 256cfa87d2..225b5ddec9 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -128,7 +129,7 @@ "1w38hzlw7xp05gcq1nhga7hxvndxy6dfcnzi7q2il8ff110isj6k")))) (build-system gnu-build-system) (arguments - '(;; Running tests in parallel can occasionally lead to failures, like: + `(;; Running tests in parallel can occasionally lead to failures, like: ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead) #:parallel-tests? #f #:configure-flags (list "--enable-usb-redir" "--enable-opengl" @@ -139,8 +140,28 @@ "--audio-drv-list=alsa,pa,sdl") ;; Make build and test output verbose to facilitate investigation upon failure. #:make-flags '("V=1") + #:modules ((srfi srfi-1) + (ice-9 match) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases + (add-after 'set-paths 'hide-glibc + (lambda* (#:key inputs #:allow-other-keys) + ;; Work around https://issues.guix.info/issue/36882. We need to + ;; remove glibc from C_INCLUDE_PATH so that the one hardcoded in GCC, + ;; at the bottom of GCC include search-path is used. + (let* ((filters '("libc")) + (input-directories + (filter-map (lambda (input) + (match input + ((name . dir) + (and (not (member name filters)) + dir)))) + inputs))) + (set-path-environment-variable "C_INCLUDE_PATH" + '("include") + input-directories) + #t))) (replace 'configure (lambda* (#:key inputs outputs (configure-flags '()) #:allow-other-keys) -- cgit v1.2.3 From 3fd9c90c4ae79ff1e9a0dbe840c3ff10d099d7ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 17:22:17 +0100 Subject: gnu: clang-runtime: Adjust for CPLUS_INCLUDE_PATH changes. * gnu/packages/llvm.scm (clang-runtime-from-llvm)[arguments]: Add #:modules and #:phases. --- gnu/packages/llvm.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index bf32322df5..659631e263 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -164,7 +164,28 @@ of programming tools as well as libraries with equivalent functionality.") (arguments `(;; Don't use '-g' during the build to save space. #:build-type "Release" - #:tests? #f)) ; Tests require gtest + #:tests? #f ; Tests require gtest + #:modules ((srfi srfi-1) + (ice-9 match) + ,@%cmake-build-system-modules) + #:phases (modify-phases (@ (guix build cmake-build-system) %standard-phases) + (add-after 'set-paths 'hide-glibc + ;; Work around https://issues.guix.info/issue/36882. We need to + ;; remove glibc from CPLUS_INCLUDE_PATH so that the one hardcoded + ;; in GCC, at the bottom of GCC include search-path is used. + (lambda* (#:key inputs #:allow-other-keys) + (let* ((filters '("libc")) + (input-directories + (filter-map (lambda (input) + (match input + ((name . dir) + (and (not (member name filters)) + dir)))) + inputs))) + (set-path-environment-variable "CPLUS_INCLUDE_PATH" + '("include") + input-directories) + #t)))))) (home-page "https://compiler-rt.llvm.org") (synopsis "Runtime library for Clang/LLVM") (description -- cgit v1.2.3 From af88972bb8e3e69d9c5ea5a8a81f7f234c971133 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 17:27:20 +0100 Subject: gnu: clang-runtime: Fix build with glibc 2.31. * gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch, gnu/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch, gnu/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/llvm.scm (clang-runtime, clang-runtime-8, clang-runtime-7, clang-runtime-6, clang-runtime-3.9.1, clang-runtime-3.8, clang-runtime-3.7): Add the respective patches. --- gnu/local.mk | 3 ++ gnu/packages/llvm.scm | 19 ++++--- ...clang-runtime-3.8-libsanitizer-mode-field.patch | 50 ++++++++++++++++++ ...clang-runtime-3.9-libsanitizer-mode-field.patch | 50 ++++++++++++++++++ .../clang-runtime-9-libsanitizer-mode-field.patch | 60 ++++++++++++++++++++++ 5 files changed, 176 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch create mode 100644 gnu/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch create mode 100644 gnu/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9b46ac5629..463d67107d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -783,6 +783,9 @@ dist_patch_DATA = \ %D%/packages/patches/clang-9.0-libc-search-path.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ + %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ + %D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \ + %D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \ %D%/packages/patches/classpath-aarch64-support.patch \ %D%/packages/patches/clementine-fix-sqlite.patch \ %D%/packages/patches/clementine-remove-crypto++-dependency.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 659631e263..1286fe521b 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -404,7 +404,8 @@ output), and Binutils.") (define-public clang-runtime (clang-runtime-from-llvm llvm - "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2")) + "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2" + '("clang-runtime-9-libsanitizer-mode-field.patch"))) (define-public clang (clang-from-llvm llvm clang-runtime @@ -434,7 +435,8 @@ output), and Binutils.") (define-public clang-runtime-8 (clang-runtime-from-llvm llvm-8 - "1c919wsm17xnv7lr8bhpq2wkq8113lzlw6hzhfr737j59x3wfddl")) + "1c919wsm17xnv7lr8bhpq2wkq8113lzlw6hzhfr737j59x3wfddl" + '("clang-runtime-9-libsanitizer-mode-field.patch"))) (define-public clang-8 (clang-from-llvm llvm-8 clang-runtime-8 @@ -458,7 +460,8 @@ output), and Binutils.") (define-public clang-runtime-7 (clang-runtime-from-llvm llvm-7 - "065ybd8fsc4h2hikbdyricj6pyv4r7r7kpcikhb2y5zf370xybkq")) + "065ybd8fsc4h2hikbdyricj6pyv4r7r7kpcikhb2y5zf370xybkq" + '("clang-runtime-9-libsanitizer-mode-field.patch"))) (define-public clang-7 (clang-from-llvm llvm-7 clang-runtime-7 @@ -482,7 +485,8 @@ output), and Binutils.") (define-public clang-runtime-6 (clang-runtime-from-llvm llvm-6 - "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl")) + "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl" + '("clang-runtime-9-libsanitizer-mode-field.patch"))) (define-public clang-6 (clang-from-llvm llvm-6 clang-runtime-6 @@ -514,7 +518,8 @@ output), and Binutils.") (clang-runtime-from-llvm llvm-3.9.1 "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk" - '("clang-runtime-asan-build-fixes.patch" + '("clang-runtime-3.9-libsanitizer-mode-field.patch" + "clang-runtime-asan-build-fixes.patch" "clang-runtime-esan-build-fixes.patch" "clang-3.5-libsanitizer-ustat-fix.patch"))) @@ -540,6 +545,7 @@ output), and Binutils.") llvm-3.8 "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d" '("clang-runtime-asan-build-fixes.patch" + "clang-runtime-3.8-libsanitizer-mode-field.patch" "clang-3.5-libsanitizer-ustat-fix.patch"))) (define-public clang-3.8 @@ -563,6 +569,7 @@ output), and Binutils.") llvm-3.7 "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx" '("clang-runtime-asan-build-fixes.patch" + "clang-runtime-3.8-libsanitizer-mode-field.patch" "clang-3.5-libsanitizer-ustat-fix.patch"))) (define-public clang-3.7 @@ -585,7 +592,7 @@ output), and Binutils.") (clang-runtime-from-llvm llvm-3.6 "11qx8d3pbfqjaj2x207pvlvzihbs1z2xbw4crpz7aid6h1yz6bqg" - '("clang-runtime-asan-build-fixes.patch"))) + '("clang-runtime-asan-build-fixes.patch"))) (define-public clang-3.6 (clang-from-llvm llvm-3.6 clang-runtime-3.6 diff --git a/gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch b/gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch new file mode 100644 index 0000000000..f4bca3ecb1 --- /dev/null +++ b/gnu/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch @@ -0,0 +1,50 @@ +Adjust libsanitizer to ABI change in glibc 2.31. + +Adapted to 3.x from this upstream commit: +https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce + +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1130,8 +1130,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(x, y) 0 + #endif +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -188,17 +188,16 @@ namespace __sanitizer { + unsigned __seq; + u64 __unused1; + u64 __unused2; +-#elif defined(__mips__) || defined(__aarch64__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; ++#elif defined(__sparc__) ++ unsigned mode; ++ unsigned short __pad2; ++ unsigned short __seq; ++ unsigned long long __unused1; ++ unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; +- unsigned short __seq; +- unsigned short __pad2; ++ unsigned int mode; ++ unsigned short __seq; ++ unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) + u64 __unused1; + u64 __unused2; diff --git a/gnu/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch b/gnu/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch new file mode 100644 index 0000000000..2598a1bdeb --- /dev/null +++ b/gnu/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch @@ -0,0 +1,50 @@ +Adjust libsanitizer to ABI change in glibc 2.31. + +Adapted to 3.x from this upstream commit: +https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce + +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1139,8 +1139,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -194,17 +194,16 @@ namespace __sanitizer { + unsigned __seq; + u64 __unused1; + u64 __unused2; +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; ++#elif defined(__sparc__) ++ unsigned mode; ++ unsigned short __pad2; ++ unsigned short __seq; ++ unsigned long long __unused1; ++ unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; +- unsigned short __seq; +- unsigned short __pad2; ++ unsigned int mode; ++ unsigned short __seq; ++ unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) + u64 __unused1; + u64 __unused2; diff --git a/gnu/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch b/gnu/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch new file mode 100644 index 0000000000..ebb080ed9d --- /dev/null +++ b/gnu/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch @@ -0,0 +1,60 @@ +Adjust libsanitizer to ABI change in glibc 2.31. + +Taken from this upstream commit: +https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce + +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1126,8 +1126,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -203,28 +203,15 @@ namespace __sanitizer { + u64 __unused1; + u64 __unused2; + #elif defined(__sparc__) +-#if defined(__arch64__) +- unsigned mode; +- unsigned short __pad1; +-#else +- unsigned short __pad1; +- unsigned short mode; +- unsigned short __pad2; +-#endif +- unsigned short __seq; +- unsigned long long __unused1; +- unsigned long long __unused2; +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; ++ unsigned mode; ++ unsigned short __pad2; ++ unsigned short __seq; ++ unsigned long long __unused1; ++ unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; +- unsigned short __seq; +- unsigned short __pad2; ++ unsigned int mode; ++ unsigned short __seq; ++ unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) + u64 __unused1; + u64 __unused2; -- cgit v1.2.3 From 53453242b7479b0d26939ac5c383b58a7d51f85d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 18:10:09 +0100 Subject: gnu: Python: Update to 3.8.2. * gnu/packages/python.scm (python-3.8): Update to 3.8.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 96caaae0b3..8e28265fbe 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -347,7 +347,7 @@ data types.") (define-public python-3.8 (package (inherit python-2) (name "python") - (version "3.8.1") + (version "3.8.2") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -359,7 +359,7 @@ data types.") "python-3-search-paths.patch")) (sha256 (base32 - "1s4lwn5vzsajlc88m6hkghsvnjw4d00l2dsgng0m2w6vyqbl32bm")) + "1ps5v323cp5czfshqjmbsqw7nvrdpcbk06f62jbzaqik4gfffii6")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From aec34459a32c4dddcbbb6f2612d134811f50577d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Feb 2020 17:04:41 +0100 Subject: gnu: glib: Update to 2.62.5. * gnu/packages/glib.scm (glib): Update to 2.62.5. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b430a4fa36..0e05987bd8 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -165,7 +165,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.62.4") + (version "2.62.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -173,7 +173,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1g2vj9lyh032kcwij7avx5d6a99rcsnkd07sbl9i55zsfw6h712c")) + "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq")) (patches (search-patches "glib-tests-timer.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 275f874958ddbbb68ddce93be2cb65bec7ac1bd4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Feb 2020 19:28:53 +0100 Subject: gnu: meson: Update to 0.53.2. * gnu/packages/build-tools.scm (meson): Update to 0.53.2. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 7fbd1c472d..e8f5be8f05 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -168,7 +168,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.53.1") + (version "0.53.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -176,7 +176,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "011v84ijdnmbdgpzslaa6qiq7p2jh52sqzb0q6iaq6vhx8za66zc")))) + "07y2hh9dfn1m9g4bsy49nbn3vdmd0b2iwr8bxg19fhqq6c7q73ry")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From 713c1dd0d5ba24aa426deb65f70dbbbb168e0a13 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 11:46:21 +0100 Subject: gnu: fribidi: Update to 1.0.9. * gnu/packages/fribidi.scm (fribidi): Update to 1.0.9. [source](uri): Adjust tarball name. --- gnu/packages/fribidi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index 8fa0e6d980..3eff6b1697 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -28,16 +28,16 @@ (define-public fribidi (package (name "fribidi") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/fribidi/fribidi/releases" "/download/v" version "/fribidi-" version - ".tar.bz2")) + ".tar.xz")) (sha256 - (base32 "0v0ybhck9vz4yayihydknmikslh3xfxygzywnh9rcamdhs6vdiwl")))) + (base32 "1iz06r6ha2nrgbzbn4141r58a60a9s5qiaadjjhhvdkg0alpxr65")))) (build-system gnu-build-system) (synopsis "Implementation of the Unicode bidirectional algorithm") (description -- cgit v1.2.3 From 9694101666118903182eefa44a53a0ca86d5a558 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 11:46:40 +0100 Subject: gnu: cURL: Update to 7.69.0. * gnu/packages/curl.scm (curl): Update to 7.69.0. --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 2c0390a3ef..70d7c4901c 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,14 +51,14 @@ (define-public curl (package (name "curl") - (version "7.68.0") + (version "7.69.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "0nh3j90w6b97wqcgxjfq55qhkz9s38955fbhwzv2fsi7483j895p")) + "07r7wcamwa0lb3wdlzfac5q2rg6ip5ddv3d211w7a9y1hbqg5bcz")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) (build-system gnu-build-system) (outputs '("out" -- cgit v1.2.3 From df5a2e4f83a59cbc14f522846d1536b890356b41 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 11:47:00 +0100 Subject: gnu: OpenBLAS: Update to 0.3.9. * gnu/packages/maths.scm (openblas): Update to 0.3.9. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0d11f4695e..fcba04956e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3151,7 +3151,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.8") + (version "0.3.9") (source (origin (method url-fetch) @@ -3160,7 +3160,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0f7n911vlriphlr4dgfdxk2x4lmjpf8kcl8w9lb584w2nwfkbdk9")))) + "14iz9xnrb9xiwgj84j94mc74gg0zn2vsy9fmsijxxma1n7dck4w3")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From a7924ba9f708cbdcb2db552b2c492ea4ee778dc0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 11:47:20 +0100 Subject: gnu: Poppler: Update to 0.86.1. * gnu/packages/pdf.scm (poppler): Update to 0.86.1. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 891367b1c2..c5001ff086 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -96,14 +96,14 @@ (define-public poppler (package (name "poppler") - (version "0.85.0") + (version "0.86.1") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "0jyr036scdly13hx5dxmsqp2p3jifc29h2by51msw0ih6bmpbj1b")))) + "0v3z4mk1rr8i0c4cfkab7pnxdbil30j4cm4w6cqlq6cfghkhlqxg")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From 44a33ee90dbd97abf388fc45a7f4cd41cbc8171f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 11:52:29 +0100 Subject: gnu: texlive-bin: Fix build with Poppler 0.86. * gnu/packages/patches/texlive-bin-poppler-0.86.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/tex.scm (texlive-bin)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/patches/texlive-bin-poppler-0.86.patch | 17 +++++++++++++++++ gnu/packages/tex.scm | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/texlive-bin-poppler-0.86.patch diff --git a/gnu/local.mk b/gnu/local.mk index 463d67107d..e452cd8895 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1438,6 +1438,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ %D%/packages/patches/texlive-bin-poppler-0.83.patch \ + %D%/packages/patches/texlive-bin-poppler-0.86.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/telepathy-glib-channel-memory-leak.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ diff --git a/gnu/packages/patches/texlive-bin-poppler-0.86.patch b/gnu/packages/patches/texlive-bin-poppler-0.86.patch new file mode 100644 index 0000000000..b1adca657b --- /dev/null +++ b/gnu/packages/patches/texlive-bin-poppler-0.86.patch @@ -0,0 +1,17 @@ +Fix build with Poppler 0.86 and later. + +Taken from Arch Linux, but adjusted to patch the versioned Poppler +files, as upstream applies it after copying them in place. +https://git.archlinux.org/svntogit/packages.git/tree/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin + +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc 2020-03-03 21:11:35.102711802 +0000 ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc 2020-03-03 21:13:13.057420111 +0000 +@@ -757,7 +757,7 @@ + if (page_name) { + // get page by name + GString name(page_name); +- LinkDest *link = pdf_doc->doc->findDest(&name); ++ LinkDest *link = pdf_doc->doc->findDest(&name).get(); + if (link == 0 || !link->isOk()) + pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); + Ref ref = link->getPageRef(); diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d95434aa8f..dd90ab2b72 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -255,7 +255,8 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. "03vc88dz37mjjyaspzv0fik2fp5gp8qv82114869akd1dhszbaax") (search-patch "texlive-bin-poppler-0.83.patch") (arch-patch "texlive-poppler-0.84.patch" arch-revision - "1ia6cr99krk4ipx4hdi2qdb98bh2h26mckjlpxdzrjnfhlnghksa")))) + "1ia6cr99krk4ipx4hdi2qdb98bh2h26mckjlpxdzrjnfhlnghksa") + (search-patch "texlive-bin-poppler-0.86.patch")))) (modules '((guix build utils) (ice-9 ftw))) (snippet -- cgit v1.2.3 From d7ca0f73ff6db21ec254c7a229feb3467103154f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 17:47:41 +0100 Subject: gnu: coreutils: Update to 8.32. * gnu/packages/base.scm (coreutils): Update to 8.32. [arguments]: Remove obsolete phase. --- gnu/packages/base.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 13bcf7fe9d..1989bdd7eb 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -290,14 +290,14 @@ used to apply commands with arbitrarily long arguments.") (define-public coreutils (package (name "coreutils") - (version "8.31") + (version "8.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/coreutils/coreutils-" version ".tar.xz")) (sha256 (base32 - "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz")))) + "1yjcrh5hw70c0yn8zw55pd6j51dj90anpq8mmg649ps9g3gdhn24")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp) ;bignums in 'expr', yay! @@ -329,16 +329,6 @@ used to apply commands with arbitrarily long arguments.") (("/bin/sh") (which "sh"))) (substitute* (find-files "tests" "\\.sh$") (("#!/bin/sh") (string-append "#!" (which "sh")))) - #t)) - (add-before 'check 'disable-broken-test - (lambda _ - ;; This test hits the 127 character shebang limit in the build - ;; environment due to the way "env -S" splits arguments into - ;; shebangs. Note that "env-S-script.sh" works around this - ;; specific issue, but "env-S.pl" is not adjusted for build - ;; environments with long prefixes (/tmp/guix-build-...). - (substitute* "Makefile" - (("^.*tests/misc/env-S.pl.*$") "")) #t))))) (synopsis "Core GNU utilities (file, text, shell)") (description -- cgit v1.2.3 From 8e98f750e63e8723db0361f4e3e960193278fa47 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 18:08:50 +0100 Subject: gnu: bzip2: Do not retain a reference to the bootstrap bzip. * gnu/packages/compression.scm (bzip2)[arguments]: Add phase 'hide-input-bzip2'. --- gnu/packages/compression.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index b2edca4cd4..9ccb34ad4b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2019 Kei Kebreau -;;; Copyright © 2016, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Theodoros Foradis @@ -275,6 +275,22 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (srfi srfi-1)) #:phases (modify-phases %standard-phases + (add-after 'set-paths 'hide-input-bzip2 + (lambda* (#:key inputs #:allow-other-keys) + (let ((bzip2 (assoc-ref inputs "bzip2"))) + (if bzip2 + ;; Prevent the build system from retaining a reference to + ;; BZIP2 from INPUTS. + (begin + (setenv "LIBRARY_PATH" + (string-join (delete (string-append bzip2 "/lib") + (string-split (getenv "LIBRARY_PATH") + #\:)) + ":")) + (format #t "environment variable `LIBRARY_PATH' set to `~a'~%" + (getenv "LIBRARY_PATH"))) + (format #t "no bzip2 found, nothing done~%")) + #t))) (replace 'configure (lambda* (#:key target #:allow-other-keys) (when ,(%current-target-system) -- cgit v1.2.3 From 4a50e983bade29792076975092fec60df5cca59d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 18:09:13 +0100 Subject: gnu: ed: Update to 1.16. * gnu/packages/ed.scm (ed): Update to 1.16. --- gnu/packages/ed.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm index c2198763ef..da4c3ddf04 100644 --- a/gnu/packages/ed.scm +++ b/gnu/packages/ed.scm @@ -28,14 +28,14 @@ (define-public ed (package (name "ed") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ed/ed-" version ".tar.lz")) (sha256 (base32 - "0x6ivy5k0d7dy5z9g8q8nipr89m4qbk2ink2898qq43smp08ji5d")))) + "0b4b1lwizvng9bvpcjnmpj2i80xz9xw2w8nfff27b2h4mca7mh6g")))) (build-system gnu-build-system) (native-inputs `(("lzip" ,lzip))) (arguments -- cgit v1.2.3 From feb8c5dac30294d72205ee21b3afcf1cf7a04675 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 18:09:29 +0100 Subject: gnu: ld-wrapper: Add support for quoted arguments in response files. * gnu/packages/ld-wrapper.in (expand-arguments): Add TOKENIZE procedure, and use that to parse the response file. --- gnu/packages/ld-wrapper.in | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ld-wrapper.in b/gnu/packages/ld-wrapper.in index 16780c58f6..2b68b87fb9 100644 --- a/gnu/packages/ld-wrapper.in +++ b/gnu/packages/ld-wrapper.in @@ -16,6 +16,7 @@ exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line)) !# ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +36,7 @@ exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line)) (define-module (gnu build-support ld-wrapper) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:autoload (ice-9 rdelim) (read-string) + #:autoload (ice-9 rdelim) (read-delimited) #:export (ld-wrapper)) ;;; Commentary: @@ -239,13 +240,27 @@ library outside of ~a: ~s~%" ;; Expand ARGS such that "response file" arguments, such as "@args.txt", are ;; expanded (info "(gcc) Overall Options"). (define (response-file-arguments file) + (define (tokenize port) + ;; Return a list of all strings found in PORT. Quote characters are + ;; removed, but whitespaces within quoted strings are preserved. + (let loop ((tokens '())) + (let* ((token+delimiter (read-delimited " '\"\n" port 'split)) + (token (car token+delimiter)) + (delim (cdr token+delimiter))) + (if (eof-object? token) + (reverse tokens) + (case delim + ((#\") (loop (cons (read-delimited "\"" port) tokens))) + ((#\') (loop (cons (read-delimited "'" port) tokens))) + (else (if (> (string-length token) 0) + (loop (cons token tokens)) + (loop tokens)))))))) + (when %debug? (format (current-error-port) "ld-wrapper: attempting to read arguments from '~a'~%" file)) - ;; FIXME: Options can contain whitespace if they are protected by single - ;; or double quotes; this is not implemented here. - (string-tokenize (call-with-input-file file read-string))) + (call-with-input-file file tokenize)) (define result (fold-right (lambda (arg result) -- cgit v1.2.3 From a343d6bab710eefaa714251a81c9a42002302967 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 18:16:43 +0100 Subject: gnu: Remove ld-wrapper-next. * gnu/packages/ld-wrapper-next.in: Delete file. * gnu/local.mk (MISC_DISTRO_FILES): Adjust accordingly. * gnu/packages/chromium.scm (ld-wrapper-next): Remove variable. (ungoogled-chromium)[native-inputs]: Remove LD-WRAPPER-NEXT. --- gnu/local.mk | 3 +- gnu/packages/chromium.scm | 13 -- gnu/packages/ld-wrapper-next.in | 305 ---------------------------------------- 3 files changed, 1 insertion(+), 320 deletions(-) delete mode 100644 gnu/packages/ld-wrapper-next.in diff --git a/gnu/local.mk b/gnu/local.mk index e452cd8895..0fe2c90781 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1522,5 +1522,4 @@ dist_patch_DATA = \ %D%/packages/patches/zziplib-CVE-2018-16548.patch MISC_DISTRO_FILES = \ - %D%/packages/ld-wrapper.in \ - %D%/packages/ld-wrapper-next.in + %D%/packages/ld-wrapper.in diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 0b3d19a428..275eb0588b 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -427,18 +427,6 @@ from forcing GEXP-PROMISE." `(cons "--enable-custom-modes" ,flags)))))) -;; Add a custom ld wrapper that supports quoted strings in response files. -;; To be merged with 'ld-wrapper' in a future rebuild cycle. -(define-public ld-wrapper-next - (let ((orig (car (assoc-ref (%final-inputs) "ld-wrapper")))) - (package - (inherit orig) - (name "ld-wrapper-next") - (inputs - `(("wrapper" ,(search-path %load-path - "gnu/packages/ld-wrapper-next.in")) - ,@(alist-delete "wrapper" (package-inputs orig))))))) - (define-public ungoogled-chromium (package (name "ungoogled-chromium") @@ -766,7 +754,6 @@ from forcing GEXP-PROMISE." ("clang" ,clang-9) ("gn" ,gn) ("gperf" ,gperf) - ("ld-wrapper" ,ld-wrapper-next) ("ninja" ,ninja) ("node" ,node) ("pkg-config" ,pkg-config) diff --git a/gnu/packages/ld-wrapper-next.in b/gnu/packages/ld-wrapper-next.in deleted file mode 100644 index 5d5756f6a3..0000000000 --- a/gnu/packages/ld-wrapper-next.in +++ /dev/null @@ -1,305 +0,0 @@ -#!@BASH@ -# -*- mode: scheme; coding: utf-8; -*- - -# XXX: We have to go through Bash because there's no command-line switch to -# augment %load-compiled-path, and because of the silly 127-byte limit for -# the shebang line in Linux. -# Use `load-compiled' because `load' (and `-l') doesn't otherwise load our -# .go file (see ). -# Unset 'GUILE_LOAD_COMPILED_PATH' to make sure we do not stumble upon -# incompatible .go files. See -# . - -unset GUILE_LOAD_COMPILED_PATH -main="(@ (gnu build-support ld-wrapper) ld-wrapper)" -exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line)))" "$@" -!# -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès -;;; Copyright © 2020 Marius Bakke -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu build-support ld-wrapper) - #:use-module (srfi srfi-1) - #:use-module (ice-9 match) - #:autoload (ice-9 rdelim) (read-delimited) - #:export (ld-wrapper)) - -;;; Commentary: -;;; -;;; This is a wrapper for the linker. Its purpose is to inspect the -L and -;;; -l switches passed to the linker, add corresponding -rpath arguments, and -;;; invoke the actual linker with this new set of arguments. -;;; -;;; The alternatives to this hack would be: -;;; -;;; 1. Using $LD_RUN_PATH. However, that would tend to include more than -;;; needed in the RPATH; for instance, given a package with `libfoo' as -;;; an input, all its binaries would have libfoo in their RPATH, -;;; regardless of whether they actually NEED it. -;;; -;;; 2. Use a GCC "lib" spec string such as `%{L*:-rpath %*}', which adds a -;;; `-rpath LIBDIR' argument for each occurrence of `-L LIBDIR'. -;;; However, this doesn't work when $LIBRARY_PATH is used, because the -;;; additional `-L' switches are not matched by the above rule, because -;;; the rule only matches explicit user-provided switches. See -;;; for details. -;;; -;;; As a bonus, this wrapper checks for "impurities"--i.e., references to -;;; libraries outside the store. -;;; -;;; Code: - -(define %real-ld - ;; Name of the linker that we wrap. - "@LD@") - -(define %store-directory - ;; File name of the store. - (or (getenv "NIX_STORE") "/gnu/store")) - -(define %temporary-directory - ;; Temporary directory. - (or (getenv "TMPDIR") "/tmp")) - -(define %build-directory - ;; Top build directory when run from a builder. - (getenv "NIX_BUILD_TOP")) - -(define %allow-impurities? - ;; Whether to allow references to libraries outside the store. - ;; Allow them by default for convenience. - (let ((value (getenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES"))) - (or (not value) - (let ((value (string-downcase value))) - (cond ((member value '("yes" "y" "t" "true" "1")) - #t) - ((member value '("no" "n" "f" "false" "0")) - #f) - (else - (format (current-error-port) - "ld-wrapper: ~s: invalid value for \ -'GUIX_LD_WRAPPER_ALLOW_IMPURITIES'~%" - value))))))) - -(define %debug? - ;; Whether to emit debugging output. - (getenv "GUIX_LD_WRAPPER_DEBUG")) - -(define %disable-rpath? - ;; Whether to disable automatic '-rpath' addition. - (getenv "GUIX_LD_WRAPPER_DISABLE_RPATH")) - -(define (readlink* file) - ;; Call 'readlink' until the result is not a symlink. - (define %max-symlink-depth 50) - - (let loop ((file file) - (depth 0)) - (define (absolute target) - (if (absolute-file-name? target) - target - (string-append (dirname file) "/" target))) - - (if (>= depth %max-symlink-depth) - file - (call-with-values - (lambda () - (catch 'system-error - (lambda () - (values #t (readlink file))) - (lambda args - (let ((errno (system-error-errno args))) - (if (or (= errno EINVAL) (= errno ENOENT)) - (values #f file) - (apply throw args)))))) - (lambda (success? target) - (if success? - (loop (absolute target) (+ depth 1)) - file)))))) - -(define (pure-file-name? file) - ;; Return #t when FILE is the name of a file either within the store - ;; (possibly via a symlink) or within the build directory. - (let ((file (readlink* file))) - (or (not (string-prefix? "/" file)) - (string-prefix? %store-directory file) - (string-prefix? %temporary-directory file) - (and %build-directory - (string-prefix? %build-directory file))))) - -(define (store-file-name? file) - ;; Return #t when FILE is a store file, possibly indirectly. - (string-prefix? %store-directory (readlink* file))) - -(define (shared-library? file) - ;; Return #t when FILE denotes a shared library. - (or (string-suffix? ".so" file) - (let ((index (string-contains file ".so."))) - ;; Since we cannot use regexps during bootstrap, roll our own. - (and index - (string-every (char-set-union (char-set #\.) char-set:digit) - (string-drop file (+ index 3))))))) - -(define (library-search-path args) - ;; Return the library search path as a list of directory names. The GNU ld - ;; manual notes that "[a]ll `-L' options apply to all `-l' options, - ;; regardless of the order in which the options appear", so we must compute - ;; the search path independently of the -l options. - (let loop ((args args) - (path '())) - (match args - (() - (reverse path)) - (("-L" directory . rest) - (loop rest (cons directory path))) - ((argument . rest) - (if (string-prefix? "-L" argument) ;augment the search path - (loop rest - (cons (string-drop argument 2) path)) - (loop rest path)))))) - -(define (library-files-linked args library-path) - ;; Return the absolute file names of shared libraries explicitly linked - ;; against via `-l' or with an absolute file name in ARGS, looking them up - ;; in LIBRARY-PATH. - (define files+args - (fold (lambda (argument result) - (match result - ((library-files ((and flag - (or "-dynamic-linker" "-plugin")) - . rest)) - ;; When passed '-dynamic-linker ld.so', ignore 'ld.so'; when - ;; passed '-plugin liblto_plugin.so', ignore - ;; 'liblto_plugin.so'. See . - (list library-files - (cons* argument flag rest))) - ((library-files previous-args) - (cond ((string-prefix? "-l" argument) ;add library - (let* ((lib (string-append "lib" - (string-drop argument 2) - ".so")) - (full (search-path library-path lib))) - (list (if full - (cons full library-files) - library-files) - (cons argument previous-args)))) - ((and (string-prefix? %store-directory argument) - (shared-library? argument)) ;add library - (list (cons argument library-files) - (cons argument previous-args))) - (else - (list library-files - (cons argument previous-args))))))) - (list '() '()) - args)) - - (match files+args - ((files arguments) - (reverse files)))) - -(define (rpath-arguments library-files) - ;; Return the `-rpath' argument list for each of LIBRARY-FILES, a list of - ;; absolute file names. - (fold-right (lambda (file args) - ;; Add '-rpath' if and only if FILE is in the store; we don't - ;; want to add '-rpath' for files under %BUILD-DIRECTORY or - ;; %TEMPORARY-DIRECTORY because that could leak to installed - ;; files. - (cond ((and (not %disable-rpath?) - (store-file-name? file)) - (cons* "-rpath" (dirname file) args)) - ((or %allow-impurities? - (pure-file-name? file)) - args) - (else - (begin - (format (current-error-port) - "ld-wrapper: error: attempt to use \ -library outside of ~a: ~s~%" - %store-directory file) - (exit 1))))) - '() - library-files)) - -(define (expand-arguments args) - ;; Expand ARGS such that "response file" arguments, such as "@args.txt", are - ;; expanded (info "(gcc) Overall Options"). - (define (response-file-arguments file) - (define (tokenize port) - ;; Return a list of all strings found in PORT. Quote characters are removed, - ;; but whitespaces within quoted strings are preserved. - (let loop ((words '())) - (let* ((word (read-delimited " '\"" port 'split)) - (token (car word)) - (delim (cdr word))) - (if (eof-object? delim) - (reverse words) - (case delim - ((#\") (loop (cons (read-delimited "\"" port) words))) - ((#\') (loop (cons (read-delimited "'" port) words))) - ((#\ ) (if (> 0 (string-length token)) - (loop (cons token words)) - (loop words))) - (else (loop words))))))) - - (when %debug? - (format (current-error-port) - "ld-wrapper: attempting to read arguments from '~a'~%" file)) - - (call-with-input-file file tokenize)) - - (define result - (fold-right (lambda (arg result) - (if (string-prefix? "@" arg) - (let ((file (string-drop arg 1))) - (append (catch 'system-error - (lambda () - (response-file-arguments file)) - (lambda args - ;; FILE doesn't exist or cannot be read so - ;; leave ARG as is. - (list arg))) - result)) - (cons arg result))) - '() - args)) - - ;; If there are "@" arguments in RESULT *and* we can expand them (they don't - ;; refer to nonexistent files), then recurse. - (if (equal? result args) - result - (expand-arguments result))) - -(define (ld-wrapper . args) - ;; Invoke the real `ld' with ARGS, augmented with `-rpath' switches. - (let* ((args (expand-arguments args)) - (path (library-search-path args)) - (libs (library-files-linked args path)) - (args (append args (rpath-arguments libs)))) - (when %debug? - (format (current-error-port) - "ld-wrapper: library search path: ~s~%" path) - (format (current-error-port) - "ld-wrapper: libraries linked: ~s~%" libs) - (format (current-error-port) - "ld-wrapper: invoking `~a' with ~s~%" - %real-ld args) - (force-output (current-error-port))) - (apply execl %real-ld (basename %real-ld) args))) - -;;; ld-wrapper.scm ends here -- cgit v1.2.3 From aca00b0a367581ba0489641e0d1c451de4416d7a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Mar 2020 19:29:44 +0100 Subject: gnu: CMake: Update to 3.16.5. * gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.16.5. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 18a27bc588..e24979d2b2 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -96,7 +96,7 @@ (define-public cmake-bootstrap (package (name "cmake-bootstrap") - (version "3.16.4") + (version "3.16.5") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -104,7 +104,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "0b5c77lqzfk5l7mnnih5c78i36d3skbkw20jjnph79lx9l8qrk4v")) + "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz")) (modules '((guix build utils) (ice-9 ftw))) (snippet -- cgit v1.2.3 From fdae0fa50acfee57854f6978c3b300bc46aedc68 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 6 Mar 2020 10:06:02 +0100 Subject: store: Add set-current-target procedure. * guix/store.scm (set-current-target): New exported procedure. --- guix/store.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/store.scm b/guix/store.scm index 77ee23fdd8..c616484577 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Jan Nieuwenhuizen -;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -162,6 +162,7 @@ current-system set-current-system current-target-system + set-current-target text-file interned-file interned-file-tree @@ -1863,6 +1864,11 @@ the store." (lambda (state) (values (%current-target-system) state))) +(define-inlinable (set-current-target target) + ;; Set the %CURRENT-TARGET-SYSTEM fluid at bind time. + (lambda (state) + (values (%current-target-system target) state))) + (define %guile-for-build ;; The derivation of the Guile to be used within the build environment, ;; when using 'gexp->derivation' and co. -- cgit v1.2.3 From a6bf7a9745f39afca7412f6627d24dc42ebf8075 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 6 Mar 2020 10:06:54 +0100 Subject: gexp: Default to current target. * guix/gexp.scm (lower-object): Set target argument to 'current by default and look for the current target system at bind time if needed, (gexp->file): ditto, (gexp->script): ditto, (lower-gexp): make sure lowered extensions are not cross-compiled. * tests/gexp.scm: Add cross-compilation test-cases for gexp->script and gexp->file with a target passed explicitely and with a default target. --- guix/gexp.scm | 91 ++++++++++++++++++++++++++++++++++------------------------ tests/gexp.scm | 50 ++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 38 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 0a9d56c0e8..8a59599c28 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Jan Nieuwenhuizen -;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -218,7 +218,7 @@ procedure to expand it; otherwise return #f." (define* (lower-object obj #:optional (system (%current-system)) - #:key target) + #:key (target 'current)) "Return as a value in %STORE-MONAD the derivation or store item corresponding to OBJ for SYSTEM, cross-compiling for TARGET if TARGET is true. OBJ must be an object that has an associated gexp compiler, such as a @@ -228,7 +228,10 @@ OBJ must be an object that has an associated gexp compiler, such as a (raise (condition (&gexp-input-error (input obj))))) (lower ;; Cache in STORE the result of lowering OBJ. - (mlet %store-monad ((graft? (grafting?))) + (mlet %store-monad ((target (if (eq? target 'current) + (current-target-system) + (return target))) + (graft? (grafting?))) (mcached (let ((lower (lookup-compiler obj))) (lower obj system target)) obj @@ -779,7 +782,8 @@ derivations--e.g., code evaluated for its side effects." (extensions -> (gexp-extensions exp)) (exts (mapm %store-monad (lambda (obj) - (lower-object obj system)) + (lower-object obj system + #:target #f)) extensions)) (modules+compiled (imported+compiled-modules %modules system @@ -1549,16 +1553,19 @@ are searched for in PATH. Return #f when MODULES and EXTENSIONS are empty." #:key (guile (default-guile)) (module-path %load-path) (system (%current-system)) - target) + (target 'current)) "Return an executable script NAME that runs EXP using GUILE, with EXP's imported modules in its search path. Look up EXP's modules in MODULE-PATH." - (mlet %store-monad ((set-load-path - (load-path-expression (gexp-modules exp) - module-path - #:extensions - (gexp-extensions exp) - #:system system - #:target target))) + (mlet* %store-monad ((target (if (eq? target 'current) + (current-target-system) + (return target))) + (set-load-path + (load-path-expression (gexp-modules exp) + module-path + #:extensions + (gexp-extensions exp) + #:system system + #:target target))) (gexp->derivation name (gexp (call-with-output-file (ungexp output) @@ -1592,7 +1599,7 @@ imported modules in its search path. Look up EXP's modules in MODULE-PATH." (module-path %load-path) (splice? #f) (system (%current-system)) - target) + (target 'current)) "Return a derivation that builds a file NAME containing EXP. When SPLICE? is true, EXP is considered to be a list of expressions that will be spliced in the resulting file. @@ -1603,36 +1610,44 @@ Lookup EXP's modules in MODULE-PATH." (define modules (gexp-modules exp)) (define extensions (gexp-extensions exp)) - (if (or (not set-load-path?) - (and (null? modules) (null? extensions))) - (gexp->derivation name - (gexp - (call-with-output-file (ungexp output) - (lambda (port) - (for-each (lambda (exp) - (write exp port)) - '(ungexp (if splice? - exp - (gexp ((ungexp exp))))))))) - #:local-build? #t - #:substitutable? #f - #:system system - #:target target) - (mlet %store-monad ((set-load-path - (load-path-expression modules module-path - #:extensions extensions - #:system system - #:target target))) + (mlet* %store-monad + ((target (if (eq? target 'current) + (current-target-system) + (return target))) + (no-load-path? -> (or (not set-load-path?) + (and (null? modules) + (null? extensions)))) + (set-load-path + (load-path-expression modules module-path + #:extensions extensions + #:system system + #:target target))) + (if no-load-path? + (gexp->derivation name + (gexp + (call-with-output-file (ungexp output) + (lambda (port) + (for-each + (lambda (exp) + (write exp port)) + '(ungexp (if splice? + exp + (gexp ((ungexp exp))))))))) + #:local-build? #t + #:substitutable? #f + #:system system + #:target target) (gexp->derivation name (gexp (call-with-output-file (ungexp output) (lambda (port) (write '(ungexp set-load-path) port) - (for-each (lambda (exp) - (write exp port)) - '(ungexp (if splice? - exp - (gexp ((ungexp exp))))))))) + (for-each + (lambda (exp) + (write exp port)) + '(ungexp (if splice? + exp + (gexp ((ungexp exp))))))))) #:module-path module-path #:local-build? #t #:substitutable? #f diff --git a/tests/gexp.scm b/tests/gexp.scm index 7c8985d846..9e38816c3d 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -1331,6 +1331,56 @@ '#~(foo #$bar #$baz:out #$(chbouib 42) #$@(list x y z) #+foo #+foo:out #+(chbouib 42) #+@(list x y z))) +(test-assertm "gexp->file, cross-compilation" + (mlet* %store-monad ((target -> "aarch64-linux-gnu") + (exp -> (gexp (list (ungexp coreutils)))) + (xdrv (gexp->file "foo" exp #:target target)) + (refs (references* + (derivation-file-name xdrv))) + (xcu (package->cross-derivation coreutils + target)) + (cu (package->derivation coreutils))) + (return (and (member (derivation-file-name xcu) refs) + (not (member (derivation-file-name cu) refs)))))) + +(test-assertm "gexp->file, cross-compilation with default target" + (mlet* %store-monad ((target -> "aarch64-linux-gnu") + (_ (set-current-target target)) + (exp -> (gexp (list (ungexp coreutils)))) + (xdrv (gexp->file "foo" exp)) + (refs (references* + (derivation-file-name xdrv))) + (xcu (package->cross-derivation coreutils + target)) + (cu (package->derivation coreutils))) + (return (and (member (derivation-file-name xcu) refs) + (not (member (derivation-file-name cu) refs)))))) + +(test-assertm "gexp->script, cross-compilation" + (mlet* %store-monad ((target -> "aarch64-linux-gnu") + (exp -> (gexp (list (ungexp coreutils)))) + (xdrv (gexp->script "foo" exp #:target target)) + (refs (references* + (derivation-file-name xdrv))) + (xcu (package->cross-derivation coreutils + target)) + (cu (package->derivation coreutils))) + (return (and (member (derivation-file-name xcu) refs) + (not (member (derivation-file-name cu) refs)))))) + +(test-assertm "gexp->script, cross-compilation with default target" + (mlet* %store-monad ((target -> "aarch64-linux-gnu") + (_ (set-current-target target)) + (exp -> (gexp (list (ungexp coreutils)))) + (xdrv (gexp->script "foo" exp)) + (refs (references* + (derivation-file-name xdrv))) + (xcu (package->cross-derivation coreutils + target)) + (cu (package->derivation coreutils))) + (return (and (member (derivation-file-name xcu) refs) + (not (member (derivation-file-name cu) refs)))))) + (test-end "gexp") ;; Local Variables: -- cgit v1.2.3 From b8e08aa2e4e1b3ecc4c41439c0b8ec41ba2566dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 6 Mar 2020 11:11:58 +0100 Subject: gnu: pango@1.42: Do not inherit replacements from pango@1.44. * gnu/packages/gtk.scm (pango-1.42): Do not use PACKAGE/INHERIT. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 243e9e5319..405ebe3c26 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -273,8 +273,8 @@ used throughout the world.") (home-page "https://developer.gnome.org/pango/"))) (define-public pango-1.42 - (package/inherit - pango + (package + (inherit pango) (version "1.42.4") (source (origin (method url-fetch) -- cgit v1.2.3 From c67ee58c72e52261b54ed0dc2d4fd1d07be1e11d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 6 Mar 2020 11:12:29 +0100 Subject: gnu: pangox-compat: Build with pango@1.42. * gnu/packages/gtk.scm (pangox-compat)[inputs]: Change from PANGO to PANGO-1.42. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 405ebe3c26..b01f4c704c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -302,7 +302,7 @@ used throughout the world.") (build-system gnu-build-system) (inputs `(("glib" ,glib) - ("pango" ,pango))) + ("pango" ,pango-1.42))) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 92594b2e0fdae039b9149bcf82b829294ab45fef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 6 Mar 2020 11:13:12 +0100 Subject: gnu: vpnc-scripts: Tighten substitution regex. * gnu/packages/vpn.scm (vpnc-scripts)[arguments]: Do not substitute file names starting with /bin to preserve /bin/sh shebangs. --- gnu/packages/vpn.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index becc505b34..4899dbe3b7 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -152,7 +152,7 @@ Only \"Universal TUN/TAP device driver support\" is needed in the kernel.") (for-each (lambda (script) (substitute* script (("^PATH=.*") "") - (("(/usr|)/s?bin/") "") + (("/usr/s?bin/") "") (("\\[ +-x +([^]]+) +\\]" _ command) (string-append "command -v >/dev/null 2>&1 " command)))) -- cgit v1.2.3 From b4335cfb55ced138ce07cf5d0a29c06fa6e6d1c5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 6 Mar 2020 13:49:40 +0100 Subject: gnu: guix: Fix cross-compilation. * gnu/packages/package-management.scm (guix)[native-inputs]: Add all Guile libraries to fix cross-compilation. --- gnu/packages/package-management.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c872a563fe..6daad079b3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018, 2019 Eric Bavier ;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Jonathan Brielmaier +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -277,6 +278,16 @@ #t)))))) (native-inputs `(("pkg-config" ,pkg-config) + ;; Guile libraries are needed here for + ;; cross-compilation. + ("guile" ,guile-2.2) + ("gnutls" ,gnutls) + ("guile-gcrypt" ,guile-gcrypt) + ("guile-json" ,guile-json-3) + ("guile-sqlite3" ,guile-sqlite3) + ("guile-ssh" ,guile-ssh) + ("guile-git" ,guile-git) + ;; XXX: Keep the development inputs here even though ;; they're unnecessary, just so that 'guix environment ;; guix' always contains them. -- cgit v1.2.3 From 02043f36d728fd46a3d9b5bc7449cd847f1b231e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 8 Mar 2020 20:41:51 +0100 Subject: gnu: coreutils: Fix cross-compilation. Fix coreutils cross-compilation for aarch64 that was broken by 8.32 update. The following error occured: src/ls.c: In function 'print_dir': src/ls.c:3026:24: error: 'SYS_getdents' undeclared (first use in this function); did you mean 'SYS_getdents64'? if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1 ^~~~~~~~~~~~ SYS_getdents64 * gnu/packages/patches/coreutils-ls.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/base.scm (coreutils): Apply it. --- gnu/local.mk | 1 + gnu/packages/base.scm | 5 +- gnu/packages/patches/coreutils-ls.patch | 117 ++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/coreutils-ls.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0fe2c90781..7c3e2648e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -797,6 +797,7 @@ dist_patch_DATA = \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ %D%/packages/patches/containerd-test-with-go1.13.patch \ + %D%/packages/patches/coreutils-ls.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1989bdd7eb..f048e4b119 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -297,7 +297,8 @@ used to apply commands with arbitrarily long arguments.") version ".tar.xz")) (sha256 (base32 - "1yjcrh5hw70c0yn8zw55pd6j51dj90anpq8mmg649ps9g3gdhn24")))) + "1yjcrh5hw70c0yn8zw55pd6j51dj90anpq8mmg649ps9g3gdhn24")) + (patches (search-patches "coreutils-ls.patch")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp) ;bignums in 'expr', yay! diff --git a/gnu/packages/patches/coreutils-ls.patch b/gnu/packages/patches/coreutils-ls.patch new file mode 100644 index 0000000000..59cbbf00b5 --- /dev/null +++ b/gnu/packages/patches/coreutils-ls.patch @@ -0,0 +1,117 @@ +Patch taken from upstream to fix cross-compilation for aarch64. This can be +removed on the next coreutils release. + +From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 5 Mar 2020 17:25:29 -0800 +Subject: [PATCH] ls: restore 8.31 behavior on removed directories + +* NEWS: Mention this. +* src/ls.c: Do not include +(print_dir): Don't worry about whether the directory is removed. +* tests/ls/removed-directory.sh: Adjust to match new (i.e., old) +behavior. +--- + NEWS | 6 ++++++ + src/ls.c | 22 ---------------------- + tests/ls/removed-directory.sh | 10 ++-------- + 3 files changed, 8 insertions(+), 30 deletions(-) + +diff --git a/NEWS b/NEWS +index fdc8bf5db..653e7178b 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Changes in behavior ++ ++ On GNU/Linux systems, ls no longer issues an error message on ++ directory merely because it was removed. This reverts a change ++ that was made in release 8.32. ++ + + * Noteworthy changes in release 8.32 (2020-03-05) [stable] + +diff --git a/src/ls.c b/src/ls.c +index 24b983287..4acf5f44d 100644 +--- a/src/ls.c ++++ b/src/ls.c +@@ -49,10 +49,6 @@ + # include + #endif + +-#ifdef __linux__ +-# include +-#endif +- + #include + #include + #include +@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) + struct dirent *next; + uintmax_t total_blocks = 0; + static bool first = true; +- bool found_any_entries = false; + + errno = 0; + dirp = opendir (name); +@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) + next = readdir (dirp); + if (next) + { +- found_any_entries = true; + if (! file_ignored (next->d_name)) + { + enum filetype type = unknown; +@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) + if (errno != EOVERFLOW) + break; + } +-#ifdef __linux__ +- else if (! found_any_entries) +- { +- /* If readdir finds no directory entries at all, not even "." or +- "..", then double check that the directory exists. */ +- if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1 +- && errno != EINVAL) +- { +- /* We exclude EINVAL as that pertains to buffer handling, +- and we've passed NULL as the buffer for simplicity. +- ENOENT is returned if appropriate before buffer handling. */ +- file_failure (command_line_arg, _("reading directory %s"), name); +- } +- break; +- } +-#endif + else + break; + +diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh +index e8c835dab..fe8f929a1 100755 +--- a/tests/ls/removed-directory.sh ++++ b/tests/ls/removed-directory.sh +@@ -26,20 +26,14 @@ case $host_triplet in + *) skip_ 'non linux kernel' ;; + esac + +-LS_FAILURE=2 +- +-cat <<\EOF >exp-err || framework_failure_ +-ls: reading directory '.': No such file or directory +-EOF +- + cwd=$(pwd) + mkdir d || framework_failure_ + cd d || framework_failure_ + rmdir ../d || framework_failure_ + +-returns_ $LS_FAILURE ls >../out 2>../err || fail=1 ++ls >../out 2>../err || fail=1 + cd "$cwd" || framework_failure_ + compare /dev/null out || fail=1 +-compare exp-err err || fail=1 ++compare /dev/null err || fail=1 + + Exit $fail -- cgit v1.2.3 From 1926db54a6a31f6676ba5db3668287ce7d709c8b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 10 Mar 2020 11:29:21 +0100 Subject: gnu: guile3.0-guix: Fix cross-compilation. * gnu/packages/package-management.scm (guile3.0-guix)[native-inputs]: Remove all Guile 2.X libraries and replace them by their 3.0 counterpart. --- gnu/packages/package-management.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6daad079b3..c71029ef4e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -412,6 +412,17 @@ the Nix package manager.") (package (inherit guix) (name "guile3.0-guix") + (native-inputs + `(("guile" ,guile-3.0) + ("gnutls" ,guile3.0-gnutls) + ("guile-gcrypt" ,guile3.0-gcrypt) + ("guile-json" ,guile3.0-json) + ("guile-sqlite3" ,guile3.0-sqlite3) + ("guile-ssh" ,guile3.0-ssh) + ("guile-git" ,guile3.0-git) + ,@(fold alist-delete (package-native-inputs guix) + '("guile" "gnutls" "guile-gcrypt" "guile-json" + "guile-sqlite3" "guile-ssh" "guile-git")))) (inputs `(("guile" ,guile-3.0) ,@(alist-delete "guile" (package-inputs guix)))) -- cgit v1.2.3 From bda4b5e0453e4c8feda24306b4aa76ad5406eb7d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 10 Mar 2020 14:16:27 +0100 Subject: gnu: python: Fix cross-compilation. This is a follow-up of 89da127035737bdf922bc566970c5506c2e01b00. * gnu/packages/patches/python-3-search-paths.patch: Use CROSS_C_INCLUDE_PATH instead of CROSS_CPATH. --- gnu/packages/patches/python-3-search-paths.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index 612201d1f2..df01d3b933 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -19,7 +19,7 @@ looking for headers and libraries. + self.lib_dirs = (os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep) + sysroot_paths(('LDFLAGS', 'CC'), system_lib_dirs)) - self.inc_dirs = (self.compiler.include_dirs + -+ self.inc_dirs = (os.getenv('CROSS_CPATH', '').split(os.pathsep) + ++ self.inc_dirs = (os.getenv('CROSS_C_INCLUDE_PATH', '').split(os.pathsep) + sysroot_paths(('CPPFLAGS', 'CFLAGS', 'CC'), system_include_dirs)) -- cgit v1.2.3 From edc8fd2e2d75ba7af9bf6403277ecb0dccd48dc3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Mar 2020 20:54:52 +0100 Subject: gnu: Remove guile@2.2.6. * gnu/packages/patches/guile-finalization-crash.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/guile.scm (guile-2.2)[source](patches): Remove 'guile-finalization-crash.patch'. (guile-2.2.7): Remove variable. (guile-2.2/bug-fix): Point to GUILE-2.2. * gnu/packages/admin.scm (shepherd)[native-inputs, inputs]: Use GUILE-2.2 instead of GUILE-2.2.7. --- gnu/local.mk | 1 - gnu/packages/admin.scm | 4 +- gnu/packages/guile.scm | 21 ++------ .../patches/guile-finalization-crash.patch | 61 ---------------------- 4 files changed, 5 insertions(+), 82 deletions(-) delete mode 100644 gnu/packages/patches/guile-finalization-crash.patch diff --git a/gnu/local.mk b/gnu/local.mk index cc219b42df..f2e323c345 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -992,7 +992,6 @@ dist_patch_DATA = \ %D%/packages/patches/guile-3.0-crash.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ - %D%/packages/patches/guile-finalization-crash.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-relocatable.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index af29dc30fe..350cd541b7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -211,10 +211,10 @@ and provides a \"top-like\" mode (monitoring).") `(("pkg-config" ,pkg-config) ;; This is the Guile we use as a cross-compiler... - ("guile" ,guile-2.2.7))) + ("guile" ,guile-2.2))) (inputs ;; ... and this is the one that appears in shebangs when cross-compiling. - `(("guile" ,guile-2.2.7) ;for + `(("guile" ,guile-2.2) ;; The 'shepherd' command uses Readline when used interactively. It's ;; an unusual use case though, so we don't propagate it. diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 0ce5d71cfd..b97f149391 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -217,7 +217,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.6") + (version "2.2.7") (source (origin (method url-fetch) @@ -227,10 +227,9 @@ without requiring the source code to be rewritten.") ".tar.xz")) (sha256 (base32 - "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk")) + "013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd")) (modules '((guix build utils))) (patches (search-patches - "guile-finalization-crash.patch" "guile-2.2-skip-oom-test.patch")) ;; Remove the pre-built object files. Instead, build everything @@ -251,21 +250,7 @@ without requiring the source code to be rewritten.") (variable "GUILE_LOAD_COMPILED_PATH") (files '("lib/guile/2.2/site-ccache"))))))) -(define-public guile-2.2.7 - ;; This version contains a bug fix for a relatively rare crash that could - ;; affect shepherd as PID 1: . - (package - (inherit guile-2.2) - (version "2.2.7") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd")))))) - -(define-deprecated guile-2.2/bug-fix guile-2.2.7) +(define-deprecated guile-2.2/bug-fix guile-2.2) (define-public guile-2.2/fixed ;; A package of Guile 2.2 that's rarely changed. It is the one used diff --git a/gnu/packages/patches/guile-finalization-crash.patch b/gnu/packages/patches/guile-finalization-crash.patch deleted file mode 100644 index 098249e49f..0000000000 --- a/gnu/packages/patches/guile-finalization-crash.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit edf5aea7ac852db2356ef36cba4a119eb0c81ea9 -Author: Ludovic Courtès -Date: Mon Dec 9 14:44:59 2019 +0100 - - Fix non-deterministic crash in 'finalization_thread_proc'. - - Fixes . - Reported by Jesse Gibbons . - - * libguile/finalizers.c (finalization_thread_proc): Do not enter the - "switch (data.byte)" condition when data.n <= 0. - -diff --git a/libguile/finalizers.c b/libguile/finalizers.c -index c5d69e8e3..94a6e6b0a 100644 ---- a/libguile/finalizers.c -+++ b/libguile/finalizers.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2012, 2013, 2014 Free Software Foundation, Inc. -+/* Copyright (C) 2012, 2013, 2014, 2019 Free Software Foundation, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License -@@ -211,21 +211,26 @@ finalization_thread_proc (void *unused) - - scm_without_guile (read_finalization_pipe_data, &data); - -- if (data.n <= 0 && data.err != EINTR) -+ if (data.n <= 0) - { -- perror ("error in finalization thread"); -- return NULL; -+ if (data.err != EINTR) -+ { -+ perror ("error in finalization thread"); -+ return NULL; -+ } - } -- -- switch (data.byte) -+ else - { -- case 0: -- scm_run_finalizers (); -- break; -- case 1: -- return NULL; -- default: -- abort (); -+ switch (data.byte) -+ { -+ case 0: -+ scm_run_finalizers (); -+ break; -+ case 1: -+ return NULL; -+ default: -+ abort (); -+ } - } - } - } -- cgit v1.2.3 From 7688dbbdd7a7a091c9a0fc4850e70725e3ff64e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 00:17:01 +0100 Subject: gnu: ncurses: Prevent binutils reference. This fixes a regression introduces in 717c433c46e8e9fc77b796e485092e2cccee336a where ncurses would needlessly depend on binutils on runtime. * gnu/packages/ncurses.scm (ncurses)[arguments]: Add "cf_cv_ld_searchpath" in #:configure-flags. --- gnu/packages/ncurses.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 12e16b2403..52819e9665 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2017, 2019 Marius Bakke +;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -184,6 +184,12 @@ ;; around this. ,@(if (%current-target-system) '("--disable-stripping") '()) + ;; Do not assume a default search path in ld, even if it is only to + ;; filter it out in ncurses-config. Mainly because otherwise it ends + ;; up using the libdir from binutils, which makes little sense and + ;; causes an unnecessary runtime dependency. + "cf_cv_ld_searchpath=/no-ld-searchpath" + ;; MinGW: Use term-driver created for the MinGW port. ,@(if (target-mingw?) '("--enable-term-driver") '())))) #:tests? #f ; no "check" target -- cgit v1.2.3 From f430c621d502b7e6b85f548e85354924a3898562 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 00:17:39 +0100 Subject: gnu: jemalloc: Install scripts to separate output. * gnu/packages/jemalloc.scm (jemalloc)[outputs]: New field. --- gnu/packages/jemalloc.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm index 2eabf4403f..c4b87b540d 100644 --- a/gnu/packages/jemalloc.scm +++ b/gnu/packages/jemalloc.scm @@ -59,6 +59,9 @@ '() '(#:configure-flags (list "--disable-thp"))))) (inputs `(("perl" ,perl))) + ;; Install the scripts to a separate output to avoid referencing Perl and + ;; Bash in the default output, saving ~75 MiB on the closure. + (outputs '("out" "bin")) (home-page "http://jemalloc.net/") (synopsis "General-purpose scalable concurrent malloc implementation") (description -- cgit v1.2.3 From 6b5a2e58866dc3642a39bb14aea9a77c4019b806 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 00:18:25 +0100 Subject: gnu: OpenLDAP: Remove unused input. * gnu/packages/openldap.scm (openldap)[inputs]: Remove ICU4C. --- gnu/packages/openldap.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 60b543393e..75fe8f9b73 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -82,7 +82,6 @@ (inputs `(("bdb" ,bdb-5.3) ("cyrus-sasl" ,cyrus-sasl) ("gnutls" ,gnutls) - ("icu4c" ,icu4c) ("libgcrypt" ,libgcrypt) ("zlib" ,zlib))) (native-inputs `(("libtool" ,libtool) -- cgit v1.2.3 From aaadd6e2e1bb4f814dfc7b30d8d23b91526c4deb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 00:18:57 +0100 Subject: gnu: salmon: Adjust for C_INCLUDE_PATH changes. * gnu/packages/bioinformatics.scm (salmon)[arguments]: Append Eigen headers to C_INCLUDE_PATH instead of CPATH. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 035a7bb808..5b9413f181 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11970,8 +11970,8 @@ The following file formats are supported: (("lib/libdivsufsort.a") "/lib/libdivsufsort.so")) ;; Ensure that all headers can be found - (setenv "CPATH" - (string-append (getenv "CPATH") + (setenv "CPLUS_INCLUDE_PATH" + (string-append (or (getenv "CPLUS_INCLUDE_PATH") "") ":" (assoc-ref inputs "eigen") "/include/eigen3")) -- cgit v1.2.3 From 4889be6ceb794d8c535d90df007e012ab7c2161e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 00:19:24 +0100 Subject: gnu: blender: Fix build with Python 3.8. * gnu/packages/graphics.scm (blender)[arguments]: Remove 'm' suffix from python directories. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 7e3685482d..fcd5b0c6e2 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -114,11 +114,11 @@ "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENSUBDIV=ON" "-DWITH_PYTHON_INSTALL=OFF" - (string-append "-DPYTHON_LIBRARY=python" ,python-version "m") + (string-append "-DPYTHON_LIBRARY=python" ,python-version) (string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python") "/lib") (string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python") - "/include/python" ,python-version "m") + "/include/python" ,python-version) (string-append "-DPYTHON_VERSION=" ,python-version) (string-append "-DPYTHON_NUMPY_PATH=" (assoc-ref %build-inputs "python-numpy") -- cgit v1.2.3 From 11a5ffba7327250ebe7b67c777204e49858310bb Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 03:53:38 -0500 Subject: gnu: coreutils: Remove libcap dependency for the Hurd. * gnu/packages/linux.scm (libcap)[supported-systems]: Remove the Hurd. * gnu/packages/base.scm (coreutils)[inputs]: Include libcap only for supported systems. Fixes building on the Hurd. --- gnu/packages/base.scm | 14 ++++++++------ gnu/packages/linux.scm | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f048e4b119..d74d304de1 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner -;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017, 2020 Mathieu Othacehe @@ -303,11 +303,13 @@ used to apply commands with arbitrarily long arguments.") (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp) ;bignums in 'expr', yay! - ;; Drop the dependency on libcap when cross-compiling since it's - ;; not quite cross-compilable. - ,@(if (%current-target-system) - '() - `(("libcap" ,libcap))))) ;capability support is 'ls', etc. + ;; Do not use libcap when cross-compiling since it's not quite + ;; cross-compilable; and use it only for supported systems. + ,@(if (and (not (%current-target-system)) + (not (member (%current-system) + (package-supported-systems libcap)))) + `(("libcap" ,libcap)) ;capability support in 'ls', etc. + '()))) (native-inputs ;; Perl is needed to run tests in native builds, and to run the bundled ;; copy of help2man. However, don't pass it when cross-compiling since diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e9f261e859..977f448b56 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Chris Marusich ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -2068,6 +2069,7 @@ configuration (iptunnel, ipmaddr).") (assoc-ref %outputs "out")) "RAISE_SETFCAP=no"))) (native-inputs `(("perl" ,perl))) + (supported-systems (delete "i586-gnu" %supported-systems)) (home-page "https://sites.google.com/site/fullycapable/") (synopsis "Library for working with POSIX capabilities") (description -- cgit v1.2.3 From 53402d437cbd6658377003058e827fa5a513eecf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 20:14:42 +0100 Subject: gnu: wesnoth: Remove obsolete workaround. * gnu/packages/games.scm (wesnoth)[arguments]: Remove #:phases. --- gnu/packages/games.scm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 45d5c4697d..e7764cc9ec 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2665,20 +2665,7 @@ falling, themeable graphics and sounds, and replays.") "1i8mz6gw3qar09bscczhki0g4scj8pl58v85rp0g55r4bcq41l5v")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;no check target - #:phases (modify-phases %standard-phases - (add-before 'configure 'treat-boost-as-system-header - (lambda* (#:key inputs #:allow-other-keys) - (let ((boost (assoc-ref inputs "boost"))) - ;; Ensure Boost is treated as "system headers" to - ;; pacify compiler warnings induced by Boost headers. - (for-each (lambda (variable) - (setenv variable - (string-append boost "/include:" - (or (getenv variable) - "")))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) - #t)))))) + `(#:tests? #f)) ;no check target (native-inputs `(("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From e22c2c78a17b588edd994dc5b04659c06e45992a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 20:16:37 +0100 Subject: gnu: libtorrent-rasterbar: Build with Python 3. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[native-inputs]: Change from PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/bittorrent.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index fa63c49920..9e19425e90 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -404,7 +404,7 @@ and will take advantage of multiple processor cores where possible.") (assoc-ref %outputs "out") "/lib")))) (inputs `(("boost" ,boost) ("openssl" ,openssl))) - (native-inputs `(("python" ,python-2) + (native-inputs `(("python" ,python-wrapper) ("pkg-config" ,pkg-config))) (home-page "https://www.libtorrent.org/") (synopsis "Feature complete BitTorrent implementation") -- cgit v1.2.3 From 5afffbeffc931d00074e570f5ec89df8a1ebe568 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 20:31:27 +0100 Subject: gnu: fifengine: Fix build with newer Swig and Python. * gnu/packages/patches/fifengine-swig-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/games.scm (fifengine)[source](patches): New field. [arguments]: Remove hard coded Python version from #:configure-flags. --- gnu/local.mk | 1 + gnu/packages/games.scm | 5 ++++- gnu/packages/patches/fifengine-swig-compat.patch | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/fifengine-swig-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2e323c345..47279ffa08 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -868,6 +868,7 @@ dist_patch_DATA = \ %D%/packages/patches/fasthenry-spSolve.patch \ %D%/packages/patches/fasthenry-spFactor.patch \ %D%/packages/patches/fbreader-curl-7.62.patch \ + %D%/packages/patches/fifengine-swig-compat.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ %D%/packages/patches/findutils-localstatedir.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e7764cc9ec..43199d2850 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2280,6 +2280,7 @@ Widgets, and allows users to create more.") (uri (string-append "https://codeload.github.com/fifengine/" "fifengine/tar.gz/" version)) (file-name (string-append name "-" version ".tar.gz")) + (patches (search-patches "fifengine-swig-compat.patch")) (sha256 (base32 "1y4grw25cq5iqlg05rnbyxw1njl11ypidnlsm3qy4sm3xxdvb0p8")))) @@ -2296,7 +2297,9 @@ Widgets, and allows users to create more.") "/include/AL") (string-append "-DPYTHON_SITE_PACKAGES=" (assoc-ref %outputs "out") - "/lib/python3.7/site-packages")) + "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-run_tests.py diff --git a/gnu/packages/patches/fifengine-swig-compat.patch b/gnu/packages/patches/fifengine-swig-compat.patch new file mode 100644 index 0000000000..85cd05f835 --- /dev/null +++ b/gnu/packages/patches/fifengine-swig-compat.patch @@ -0,0 +1,17 @@ +Fix build failure when using Swig 4. + +Taken from upstream: +https://github.com/fifengine/fifengine/commit/d14f232f4cd9a00b05d6872957070e8c020f515d + +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -893,7 +893,7 @@ if(build-python) + find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT) + include_directories(${PYTHON_INCLUDE_PATH}) + +- set(CMAKE_SWIG_FLAGS -modern -fastdispatch -dirvtable -nosafecstrings -noproxydel -fastproxy -fastinit -fastunpack -fastquery -modernargs -nobuildnone -keyword -w511 -w473 -w404 -w314) ++ set(CMAKE_SWIG_FLAGS -modern -fastdispatch -dirvtable -noproxydel -fastproxy -fastinit -fastunpack -fastquery -modernargs -keyword -w511 -w473 -w404 -w314) + + set_source_files_properties("${PROJECT_BINARY_DIR}/fife.i" PROPERTIES CPLUSPLUS ON) + set(FIFE_SOURCES ${FIFE_CORE_SRC}) -- cgit v1.2.3 From 966301597d7d4cac1d0be806c5ac439b357e2583 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 20:51:16 +0100 Subject: gnu: c-ares: Update to 1.16.0. * gnu/packages/adns.scm (c-ares): Update to 1.16.0. --- gnu/packages/adns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 541612d41a..5d8c6fdc91 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -62,7 +62,7 @@ scripts.") (define-public c-ares (package (name "c-ares") - (version "1.15.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append @@ -70,7 +70,7 @@ scripts.") ".tar.gz")) (sha256 (base32 - "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc")))) + "129sm0wzij0mp8vdv68v18hnykcjb6ivi66wnqnnw598q7bql1fy")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 635b14fc6ae2fae64b474315b1f39cebd1e16028 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 20:51:55 +0100 Subject: gnu: cURL: Update to 7.69.1. * gnu/packages/curl.scm (curl): Update to 7.69.1. --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 70d7c4901c..48d7dd40bd 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,14 +51,14 @@ (define-public curl (package (name "curl") - (version "7.69.0") + (version "7.69.1") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "07r7wcamwa0lb3wdlzfac5q2rg6ip5ddv3d211w7a9y1hbqg5bcz")) + "0kwxh76iq9fblk7iyv4f75bmcmasarp2bcm1mm07wyvzd7kdbiq3")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) (build-system gnu-build-system) (outputs '("out" -- cgit v1.2.3 From eceaa46730bedee30afdd062fecd5244672e8cc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 20:54:38 +0100 Subject: gnu: LibUV: Update to 1.35.0. * gnu/packages/libevent.scm (libuv): Update to 1.35.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 4e93f5cf01..608264f2f4 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -102,14 +102,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.34.2") + (version "1.35.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0inzk8qpw78im3fiazrc54qi1gcapbs8dhf0hk3kwpzg0i2kpnb5")))) + "0126mfmaw3s92dsga60sydgwjmzwg9cd36n127pydmisah17v50f")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static") -- cgit v1.2.3 From 8d425d74d25ec9d8eda74d3b70dc21b5e71537e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 20:58:11 +0100 Subject: gnu: icu4c: Update to 66.1. * gnu/packages/icu4c.scm (icu4c): Update to 66.1. --- gnu/packages/icu4c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 717ed277ee..61e252cff2 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -36,7 +36,7 @@ (define-public icu4c (package (name "icu4c") - (version "65.1") + (version "66.1") (source (origin (method url-fetch) (uri (string-append @@ -46,7 +46,7 @@ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) (sha256 - (base32 "0j6r6qqnhfr5iqkx53k63ifkm93kv1kkb7h2mlgd1mnnndk79qsk")))) + (base32 "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj")))) (build-system gnu-build-system) ;; When cross-compiling, this package needs a source directory of a ;; native-build of itself. -- cgit v1.2.3 From 3db5a01c11d6288b039f6fabb1087cb02c6862a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 21:00:58 +0100 Subject: gnu: libuninameslist: Update to 20200313. * gnu/packages/fontutils.scm (libuninameslist): Update to 20200313. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index ea2f509d89..edc77d3f00 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -543,7 +543,7 @@ smooth contours with constant curvature at the spline joins.") (define-public libuninameslist (package (name "libuninameslist") - (version "20190701") + (version "20200313") (home-page "https://github.com/fontforge/libuninameslist") (source (origin @@ -552,7 +552,7 @@ smooth contours with constant curvature at the spline joins.") "/libuninameslist-dist-" version ".tar.gz")) (sha256 (base32 - "18c9pcz81wm26q2m7npmvh9j3ibjs2hycxfh5xic2xgjfw40v2qn")))) + "10ri80c64xb4rhbif3sr87y5vhi3m702zb0m02imvj1jib9rq0m8")))) (build-system gnu-build-system) (synopsis "Unicode names and annotation list") (description -- cgit v1.2.3 From 704f1b53c77f3550bc7b3e86aa7237db2fc1594e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 21:05:23 +0100 Subject: gnu: pcre: Update to 8.44. * gnu/packages/pcre.scm (pcre): Update to 8.44. --- gnu/packages/pcre.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index ea45a3d06b..ce2a6e91db 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -35,7 +35,7 @@ (define-public pcre (package (name "pcre") - (version "8.43") + (version "8.44") (source (origin (method url-fetch) (uri (list @@ -46,7 +46,7 @@ version "/pcre-" version ".tar.bz2"))) (sha256 (base32 - "0sxg1wlknq05ryq63h21cchjmcjkin9lmnqsmhs3h08301965rwi")))) + "0v9nk51wh55pcbnf2jr36yarz8ayajn6d7ywiq2wagivn9c8c40r")))) (build-system gnu-build-system) (outputs '("out" ;library & headers "bin" ;depends on Readline (adds 20MiB to the closure) -- cgit v1.2.3 From 3fd74c45064eba882771b0398b4c3b29b030a44a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 01:20:14 +0100 Subject: gnu: jbig2dec: Update to 0.18. * gnu/packages/patches/jbig2dec-ignore-testtest.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/image.scm (jbig2dec): Update to 0.18. [source](uri): Adjust for Ghostscript 9.51. [source](patches): Remove. [arguments]: Add #:phases. [native-inputs]: Add AUTOCONF, AUTOMAKE, LIBTOOL and PYTHON-WRAPPER. --- gnu/local.mk | 1 - gnu/packages/image.scm | 25 +++++++++++++++++----- .../patches/jbig2dec-ignore-testtest.patch | 16 -------------- 3 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 gnu/packages/patches/jbig2dec-ignore-testtest.patch diff --git a/gnu/local.mk b/gnu/local.mk index 47279ffa08..d5271067d6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1053,7 +1053,6 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-bootclasspath.patch \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ - %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/jfsutils-add-sysmacros.patch \ %D%/packages/patches/jfsutils-include-systypes.patch \ %D%/packages/patches/jsoncpp-fix-inverted-case.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 36f650f23a..3850e7fb77 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -635,18 +635,33 @@ arithmetic ops.") (define-public jbig2dec (package (name "jbig2dec") - (version "0.17") + (version "0.18") (source (origin (method url-fetch) (uri (string-append "https://github.com/ArtifexSoftware" "/ghostpdl-downloads/releases/download" - "/gs950/" name "-" version ".tar.gz")) + "/gs951/" name "-" version ".tar.gz")) (sha256 (base32 - "0wpvslmwazia3z8gyk343kbq6yj47pxr4x5yjvx332v309qssazp")) - (patches (search-patches "jbig2dec-ignore-testtest.patch")))) + "0pigfw2v0ppvr0lbysm69gx0zsa5q2q92yrb8af2j3im6x97f6cy")))) (build-system gnu-build-system) - (arguments '(#:configure-flags '("--disable-static"))) + (arguments '(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases + (add-before 'bootstrap 'force-bootstrap + (lambda _ + ;; XXX: jbig2dec 0.18 was released with + ;; a broken configure script, so we + ;; recreate the build system here. + ;; Remove the autoconf inputs below + ;; when deleting this code. + (delete-file "configure") + (delete-file "autogen.sh") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("python" ,python-wrapper))) ;for tests (synopsis "Decoder of the JBIG2 image compression format") (description "JBIG2 is designed for lossy or lossless encoding of @code{bilevel} (1-bit diff --git a/gnu/packages/patches/jbig2dec-ignore-testtest.patch b/gnu/packages/patches/jbig2dec-ignore-testtest.patch deleted file mode 100644 index 7c80c545e9..0000000000 --- a/gnu/packages/patches/jbig2dec-ignore-testtest.patch +++ /dev/null @@ -1,16 +0,0 @@ -Do not run the test 'test_jbig2dec.py'. It doesn't seem to do anything -and reports failure. TODO: Actually fix the test instead of ignoring it. - -diff --git a/Makefile.in b/Makefile.in -index 63982d4..8af1d61 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -93,7 +93,7 @@ host_triplet = @host@ - bin_PROGRAMS = jbig2dec$(EXEEXT) - noinst_PROGRAMS = test_sha1$(EXEEXT) test_huffman$(EXEEXT) \ - test_arith$(EXEEXT) --TESTS = test_sha1$(EXEEXT) test_jbig2dec.py test_huffman$(EXEEXT) \ -+TESTS = test_sha1$(EXEEXT) test_huffman$(EXEEXT) \ - test_arith$(EXEEXT) - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -- cgit v1.2.3 From af2f11ff00af569f76550b290037818e98e28b29 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 01:21:28 +0100 Subject: gnu: ghostscript: Update to 9.51. * gnu/packages/patches/ghostscript-CVE-2019-14869.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/patches/ghostscript-no-header-uuid.patch: Adjust for 9.51. * gnu/packages/ghostscript.scm (ghostscript): Update to 9.51. [source](patches): Remove obsolete patch. [arguments]: Remove obsolete substitution. When cross-compiling, add two workaround phases. --- gnu/local.mk | 1 - gnu/packages/ghostscript.scm | 39 +++++++++++++----- .../patches/ghostscript-CVE-2019-14869.patch | 48 ---------------------- .../patches/ghostscript-no-header-uuid.patch | 12 +++--- 4 files changed, 34 insertions(+), 66 deletions(-) delete mode 100644 gnu/packages/patches/ghostscript-CVE-2019-14869.patch diff --git a/gnu/local.mk b/gnu/local.mk index d5271067d6..ebb6b859b3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -930,7 +930,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-monad-par-fix-tests.patch \ %D%/packages/patches/ghc-pandoc-fix-html-tests.patch \ %D%/packages/patches/ghc-pandoc-fix-latex-test.patch \ - %D%/packages/patches/ghostscript-CVE-2019-14869.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 3cd1e4af8d..ae689925e1 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. @@ -159,7 +159,7 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (version "9.50") + (version "9.51") (source (origin (method url-fetch) @@ -169,9 +169,8 @@ printing, and psresize, for adjusting page sizes.") "/ghostscript-" version ".tar.xz")) (sha256 (base32 - "1m770dwc82afdgzgq2kar3120r1lbybm3mssdm79f8kggf0v16yv")) - (patches (search-patches "ghostscript-CVE-2019-14869.patch" - "ghostscript-no-header-creationdate.patch" + "0wdpcq9lq19v8an8xs28cgg7vfzb23f1j12m9p2wdnwa1vwk64by")) + (patches (search-patches "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) (modules '((guix build utils))) @@ -234,10 +233,6 @@ printing, and psresize, for adjusting page sizes.") (substitute* "base/gscdef.c" (("GS_DOCDIR") "\"~/.guix-profile/share/doc/ghostscript\"")) - ;; The docdir default changed in 9.23 and a compatibility - ;; symlink was added from datadir->docdir. Remove it. - (substitute* "base/unixinst.mak" - (("ln -s \\$\\(DESTDIR\\)\\$\\(docdir\\).*") "")) #t)) (add-after 'configure 'patch-config-files (lambda _ @@ -245,7 +240,31 @@ printing, and psresize, for adjusting page sizes.") (("/bin/sh") (which "sh"))) #t)) ,@(if (%current-target-system) - `((add-after 'configure 'add-native-lz + `((add-after 'unpack 'define-ARCH_MAX_SIZE_T + (lambda _ + ;; XXX: arch_autoconf.h is missing the recent addition of + ;; ARCH_MAX_SIZE_T. Just add it here based on the definition + ;; in "base/genarch.c". This can likely be removed for + ;; Ghostscript > 9.51. + (substitute* "arch/arch_autoconf.h.in" + (("#define ARCH_MAX_ULONG.*" all) + (string-append all "\n" + "#define ARCH_MAX_SIZE_T " + "((size_t)~0L + (size_t)0)\n"))) + #t)) + (add-before 'configure 'do-not-fail-without-native-freetype + (lambda _ + ;; The configure script recurses to build the native tools. + ;; They are built with --disable-freetype, which was made a + ;; hard error in 9.51, causing a build failure because a + ;; native freetype is not detected. Just ignore the check + ;; because it's not needed for these auxiliary tools. + (substitute* "configure" + (("as_fn_error \\$\\? \"(No usable Freetype.*found)\".*" all msg) + (string-append "$as_echo \"$as_me:${as_lineno-$LINENO}: " + "WARNING: " msg "\"\n"))) + #t)) + (add-after 'configure 'add-native-lz (lambda _ ;; Add missing '-lz' for native tools such as 'mkromfs'. (substitute* "Makefile" diff --git a/gnu/packages/patches/ghostscript-CVE-2019-14869.patch b/gnu/packages/patches/ghostscript-CVE-2019-14869.patch deleted file mode 100644 index d80fba0594..0000000000 --- a/gnu/packages/patches/ghostscript-CVE-2019-14869.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix CVE-2019-14869: - -https://nvd.nist.gov/vuln/detail/CVE-2019-14869 - -Patch taken from upstream: - -https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=485904772c5f0aa1140032746e5a0abfc40f4cef - -diff --git a/Resource/Init/gs_ttf.ps b/Resource/Init/gs_ttf.ps -index 74043d1..6be8fe9 100644 ---- a/Resource/Init/gs_ttf.ps -+++ b/Resource/Init/gs_ttf.ps -@@ -1304,7 +1304,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - TTFDEBUG { (\n1 setting alias: ) print dup ==only - ( to be the same as ) print 2 index //== exec } if - -- 7 index 2 index 3 -1 roll exch .forceput -+ 7 index 2 index 3 -1 roll exch put - } forall - pop pop pop - } -@@ -1322,7 +1322,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - exch pop - TTFDEBUG { (\n2 setting alias: ) print 1 index ==only - ( to use glyph index: ) print dup //== exec } if -- 5 index 3 1 roll .forceput -+ 5 index 3 1 roll put - //false - } - { -@@ -1339,7 +1339,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - { % CharStrings(dict) isunicode(boolean) cmap(dict) RAGL(dict) gname(name) codep(integer) gindex(integer) - TTFDEBUG { (\3 nsetting alias: ) print 1 index ==only - ( to be index: ) print dup //== exec } if -- exch pop 5 index 3 1 roll .forceput -+ exch pop 5 index 3 1 roll put - } - { - pop pop -@@ -1369,7 +1369,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef - } ifelse - ] - TTFDEBUG { (Encoding: ) print dup === flush } if --} .bind executeonly odef % hides .forceput -+} .bind odef - - % ---------------- CIDFontType 2 font loading ---------------- % - diff --git a/gnu/packages/patches/ghostscript-no-header-uuid.patch b/gnu/packages/patches/ghostscript-no-header-uuid.patch index 473531220c..f4b55764c8 100644 --- a/gnu/packages/patches/ghostscript-no-header-uuid.patch +++ b/gnu/packages/patches/ghostscript-no-header-uuid.patch @@ -11,7 +11,7 @@ See: https://bugs.ghostscript.com/show_bug.cgi?id=698208 diff -ur orig/gnu-ghostscript-9.14.0/devices/vector/gdevpdfe.c aa/gnu-ghostscript-9.14.0/devices/vector/gdevpdfe.c --- orig/gnu-ghostscript-9.14.0/devices/vector/gdevpdfe.c 2017-07-09 23:30:28.960479189 +0200 +++ gnu-ghostscript-9.14.0/devices/vector/gdevpdfe.c 2017-07-10 01:04:12.252478276 +0200 -@@ -617,7 +617,7 @@ +@@ -620,7 +620,7 @@ return code; /* PDF/A XMP reference recommends setting UUID to empty. If not empty must be a URI */ @@ -20,13 +20,12 @@ diff -ur orig/gnu-ghostscript-9.14.0/devices/vector/gdevpdfe.c aa/gnu-ghostscrip instance_uuid[0] = 0x00; cre_date_time_len = pdf_get_docinfo_item(pdev, "/CreationDate", cre_date_time, sizeof(cre_date_time)); -@@ -719,15 +719,18 @@ +@@ -720,14 +720,17 @@ pdf_xml_tag_close(s, "rdf:Description"); pdf_xml_newline(s); - pdf_xml_tag_open_beg(s, "rdf:Description"); -- pdf_xml_attribute_name(s, "rdf:about"); -- pdf_xml_attribute_value(s, instance_uuid); +- pdf_xml_copy(s, " rdf:about=\"\""); - pdf_xml_attribute_name(s, "xmlns:xapMM"); - pdf_xml_attribute_value(s, "http://ns.adobe.com/xap/1.0/mm/"); - pdf_xml_attribute_name(s, "xapMM:DocumentID"); @@ -36,8 +35,7 @@ diff -ur orig/gnu-ghostscript-9.14.0/devices/vector/gdevpdfe.c aa/gnu-ghostscrip + if (!getenv("GS_GENERATE_UUIDS") || (strcasecmp(getenv("GS_GENERATE_UUIDS"), "0") != 0 && strcasecmp(getenv("GS_GENERATE_UUIDS"), "no") != 0)) + { + pdf_xml_tag_open_beg(s, "rdf:Description"); -+ pdf_xml_attribute_name(s, "rdf:about"); -+ pdf_xml_attribute_value(s, instance_uuid); ++ pdf_xml_copy(s, " rdf:about=\"\""); + pdf_xml_attribute_name(s, "xmlns:xapMM"); + pdf_xml_attribute_value(s, "http://ns.adobe.com/xap/1.0/mm/"); + pdf_xml_attribute_name(s, "xapMM:DocumentID"); @@ -47,4 +45,4 @@ diff -ur orig/gnu-ghostscript-9.14.0/devices/vector/gdevpdfe.c aa/gnu-ghostscrip + } pdf_xml_tag_open_beg(s, "rdf:Description"); - pdf_xml_attribute_name(s, "rdf:about"); + pdf_xml_copy(s, " rdf:about=\"\""); -- cgit v1.2.3 From ef4c5a413e099e58ccfddff1586d941b7c3ab2df Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 01:23:58 +0100 Subject: gnu: gimp: Do not run gtk-update-icon-cache during the build process. * gnu/packages/gimp.scm (gimp)[arguments]: Add "ac_cv_path_GTK_UPDATE_ICON_CACHE" in #:configure-flags. --- gnu/packages/gimp.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 8aa69da7c3..9ff380e167 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Thorsten Wilms +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -151,6 +152,10 @@ buffers.") (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") "/share/gtk-doc/html") + ;; Prevent the build system from running 'gtk-update-icon-cache' + ;; which is not needed during the build because Guix runs it at + ;; profile creation time. + "ac_cv_path_GTK_UPDATE_ICON_CACHE=true" ;; ./configure requests not to annoy upstream with packaging bugs. "--with-bug-report-url=https://bugs.gnu.org/guix") #:phases -- cgit v1.2.3 From 75ca2cdaff06b125b39a4f71499efcb73aa94b6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 01:24:41 +0100 Subject: gnu: innoextract: Fix build failure with recent Boost and CMake. * gnu/packages/compression.scm (innoextract)[arguments]: Add #:configure-flags to prevent usage of Boost's CMake scripts. While at it, remove the obsolete #:phases. --- gnu/packages/compression.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index c3b5632cba..0dec28940b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1781,17 +1781,7 @@ single-member files which can't be decompressed in parallel.") (build-system cmake-build-system) (arguments `(#:tests? #f - #:phases (modify-phases %standard-phases - (add-before 'configure 'glibc-is-already-a-system-library - (lambda _ - ;; Prevent the build system from passing the glibc - ;; header files to GCC as "system headers", because - ;; it conflicts with the system headers already known - ;; to GCC, causing #include_next failures. - (substitute* "CMakeLists.txt" - (("include_directories\\(SYSTEM \\$\\{iconv") - "include_directories(${iconv")) - #t))))) + #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON"))) (inputs `(("boost" ,boost) ("libiconv" ,libiconv) ("xz" ,xz))) -- cgit v1.2.3 From 641b9c51b7f21ecf7e3eeca6d3c2c0ceb14c9027 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 01:25:08 +0100 Subject: gnu: log4cpp: Fix build with glibc 2.31. * gnu/packages/logging.scm (log4cpp)[arguments]: New field. --- gnu/packages/logging.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index d75c44aea6..86ebee35cd 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019 Meiyo Peng +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,17 @@ (base32 "07gmr3jyaf2239n9sp6h7hwdz1pv7b7aka8n06gmr2fnlmaymfrc")))) (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-call-stime + (lambda _ + ;; Patch out use of 'stime' which was removed from glibc 2.31. + ;; The test would not work in the build container anyway. + (substitute* "tests/testDailyRollingFileAppender.cpp" + (("if \\(stime\\(&now\\) == -1\\)") + "if (1)")) + #t))))) (synopsis "Log library for C++") (description "Log4cpp is library of C++ classes for flexible logging to files, syslog, -- cgit v1.2.3 From e59d958a9c9a509ce34ca553a5b1b03e406d561f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 12:00:56 +0100 Subject: gnu: mit-krb5: Fix segfault in gsasl test suite. * gnu/packages/patches/mit-krb5-qualify-short-hostnames.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/kerberos.scm (mit-krb5)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/kerberos.scm | 1 + .../patches/mit-krb5-qualify-short-hostnames.patch | 29 ++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 gnu/packages/patches/mit-krb5-qualify-short-hostnames.patch diff --git a/gnu/local.mk b/gnu/local.mk index ebb6b859b3..2ccffb333a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1187,6 +1187,7 @@ dist_patch_DATA = \ %D%/packages/patches/mingw-w64-6.0.0-gcc.patch \ %D%/packages/patches/minisat-friend-declaration.patch \ %D%/packages/patches/minisat-install.patch \ + %D%/packages/patches/mit-krb5-qualify-short-hostnames.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/monero-use-system-miniupnpc.patch \ diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index af3a0d18b2..0e290c0d46 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -60,6 +60,7 @@ (string-append "https://kerberos.org/dist/krb5/" (version-major+minor version) "/krb5-" version ".tar.gz"))) + (patches (search-patches "mit-krb5-qualify-short-hostnames.patch")) (sha256 (base32 "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk")))) diff --git a/gnu/packages/patches/mit-krb5-qualify-short-hostnames.patch b/gnu/packages/patches/mit-krb5-qualify-short-hostnames.patch new file mode 100644 index 0000000000..491a358731 --- /dev/null +++ b/gnu/packages/patches/mit-krb5-qualify-short-hostnames.patch @@ -0,0 +1,29 @@ +Fix a null pointer dereference when no DNS search path is configured. +This showed up as a segfault while running the gsasl test suite. + +Taken from upstream: +https://github.com/krb5/krb5/commit/cd82bf377e7fad2409c76bf8b241920692f34fda + +diff --git a/src/lib/krb5/os/dnsglue.c b/src/lib/krb5/os/dnsglue.c +index e35ca9d76c..0cd213fdd7 100644 +--- a/src/lib/krb5/os/dnsglue.c ++++ b/src/lib/krb5/os/dnsglue.c +@@ -91,7 +91,7 @@ static int initparse(struct krb5int_dns_state *); + #define DECLARE_HANDLE(h) struct __res_state h + #define INIT_HANDLE(h) (memset(&h, 0, sizeof(h)), res_ninit(&h) == 0) + #define SEARCH(h, n, c, t, a, l) res_nsearch(&h, n, c, t, a, l) +-#define PRIMARY_DOMAIN(h) strdup(h.dnsrch[0]) ++#define PRIMARY_DOMAIN(h) ((h.dnsrch[0] == NULL) ? NULL : strdup(h.dnsrch[0])) + #if HAVE_RES_NDESTROY + #define DESTROY_HANDLE(h) res_ndestroy(&h) + #else +@@ -104,7 +104,8 @@ static int initparse(struct krb5int_dns_state *); + #define DECLARE_HANDLE(h) + #define INIT_HANDLE(h) (res_init() == 0) + #define SEARCH(h, n, c, t, a, l) res_search(n, c, t, a, l) +-#define PRIMARY_DOMAIN(h) strdup(_res.defdname) ++#define PRIMARY_DOMAIN(h) \ ++ ((_res.defdname == NULL) ? NULL : strdup(_res.defdname)) + #define DESTROY_HANDLE(h) + + #endif -- cgit v1.2.3 From 7cf79d7a51ff5dde4fc430fab2296b5f7de08953 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 12:01:23 +0100 Subject: gnu: kiki: Adjust for CPLUS_INCLUDE_PATH change. * gnu/packages/games.scm (kiki)[arguments]: Prepend to CPLUS_INCLUDE_PATH instead of overriding it. --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 43199d2850..224ab7fb2d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4525,7 +4525,8 @@ over 100 user-created campaigns.") (string-append (assoc-ref inputs "sdl-union") "/include/SDL:" (assoc-ref inputs "python") - "/include/python2.7")) + "/include/python2.7:" + (or (getenv "CPLUS_INCLUDE_PATH") ""))) (substitute* "src/main/main.cpp" (("#include " line) (string-append line " -- cgit v1.2.3 From f77ab2abdfd55a38fcbb0e8ebcc4871ab4986bdc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 13:18:23 +0100 Subject: gnu: bluez: Incorporate grafted changes. * gnu/packages/linux.scm (bluez)[replacement]: Remove. [source](patches): New field. (bluez/fixed): Remove variable. --- gnu/packages/linux.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index acfee1ac02..04788d2f8a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4079,13 +4079,13 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (replacement bluez/fixed) (version "5.53") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/bluetooth/bluez-" version ".tar.xz")) + (patches (search-patches "bluez-CVE-2020-0556.patch")) (sha256 (base32 "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq")))) @@ -4145,14 +4145,6 @@ Bluetooth audio output devices like headphones or loudspeakers.") is flexible, efficient and uses a modular implementation.") (license license:gpl2+))) -(define bluez/fixed - (package - (inherit bluez) - (source (origin - (inherit (package-source bluez)) - (patches (append (origin-patches (package-source bluez)) - (search-patches "bluez-CVE-2020-0556.patch"))))))) - (define-public fuse-exfat (package (name "fuse-exfat") -- cgit v1.2.3 From d594963856690f1aacf228c8a83e406d33bc44ce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 13:19:06 +0100 Subject: gnu: eudev: Remove bugfix variant. * gnu/packages/linux.scm (eudev/btrfs-fix): Remove variable. (eudev)[arguments]: Add phase patch-bindir-in-btrfs-rules. * gnu/services/base.scm (, udev-service): Refer to EUDEV instead of EUDEV/BTRFS-FIX. --- gnu/packages/linux.scm | 30 ++++++++++-------------------- gnu/services/base.scm | 4 ++-- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 04788d2f8a..b0600642d5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2871,6 +2871,16 @@ to the in-kernel OOM killer.") (or native-inputs inputs) "xsltproc") "/bin/xsltproc"))) #t)) + (add-before 'configure 'patch-bindir-in-btrfs-rules + (lambda* (#:key outputs #:allow-other-keys) + ;; The "@bindir@" substitution incorrectly expands to a literal + ;; "${exec_prefix}" (see ). Work + ;; around it. + (let ((out (assoc-ref outputs "out"))) + (substitute* "rules/64-btrfs.rules.in" + (("@bindir@") + (string-append out "/bin"))) + #t))) (add-after 'install 'move-static-library (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -2927,26 +2937,6 @@ device nodes from /dev/, handles hotplug events and loads drivers at boot time.") (license license:gpl2+))) -;; TODO: Merge with eudev on the next rebuild cycle. -(define-public eudev/btrfs-fix - (package/inherit - eudev - (version (string-append (package-version eudev) "-1")) - (arguments - (substitute-keyword-arguments (package-arguments eudev) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-before 'configure 'patch-bindir-in-btrfs-rules - (lambda* (#:key outputs #:allow-other-keys) - ;; The "@bindir@" substitution incorrectly expands to a literal - ;; "${exec_prefix}" (see ). Work - ;; around it. - (let ((out (assoc-ref outputs "out"))) - (substitute* "rules/64-btrfs.rules.in" - (("@bindir@") - (string-append out "/bin"))) - #t))))))))) - (define-public eudev-with-hwdb (deprecated-package "eudev-with-hwdb" eudev)) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index ceb6374bfc..b39d0f6610 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1918,7 +1918,7 @@ archive}). If that is not the case, the service will fail to start." udev-configuration make-udev-configuration udev-configuration? (udev udev-configuration-udev ; - (default eudev/btrfs-fix)) + (default eudev)) (rules udev-configuration-rules ;list of (default '()))) @@ -2116,7 +2116,7 @@ the udev rules in use.") directory dynamically. Get extra rules from the packages listed in the @code{rules} field of its value, @code{udev-configuration} object."))) -(define* (udev-service #:key (udev eudev/btrfs-fix) (rules '())) +(define* (udev-service #:key (udev eudev) (rules '())) "Run @var{udev}, which populates the @file{/dev} directory dynamically. Get extra rules from the packages listed in @var{rules}." (service udev-service-type -- cgit v1.2.3 From 56c833ea287f8f6d3c72f8bddc314960c0164d64 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 16:03:16 +0100 Subject: gnu: gcc@4.9, gcc@5: Adjust for CPLUS_INCLUDE_PATH changes. * gnu/packages/gcc.scm (gcc-4.9): Unless cross-compiling, add ... [arguments]: with a phase to remove glibc and GCC from CPLUS_INCLUDE_PATH. (gcc-6)[arguments]: Inherit from GCC-4.8. --- gnu/packages/gcc.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 6f2883042d..0b203d5d71 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -422,7 +422,33 @@ Go. It also includes runtime support libraries for these languages.") #t)))) ;; Override inherited texinfo-5 with latest version. (native-inputs `(("perl" ,perl) ;for manpages - ("texinfo" ,texinfo))))) + ("texinfo" ,texinfo))) + (arguments + (if (%current-target-system) + (package-arguments gcc-4.8) + ;; For native builds of GCC 4.9 and GCC 5, the C++ include path needs + ;; to be adjusted so it does not interfere with GCC's own build processes. + (substitute-keyword-arguments (package-arguments gcc-4.8) + ((#:modules modules %gnu-build-system-modules) + `((srfi srfi-1) + ,@modules)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc")) + (gcc (assoc-ref inputs "gcc"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join (fold delete + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:) + (list (string-append libc "/include") + (string-append gcc "/include/c++"))) + ":")) + (format #t + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH")) + #t)))))))))) (define-public gcc-5 ;; Note: GCC >= 5 ships with .info files but 'make install' fails to install @@ -479,6 +505,10 @@ Go. It also includes runtime support libraries for these languages.") "gcc-6-source-date-epoch-1.patch" "gcc-6-source-date-epoch-2.patch" "gcc-5.0-libvtv-runpath.patch")))) + + ;; GCC 4.9 and 5 has a workaround that is not needed for GCC 6 and later. + (arguments (package-arguments gcc-4.8)) + (inputs `(("isl" ,isl) ,@(package-inputs gcc-4.7))))) -- cgit v1.2.3 From f42bfc7a99b1e152cd014fca069083527f10665c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 16:04:53 +0100 Subject: gnu: clang: Switch to 'C_INCLUDE_PATH' & co. * gnu/packages/llvm.scm (clang-from-llvm)[native-search-paths]: Remove "CPATH", and add "C_INCLUDE_PATH" and "CPLUS_INCLUDE_PATH". --- gnu/packages/llvm.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 1286fe521b..3909039f3e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -339,8 +339,11 @@ compiler. In LLVM this library is called \"compiler-rt\".") ;; Clang supports the same environment variables as GCC. (native-search-paths (list (search-path-specification - (variable "CPATH") + (variable "C_INCLUDE_PATH") (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include/c++" "include"))) (search-path-specification (variable "LIBRARY_PATH") (files '("lib" "lib64"))))) -- cgit v1.2.3 From 40a461fd97fb865987e4f6cc41fee6ee6408851d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 16:08:06 +0100 Subject: gnu: libcxx: Hide GCC's C++ headers during the build process. * gnu/packages/llvm.scm (libcxx)[arguments]: New field. --- gnu/packages/llvm.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 3909039f3e..ef273e3ef6 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -671,6 +671,23 @@ output), and Binutils.") (base32 "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089")))) (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases (@ (guix build cmake-build-system) %standard-phases) + (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + ;; Hide GCC's C++ headers so that they do not interfere with + ;; the ones we are attempting to build. + (setenv "CPLUS_INCLUDE_PATH" + (string-join (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:)) + ":")) + (format #t + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH")) + #t)))))) (native-inputs `(("clang" ,clang) ("llvm" ,llvm))) -- cgit v1.2.3 From d8f78f54489eae44ffbee3f2af7bbc130e8c0c72 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 15:31:58 +0100 Subject: gnu: ld-wrapper: Use _IOLBF on Guile 2.0 only. * gnu/packages/base.scm (make-ld-wrapper)[arguments]: Wrap use of '_IOLBF' in 'cond-expand' and use 'line instead on Guile > 2.0. --- gnu/packages/base.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d74d304de1..196106fa29 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -546,7 +546,9 @@ wrapper for the cross-linker for that target, called 'TARGET-ld'." '(string-append bin "/ld"))) (go (string-append ld ".go"))) - (setvbuf (current-output-port) _IOLBF) + (setvbuf (current-output-port) + (cond-expand (guile-2.0 _IOLBF) + (else 'line))) (format #t "building ~s/bin/ld wrapper in ~s~%" (assoc-ref %build-inputs "binutils") out) -- cgit v1.2.3 From b6bee63bed4f013064c0d902e7c8b83ed7514ade Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Feb 2020 00:20:30 +0100 Subject: gnu: Default to Guile 3.0. This patch changes three things: 1. package derivations are built using Guile 3.0; 2. 'gexp->derivation' defaults to Guile 3.0; 3. "guile3.0-" packages are deprecated aliases for the regular package, which now depends on Guile 3.0; "guile2.2-" packages are introduced; "guile-next" is renamed to "guile". * gnu/packages/guile.scm (guile-2.0/fixed): Remove. (guile-3.0/fixed): New variable. (package-for-guile-3.0): Remove. (package-for-guile-2.2): New variable. (define-deprecated-guile3.0-package): New macro. (guile-3.0)[name]: Change to "guile". (guile-json-3)[native-inputs, inputs]: New fields. (guile2.2-json): New variable. (guile3.0-json): Deprecate. (guile-gdbm-ffi)[native-inputs]: Switch to GUILE-3.0. (guile2.2-gdbm-ffi): New variable. (guile3.0-gdbm-ffi): Deprecate. (guile-sqlite3): Switch to GUILE-3.0. (guile2.2-sqlite3): New variable. (guile3.0-sqlite3): Deprecate. (guile-bytestructures): Switch to GUILE-3.0. (guile2.2-bytestructures): New variable. (guile3.0-bytestructures): Deprecate. (guile-git): Switch to GUILE-3.0. (guile2.2-git): New variable. (guile3.0-git): Deprecate. (guile-2.2/bug-fix): * gnu/packages/ci.scm (cuirass): Switch to GUILE-3.0. * gnu/packages/emacs-xyz.scm (emacs-guix): Switch to GUILE-3.0. * gnu/packages/gtk.scm (guile-cairo)[arguments]: New field. Switch to GUILE-3.0. (guile2.2-cairo): New variable. (guile3.0-cairo): Deprecate. (guile-rsvg): Switch to GUILE-3.0. (guile2.2-cairo): New variable. (guile3.0-cairo): Deprecate. (guile-present): Switch to GUILE-3.0. (guile2.2-present): New variable. (guile3.0-present): Deprecate. (guile-gnome)[propagated-inputs]: Use GUILE2.2-CAIRO and GUILE2.2-LIB. * gnu/packages/guile-xyz.scm (guile-fibers)[arguments]: Add #:configure-flags. Switch to GUILE-3.0. (guile2.2-fibers): New variable. (guile3.0-fibers): Deprecate. (guile-syntax-highlight): Switch to GUILE-3.0. (guile2.2-syntax-highlight): New variable. (guile3.0-syntax-highlight): Deprecate. (guile-colorized): Switch to GUILE-3.0. (guile2.2-colorized): New variable. (guile3.0-colorized): Deprecate. (guile-pfds): Switch to GUILE-3.0. (guile2.2-pfds): New variable. (guile3.0-pfds): Deprecate. (guile-simple-zmq): Switch to GUILE-3.0. (guile2.2-simple-zmq): New variable. (guile3.0-simple-zmq): Deprecate. (guile-newt): Switch to GUILE-3.0. (guile2.2-newt): New variable. (guile3.0-newt): Deprecate. (guile-parted): Switch to GUILE-3.0. (guile2.2-parted): New variable. (guile3.0-parted): Deprecate. (guile-config): Switch to GUILE-3.0. (guile2.2-config): New variable. (guile3.0-config): Deprecate. (guile-hall): Switch to GUILE-3.0. (guile2.2-hall): New variable. (guile3.0-hall): Deprecate. (guile-ics): Switch to GUILE-3.0. (guile2.2-ics): New variable. (guile3.0-ics): Deprecate. (guile-wisp)[arguments]: Add 'support-guile-3.0' phase. Switch to GUILE-3.0. (guile2.2-wisp): New variable. (guile3.0-wisp): Deprecate. (guile-lib): Switch to GUILE-3.0. (guile2.2-lib): New variable. (guile3.0-lib): Deprecate. (guile-minikanren): Switch to GUILE-3.0. (guile2.2-minikanren): New variable. (guile3.0-minikanren): Deprecate. (guile-irregex): Switch to GUILE-3.0. (guile2.2-irregex): New variable. (guile3.0-irregex): Deprecate. (haunt): Switch to GUILE-3.0, and remove GUILE-READER. (guile2.2-haunt): New variable. (guile3.0-haunt): Deprecate. (guile-commonmark): Switch to GUILE-3.0. (guile2.2-commonmark): New variable. (guile3.0-commonmark): Deprecate. (mcron): Switch to GUILE-3.0. (guile2.0-mcron): New variable. (guile3.0-mcron): Deprecate. (guile-picture-language): Switch to GUILE-3.0. (guile2.2-picture-language): New variable. (guile3.0-picture-language): Deprecate. (guile-gi): Switch to GUILE-3.0. (guile2.2-gi): New variable. (guile3.0-gi): Deprecate. (guile-hashing): Switch to GUILE-3.0. (guile2.2-hashing): New variable. (guile3.0-hashing): Deprecate. * gnu/packages/package-management.scm (guix): Switch to GUILE-3.0. (guile2.2-guix): New variable. (guile3.0-guix): Deprecate. (gwl): Replace "guile3.0-" with "guile-". (guix-jupyter)[source]: Adjust for Guile 3.0. Switch to GUILE-3.0. * gnu/packages/ssh.scm (guile-ssh): Switch to GUILE-3.0. (guile2.2-ssh): New variable. (guile3.0-ssh): Deprecate. * gnu/packages/admin.scm (shepherd): Switch to GUILE-3.0. (guile2.2-shepherd): New variable. (guile3.0-shepherd): Deprecate. * gnu/packages/mail.scm (mailutils): Switch to GUILE-3.0. (guile2.2-mailutils): New variable. (guile3.0-mailutils): Deprecate. * gnu/packages/plotutils.scm (guile-charting): Switch to GUILE-3.0. (guile2.2-charting): New variable. (guile3.0-charting): Deprecate. * gnu/packages/version-control.scm (libgit2): Switch to GUILE-3.0. * gnu/packages/vpn.scm (vpnc-scripts): Switch to GUILE-3.0. * gnu/packages/web.scm (guix-data-service): Switch to GUILE-3.0. (hpcguix-web): Switch to GUILE-3.0. * guix/self.scm (specification->package): Refer to the "guile-" variants instead of "guile3.0-". * guix/gexp.scm (default-guile): Change to GUILE-3.0. * build-aux/build-self.scm (build): #:guile-version defaults to "3.0". * gnu/packages/commencement.scm (guile-final): Base on GUILE-3.0/FIXED. --- build-aux/build-self.scm | 4 +- gnu/packages/admin.scm | 15 +- gnu/packages/ci.scm | 2 +- gnu/packages/commencement.scm | 2 +- gnu/packages/emacs-xyz.scm | 4 +- gnu/packages/gnupg.scm | 16 +-- gnu/packages/gtk.scm | 59 ++++---- gnu/packages/guile-xyz.scm | 269 ++++++++++++++++++++++-------------- gnu/packages/guile.scm | 96 +++++++++---- gnu/packages/mail.scm | 11 +- gnu/packages/package-management.scm | 63 +++++---- gnu/packages/plotutils.scm | 13 +- gnu/packages/ssh.scm | 15 +- gnu/packages/version-control.scm | 2 +- gnu/packages/vpn.scm | 4 +- gnu/packages/web.scm | 2 +- guix/gexp.scm | 4 +- guix/self.scm | 10 +- 18 files changed, 358 insertions(+), 233 deletions(-) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index f2e785b7f1..b30adfeb9f 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -383,11 +383,11 @@ interface (FFI) of Guile.") #:key verbose? (version (date-version-string)) system (pull-version 0) - ;; For the standalone Guix, default to Guile 2.2. For old + ;; For the standalone Guix, default to Guile 3.0. For old ;; versions of 'guix pull' (pre-0.15.0), we have to use the ;; same Guile as the current one. (guile-version (if (> pull-version 0) - "2.2" + "3.0" (effective-version))) #:allow-other-keys diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 63ee6dd53f..90252fc413 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -211,10 +211,10 @@ and provides a \"top-like\" mode (monitoring).") `(("pkg-config" ,pkg-config) ;; This is the Guile we use as a cross-compiler... - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (inputs ;; ... and this is the one that appears in shebangs when cross-compiling. - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ;; The 'shepherd' command uses Readline when used interactively. It's ;; an unusual use case though, so we don't propagate it. @@ -228,15 +228,18 @@ interface and is based on GNU Guile.") (license license:gpl3+) (home-page "https://www.gnu.org/software/shepherd/"))) -(define-public guile3.0-shepherd +(define-public guile2.2-shepherd (package (inherit shepherd) - (name "guile3.0-shepherd") + (name "guile2.2-shepherd") (native-inputs `(("pkg-config" ,pkg-config) - ("guile" ,guile-next))) + ("guile" ,guile-2.2))) (inputs - `(("guile" ,guile-next))))) + `(("guile" ,guile-2.2))))) + +(define-public guile3.0-shepherd + (deprecated-package "guile3.0-shepherd" shepherd)) (define-public cloud-utils (package diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 24de11b713..a5474e0a96 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -120,7 +120,7 @@ `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) #t)))))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-3) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index cebb4b5a68..65797af244 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3589,7 +3589,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; This package must be public because other modules refer to it. However, ;; mark it as hidden so that 'fold-packages' ignores it. (with-boot4 (hidden-package - (package-with-bootstrap-guile guile-2.2/fixed)))) + (package-with-bootstrap-guile guile-3.0/fixed)))) (define glibc-utf8-locales-final ;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e2b067e1dc..092bb6f2a0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Alex Kost ;;; Copyright © 2015 Federico Beffa @@ -2207,7 +2207,7 @@ type, for example: packages, buffers, files, etc.") `(("pkg-config" ,pkg-config) ("emacs" ,emacs-minimal))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("guix" ,guix))) (propagated-inputs `(("geiser" ,emacs-geiser) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 5d389d165c..9b6019007e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2015, 2018 Andreas Enge ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -493,7 +493,7 @@ gpgpme starting with version 1.7.") ("texinfo" ,texinfo) ("guile" ,guile-2.2))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("libgcrypt" ,libgcrypt))) (synopsis "Cryptography library for Guile using Libgcrypt") (description @@ -514,17 +514,17 @@ interface (FFI) of Guile.") `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) -(define-public guile3.0-gcrypt +(define-public guile2.2-gcrypt (package (inherit guile-gcrypt) - (name "guile3.0-gcrypt") - (native-inputs - `(("guile" ,guile-next) - ,@(alist-delete "guile" (package-native-inputs guile-gcrypt)))) + (name "guile2.2-gcrypt") (inputs - `(("guile" ,guile-next) + `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) +(define-public guile3.0-gcrypt + (deprecated-package "guile3.0-gcrypt" guile-gcrypt)) + (define-public python-gpg (package (name "python-gpg") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 76766a1b1f..10173bf124 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -875,10 +875,14 @@ application suites.") "#include \n#include \n")) #t))))) (build-system gnu-build-system) + (arguments + ;; Uses of 'scm_t_uint8' & co. are deprecated; don't stop the build + ;; because of them. + '(#:configure-flags '("--disable-Werror"))) (inputs `(("guile-lib" ,guile-lib) ("expat" ,expat) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (propagated-inputs ;; The .pc file refers to 'cairo'. `(("cairo" ,cairo))) @@ -895,22 +899,19 @@ graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment.") (license license:lgpl3+))) -(define-public guile3.0-cairo +(define-public guile2.2-cairo (package (inherit guile-cairo) - (name "guile3.0-cairo") - (arguments - (substitute-keyword-arguments (package-arguments guile-cairo) - ((#:configure-flags flags ''()) - ;; Uses of 'scm_t_uint8' & co. are deprecated; don't stop the build - ;; because of them. - `(cons "--disable-Werror" ,flags)))) + (name "guile2.2-cairo") (inputs - `(("guile" ,guile-3.0) - ("guile-lib" ,guile3.0-lib) + `(("guile" ,guile-2.2) + ("guile-lib" ,guile2.2-lib) ,@(fold alist-delete (package-inputs guile-cairo) '("guile" "guile-lib")))))) +(define-public guile3.0-cairo + (deprecated-package "guile3.0-cairo" guile-cairo)) + (define-public guile-rsvg ;; Use a recent snapshot that supports Guile 2.2 and beyond. (let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678") @@ -947,7 +948,7 @@ exceptions, macros, and a dynamic programming environment.") ("automake" ,automake) ("libtool" ,libtool) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.2) + (inputs `(("guile" ,guile-3.0) ("librsvg" ,librsvg) ("guile-lib" ,guile-lib))) ;for (unit-test) (propagated-inputs `(("guile-cairo" ,guile-cairo))) @@ -958,16 +959,19 @@ images onto Cairo surfaces.") (home-page "http://wingolog.org/projects/guile-rsvg/") (license license:lgpl2.1+)))) -(define-public guile3.0-rsvg +(define-public guile2.2-rsvg (package (inherit guile-rsvg) - (name "guile3.0-rsvg") + (name "guile2.2-rsvg") (inputs - `(("guile" ,guile-3.0) - ("guile-lib" ,guile3.0-lib) + `(("guile" ,guile-2.2) + ("guile-lib" ,guile2.2-lib) ,@(fold alist-delete (package-inputs guile-rsvg) '("guile" "guile-lib")))) - (propagated-inputs `(("guile-cairo" ,guile3.0-cairo))))) + (propagated-inputs `(("guile-cairo" ,guile2.2-cairo))))) + +(define-public guile3.0-rsvg + (deprecated-package "guile3.0-rsvg" guile-rsvg)) (define-public guile-present (package @@ -1013,7 +1017,7 @@ images onto Cairo surfaces.") out "/lib/guile/" version "/site-ccache ")))) #t))))) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (propagated-inputs ;; These are used by the (present …) modules. `(("guile-lib" ,guile-lib) @@ -1029,15 +1033,18 @@ includes a tools to generate PDF presentations out of Org mode and Texinfo documents.") (license license:lgpl3+))) -(define-public guile3.0-present +(define-public guile2.2-present (package (inherit guile-present) - (name "guile3.0-present") - (inputs `(("guile" ,guile-3.0))) + (name "guile2.2-present") + (inputs `(("guile" ,guile-2.2))) (propagated-inputs - `(("guile-lib" ,guile3.0-lib) - ("guile-cairo" ,guile3.0-cairo) - ("guile-rsvg" ,guile3.0-rsvg))))) + `(("guile-lib" ,guile2.2-lib) + ("guile-cairo" ,guile2.2-cairo) + ("guile-rsvg" ,guile2.2-rsvg))))) + +(define-public guile3.0-present + (deprecated-package "guile3.0-present" guile-present)) (define-public guile-gnome (package @@ -1072,9 +1079,9 @@ documents.") ("glib" ,glib))) (inputs `(("guile" ,guile-2.2))) (propagated-inputs - `(("guile-cairo" ,guile-cairo) + `(("guile-cairo" ,guile2.2-cairo) ("g-wrap" ,g-wrap) - ("guile-lib" ,guile-lib))) + ("guile-lib" ,guile2.2-lib))) (arguments `(#:tests? #f ;FIXME #:phases (modify-phases %standard-phases diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9f8173657e..0ee712b6f5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -523,7 +523,9 @@ Unix-style DSV format and RFC 4180 format.") #t)))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases + '(;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0. + #:configure-flags '("CFLAGS=-Wno-error=deprecated-declarations") + #:phases (modify-phases %standard-phases (add-after 'install 'mode-guile-objects (lambda* (#:key outputs #:allow-other-keys) ;; .go files are installed to "lib/guile/X.Y/cache". @@ -540,7 +542,7 @@ Unix-style DSV format and RFC 4180 format.") `(("texinfo" ,texinfo) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (synopsis "Lightweight concurrency facility for Guile") (description "Fibers is a Guile library that implements a a lightweight concurrency @@ -556,15 +558,14 @@ is not available for Guile 2.0.") (home-page "https://github.com/wingo/fibers") (license license:lgpl3+))) -(define-public guile3.0-fibers +(define-public guile2.0-fibers (package (inherit guile-fibers) - (name "guile3.0-fibers") - (arguments - ;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0. - `(#:configure-flags '("CFLAGS=-Wno-error=deprecated-declarations") - ,@(package-arguments guile-fibers))) - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-fibers") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-fibers + (deprecated-package "guile3.0-fibers" guile-fibers)) (define-public guile-syntax-highlight (package @@ -591,7 +592,7 @@ is not available for Guile 2.0.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (synopsis "General-purpose syntax highlighter for GNU Guile") (description "Guile-syntax-highlight is a general-purpose syntax highlighting library for GNU Guile. It can parse code written in various @@ -600,11 +601,14 @@ HTML (via SXML) or any other format for rendering.") (home-page "http://dthompson.us/projects/guile-syntax-highlight.html") (license license:lgpl3+))) -(define-public guile3.0-syntax-highlight +(define-public guile2.2-syntax-highlight (package (inherit guile-syntax-highlight) - (name "guile3.0-syntax-highlight") - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-syntax-highlight") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-syntax-highlight + (deprecated-package "guile3.0-syntax-highlight" guile-syntax-highlight)) (define-public guile-sjson (package @@ -692,18 +696,21 @@ using Guile's foreign function interface.") (base32 "10mv8c63159r3qvwwdvsgnsvdg7nc2ghak85zapwqpv4ywrqp9zc")))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (home-page "https://gitlab.com/NalaGinrut/guile-colorized") (synopsis "Colorized REPL for Guile") (description "Guile-colorized provides you with a colorized REPL for GNU Guile.") (license license:gpl3+))) -(define-public guile3.0-colorized +(define-public guile2.2-colorized (package (inherit guile-colorized) - (name "guile3.0-colorized") - (native-inputs `(("guile" ,guile-next))))) + (name "guile2.2-colorized") + (native-inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-colorized + (deprecated-package "guile3.0-colorized" guile-colorized)) (define-public guile-pfds (package @@ -723,6 +730,14 @@ using Guile's foreign function interface.") (arguments '(#:source-directory "src" #:phases (modify-phases %standard-phases + (add-after 'unpack 'work-around-guile-bug + (lambda _ + ;; See bug #39210. + (substitute* '("fingertrees.sls" + "queues/private/condition.sls" + "deques/private/condition.sls") + (("&assertion") "&violation")) + #t)) (add-after 'unpack 'move-files-around (lambda _ ;; Move files under a pfds/ directory to reflect the @@ -756,7 +771,7 @@ using Guile's foreign function interface.") (find-files "." "\\.sls$")) #t))))) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (synopsis "Purely functional data structures for Guile") (description "This package provides purely functional data structures written in R6RS @@ -777,23 +792,19 @@ Vicare Scheme and IronScheme. Right now it contains: @end itemize\n") (license license:bsd-3))) -(define-public guile3.0-pfds +(define-public guile2.2-pfds (package (inherit guile-pfds) - (name "guile3.0-pfds") - (native-inputs `(("guile" ,guile-3.0))) + (name "guile2.2-pfds") + (native-inputs `(("guile" ,guile-2.2))) (arguments (substitute-keyword-arguments (package-arguments guile-pfds) ((#:phases phases) `(modify-phases ,phases - (add-after 'unpack 'work-around-guile-bug - (lambda _ - ;; See bug #39210. - (substitute* '("fingertrees.sls" - "queues/private/condition.sls" - "deques/private/condition.sls") - (("&assertion") "&violation")) - #t)))))))) + (delete 'work-around-guile-bug))))))) + +(define-public guile3.0-pfds + (deprecated-package "guile3.0-pfds" guile-pfds)) (define-public guile-aa-tree (package @@ -847,7 +858,7 @@ convenient nested tree operations.") (assoc-ref inputs "zeromq")))) #t))))) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (inputs `(("zeromq" ,zeromq))) (home-page "https://github.com/jerry40/guile-simple-zmq") @@ -857,11 +868,14 @@ convenient nested tree operations.") messaging library.") (license license:gpl3+)))) -(define-public guile3.0-simple-zmq +(define-public guile2.2-simple-zmq (package (inherit guile-simple-zmq) - (name "guile3.0-simple-zmq") - (native-inputs `(("guile" ,guile-next))))) + (name "guile2.2-simple-zmq") + (native-inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-simple-zmq + (deprecated-package "guile3.0-simple-zmq" guile-simple-zmq)) (define-public jupyter-guile-kernel (let ((commit "a7db9245a886e104138474df46c3e88b95cff629") @@ -1068,7 +1082,7 @@ format.") '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("newt" ,newt))) (native-inputs `(("autoconf" ,autoconf) @@ -1082,13 +1096,16 @@ Scheme by using Guile’s foreign function interface.") (home-page "https://gitlab.com/mothacehe/guile-newt") (license license:gpl3+))) -(define-public guile3.0-newt +(define-public guile2.2-newt (package (inherit guile-newt) - (name "guile3.0-newt") + (name "guile2.2-newt") (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-newt)))))) +(define-public guile3.0-newt + (deprecated-package "guile3.0-newt" guile-newt)) + (define-public guile-mastodon (package (name "guile-mastodon") @@ -1149,7 +1166,7 @@ microblogging service.") '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("parted" ,parted))) (propagated-inputs `(("guile-bytestructures" ,guile-bytestructures))) @@ -1165,14 +1182,17 @@ written in pure Scheme by using Guile's foreign function interface.") (home-page "https://gitlab.com/mothacehe/guile-parted") (license license:gpl3+))) -(define-public guile3.0-parted +(define-public guile2.2-parted (package (inherit guile-parted) - (name "guile3.0-parted") + (name "guile2.2-parted") (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-parted)))) (propagated-inputs - `(("guile-bytestructures" ,guile3.0-bytestructures))))) + `(("guile-bytestructures" ,guile2.2-bytestructures))))) + +(define-public guile3.0-parted + (deprecated-package "guile3.0-parted" guile-parted)) (define-public guile-xosd (package @@ -1359,7 +1379,7 @@ PostgreSQL.") ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (synopsis "Guile application configuration parsing library.") (description @@ -1374,13 +1394,16 @@ above command-line parameters.") "https://gitlab.com/a-sassmannshausen/guile-config") (license license:gpl3+))) -(define-public guile3.0-config +(define-public guile2.2-config (package (inherit guile-config) - (name "guile3.0-config") - (inputs `(("guile" ,guile-next) + (name "guile2.2-config") + (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-config)))))) +(define-public guile3.0-config + (deprecated-package "guile3.0-config" guile-config)) + (define-public guile-hall (package (name "guile-hall") @@ -1447,7 +1470,7 @@ above command-line parameters.") ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (propagated-inputs `(("guile-config" ,guile-config))) (synopsis "Guile project tooling") @@ -1459,17 +1482,20 @@ provides tight coupling to Guix.") (home-page "https://gitlab.com/a-sassmannshausen/guile-hall") (license license:gpl3+))) -(define-public guile3.0-hall +(define-public guile2.2-hall (package (inherit guile-hall) - (name "guile3.0-hall") - (inputs `(("guile" ,guile-next) + (name "guile2.2-hall") + (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-hall)))) (propagated-inputs - `(("guile-config" ,guile3.0-config) + `(("guile-config" ,guile2.2-config) ,@(alist-delete "guile-config" (package-propagated-inputs guile-hall)))))) +(define-public guile3.0-hall + (deprecated-package "guile3.0-hall" guile-hall)) + (define-public guile-ics (package (name "guile-ics") @@ -1499,7 +1525,7 @@ provides tight coupling to Guix.") ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2) ("which" ,which))) + (inputs `(("guile" ,guile-3.0) ("which" ,which))) (propagated-inputs `(("guile-lib" ,guile-lib))) (home-page "https://github.com/artyom-poptsov/guile-ics") (synopsis "Guile parser library for the iCalendar format") @@ -1510,13 +1536,16 @@ pure Scheme. The library can be used to read and write iCalendar data. The library is shipped with documentation in Info format and usage examples.") (license license:gpl3+))) -(define-public guile3.0-ics +(define-public guile2.2-ics (package (inherit guile-ics) - (name "guile3.0-ics") - (inputs `(("guile" ,guile-3.0) + (name "guile2.2-ics") + (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-ics)))) - (propagated-inputs `(("guile-lib" ,guile3.0-lib))))) + (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) + +(define-public guile3.0-ics + (deprecated-package "guile3.0-ics" guile-ics)) (define-public guile-wisp (package @@ -1543,6 +1572,12 @@ The library is shipped with documentation in Info format and usage examples.") (guix build emacs-utils)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'support-guile-3.0 + (lambda _ + (substitute* "configure" + (("_guile_versions_to_search=\"2.2") + "_guile_versions_to_search=\"3.0 2.2")) + #t)) (add-before 'configure 'patch-/usr/bin/env (lambda _ (substitute* "Makefile.in" @@ -1581,7 +1616,7 @@ The library is shipped with documentation in Info format and usage examples.") (assoc-ref emacs:%standard-phases 'make-autoloads))))) (home-page "https://www.draketo.de/english/wisp") (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (native-inputs `(("emacs" ,emacs-minimal) ("python" ,python) @@ -1592,21 +1627,14 @@ whitespace-significant language. It may be easier on the eyes for some users and in some situations.") (license license:gpl3+))) -(define-public guile3.0-wisp +(define-public guile2.2-wisp (package (inherit guile-wisp) - (name "guile3.0-wisp") - (inputs `(("guile" ,guile-3.0))) - (arguments - (substitute-keyword-arguments (package-arguments guile-wisp) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'support-guile-3.0 - (lambda _ - (substitute* "configure" - (("_guile_versions_to_search=\"2.2") - "_guile_versions_to_search=\"3.0 2.2")) - #t)))))))) + (name "guile2.2-wisp") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-wisp + (deprecated-package "guile3.0-wisp" guile-wisp)) (define-public guile-sly (package @@ -1847,7 +1875,7 @@ library.") $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) #t))))) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (home-page "https://www.nongnu.org/guile-lib/") (synopsis "Collection of useful Guile Scheme modules") (description @@ -1867,11 +1895,14 @@ for Guile\".") (name "guile2.0-lib") (inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-lib +(define-public guile2.2-lib (package (inherit guile-lib) - (name "guile3.0-lib") - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-lib") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-lib + (deprecated-package "guile3.0-lib" guile-lib)) (define-public guile-minikanren (package @@ -1888,7 +1919,7 @@ for Guile\".") "0r50jlpzi940jlmxyy3ddqqwmj5r12gb4bcv0ssini9v8km13xz6")))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (home-page "https://github.com/ijp/minikanren") (synopsis "MiniKanren declarative logic system, packaged for Guile") (description @@ -1909,11 +1940,14 @@ See http://minikanren.org/ for more on miniKanren generally.") (name "guile2.0-minikanren") (native-inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-minikanren +(define-public guile2.2-minikanren (package (inherit guile-minikanren) - (name "guile3.0-minikanren") - (native-inputs `(("guile" ,guile-next))))) + (name "guile2.2-minikanren") + (native-inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-minikanren + (deprecated-package "guile3.0-minikanren" guile-minikanren)) (define-public guile-irregex (package @@ -1946,7 +1980,7 @@ See http://minikanren.org/ for more on miniKanren generally.") #t))) #:source-directory "src")) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (home-page "http://synthcode.com/scheme/irregex") (synopsis "S-expression based regular expressions") (description @@ -1961,11 +1995,14 @@ inspired by the SCSH regular expression system.") (name "guile2.0-irregex") (native-inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-irregex +(define-public guile2.2-irregex (package (inherit guile-irregex) - (name "guile3.0-irregex") - (native-inputs `(("guile" ,guile-next))))) + (name "guile2.2-irregex") + (native-inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-irregex + (deprecated-package "guile3.0-irregex" guile-irregex)) (define-public haunt (package @@ -2031,9 +2068,10 @@ inspired by the SCSH regular expression system.") `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (propagated-inputs - `(("guile-reader" ,guile-reader) + ;; XXX: Guile-Reader is currently unavailable for Guile 2.2 so strip it. + `(;;("guile-reader" ,guile-reader) ("guile-commonmark" ,guile-commonmark))) (synopsis "Functional static site generator") (description "Haunt is a static site generator written in Guile @@ -2042,14 +2080,14 @@ interface for reading articles in any format.") (home-page "http://haunt.dthompson.us") (license license:gpl3+))) -(define-public guile3.0-haunt +(define-public guile2.2-haunt (package (inherit haunt) - (name "guile3.0-haunt") - (inputs `(("guile" ,guile-3.0))) + (name "guile2.2-haunt") + (inputs `(("guile" ,guile-2.2))) (propagated-inputs - ;; XXX: Guile-Reader is currently unavailable for Guile 3.0 so strip it. - `(("guile-commonmark" ,guile3.0-commonmark))))) + `(("guile-reader" ,guile-reader) + ("guile-commonmark" ,guile2.2-commonmark))))) (define-public guile2.0-haunt (package @@ -2057,6 +2095,9 @@ interface for reading articles in any format.") (name "guile2.0-haunt") (inputs `(("guile" ,guile-2.0))))) +(define-public guile3.0-haunt + (deprecated-package "guile3.0-haunt" haunt)) + (define-public guile-redis (package (name "guile-redis") @@ -2112,7 +2153,7 @@ key-value cache and store.") #t)))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "CommonMark parser for Guile") @@ -2125,11 +2166,11 @@ is no support for parsing block and inline level HTML.") (home-page "https://github.com/OrangeShark/guile-commonmark") (license license:lgpl3+))) -(define-public guile3.0-commonmark +(define-public guile2.2-commonmark (package (inherit guile-commonmark) - (name "guile3.0-commonmark") - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-commonmark") + (inputs `(("guile" ,guile-2.2))))) (define-public guile2.0-commonmark (package @@ -2137,6 +2178,9 @@ is no support for parsing block and inline level HTML.") (name "guile2.0-commonmark") (inputs `(("guile" ,guile-2.0))))) +(define-public guile3.0-commonmark + (deprecated-package "guile3.0-commonmark" guile-commonmark)) + (define-public mcron (package (name "mcron") @@ -2174,7 +2218,7 @@ is no support for parsing block and inline level HTML.") #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("tzdata" ,tzdata-for-tests))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (home-page "https://www.gnu.org/software/mcron/") (synopsis "Run jobs at scheduled times") (description @@ -2184,11 +2228,14 @@ Guile, so its configuration can be written in Scheme; the original cron format is also supported.") (license license:gpl3+))) -(define-public guile3.0-mcron +(define-public guile2.2-mcron (package (inherit mcron) - (name "guile3.0-mcron") - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-mcron") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-mcron + (deprecated-package "guile3.0-mcron" mcron)) (define-public mcron2 ;; This was mthl's mcron development branch, and it became mcron 1.1. @@ -2211,7 +2258,7 @@ format is also supported.") "1ydvw9dvssdvlvhh1dr8inyzy2x6m41qgp8hsivca1xysr4gc23a")))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -2225,11 +2272,15 @@ format is also supported.") The picture values can directly be displayed in Geiser.") (license license:lgpl3+)))) -(define-public guile3.0-picture-language +(define-public guile2.2-picture-language (package (inherit guile-picture-language) - (name "guile3.0-picture-language") - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-picture-language") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-picture-language + (deprecated-package "guile3.0-picture-language" + guile-picture-language)) (define-public guile-studio (package @@ -2526,7 +2577,7 @@ list of components. This module takes care of that for you.") ("gtk+" ,gtk+) ("guile-lib" ,guile-lib) ("webkitgtk" ,webkitgtk))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (home-page "https://github.com/spk121/guile-gi") (synopsis "GObject bindings for Guile") (description @@ -2535,14 +2586,17 @@ libraries, such as GTK+3. Its README comes with the disclaimer: This is pre-alpha code.") (license license:gpl3+))) -(define-public guile3.0-gi +(define-public guile2.2-gi (package (inherit guile-gi) - (name "guile3.0-gi") + (name "guile2.2-gi") (native-inputs - `(("guile" ,guile-3.0) + `(("guile" ,guile-2.2) ,@(package-native-inputs guile-gi))))) +(define-public guile3.0-gi + (deprecated-package "guile3.0-gi" guile-gi)) + (define-public guile-srfi-159 (let ((commit "1bd98abda2ae4ef8f36761a167903e55c6bda7bb") (revision "0")) @@ -3012,7 +3066,7 @@ the style of the Node Package Manager (NPM).") (rename-file "private" "hashing/private") #t))))) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (synopsis "Cryprographic hash functions implemented in Scheme") (description "The @code{(hashing @dots{})} modules implement cryptographic hash @@ -3020,13 +3074,16 @@ functions in pure R6RS Scheme: CRC, HMAC, MD5, SHA-1, and SHA-2 (SHA-256, SHA-512).") (license license:expat))) -(define-public guile3.0-hashing +(define-public guile2.2-hashing (package (inherit guile-hashing) - (name "guile3.0-hashing") + (name "guile2.2-hashing") (native-inputs `(("guile" ,guile-next))))) +(define-public guile3.0-hashing + (deprecated-package "guile3.0-hashing" guile-hashing)) + (define-public guile-webutils (let ((commit "8541904f761066dc9c27b1153e9a838be9a55299") (revision "0")) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 17fa51a3c7..b471eccfed 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -252,15 +252,6 @@ without requiring the source code to be rewritten.") (define-deprecated guile-2.2/bug-fix guile-2.2) -(define-public guile-2.2/fixed - ;; A package of Guile 2.2 that's rarely changed. It is the one used - ;; in the `base' module, and thus changing it entails a full rebuild. - (package - (inherit guile-2.2) - (properties '((hidden? . #t) ;people should install 'guile-2.2' - (timeout . 72000) ;20 hours - (max-silent-time . 36000))))) ;10 hours (needed on ARM - ; when heavily loaded) (define-public guile-2.2.4 (package/inherit guile-2.2 @@ -277,7 +268,7 @@ without requiring the source code to be rewritten.") ;; This is the latest Guile stable version. (package (inherit guile-2.2) - (name "guile-next") ;to be renamed to "guile" + (name "guile") (version "3.0.1") (source (origin (inherit (package-source guile-2.2)) @@ -300,6 +291,16 @@ without requiring the source code to be rewritten.") (define-public guile-next guile-3.0) +(define-public guile-3.0/fixed + ;; A package of Guile that's rarely changed. It is the one used in the + ;; `base' module, and thus changing it entails a full rebuild. + (package + (inherit guile-3.0) + (properties '((hidden? . #t) ;people should install 'guile-2.2' + (timeout . 72000) ;20 hours + (max-silent-time . 36000))))) ;10 hours (needed on ARM + ; when heavily loaded) + (define* (make-guile-readline guile #:optional (name "guile-readline")) (package (name name) @@ -377,9 +378,32 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its (package-input-rewriting `((,guile-2.2 . ,guile-2.0)) (guile-variant-package-name "guile2.0"))) -(define package-for-guile-3.0 - (package-input-rewriting `((,guile-2.2 . ,guile-next)) - (guile-variant-package-name "guile3.0"))) +(define package-for-guile-2.2 + (package-input-rewriting `((,guile-3.0 . ,guile-2.2)) + (guile-variant-package-name "guile2.2"))) + +(define-syntax define-deprecated-guile3.0-package + (lambda (s) + "Define a deprecated package alias for \"guile3.0-something\"." + (syntax-case s () + ((_ name) + (and (identifier? #'name) + (string-prefix? "guile3.0-" (symbol->string (syntax->datum + #'name)))) + (let ((->guile (lambda (str) + (let ((base (string-drop str + (string-length "guile3.0-")))) + (string-append "guile-" base))))) + (with-syntax ((package-name (symbol->string (syntax->datum #'name))) + (package + (datum->syntax + #'name + (string->symbol + (->guile (symbol->string (syntax->datum #'name))))))) + #'(begin + (define-deprecated name package + (deprecated-package package-name package)) + (export name)))))))) (define-public guile-for-guile-emacs (package (inherit guile-2.2) @@ -474,10 +498,16 @@ specification. These are the main features: version ".tar.gz")) (sha256 (base32 - "14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz")))))) + "14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz")))) + (native-inputs `(("pkg-config" ,pkg-config) + ("guile" ,guile-3.0))) + (inputs `(("guile" ,guile-3.0))))) + +(define-public guile2.2-json + (package-for-guile-2.2 guile-json-3)) (define-public guile3.0-json - (package-for-guile-3.0 guile-json-3)) + (deprecated-package "guile3.0-json" guile-json-3)) ;; There are two guile-gdbm packages, one using the FFI and one with ;; direct C bindings, hence the verbose name. @@ -518,7 +548,7 @@ specification. These are the main features: (assoc-ref inputs "gdbm")))) #t))))) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (inputs `(("gdbm" ,gdbm))) (home-page "https://github.com/ijp/guile-gdbm") @@ -531,8 +561,10 @@ Guile's foreign function interface.") (define-public guile2.0-gdbm-ffi (package-for-guile-2.0 guile-gdbm-ffi)) -(define-public guile3.0-gdbm-ffi - (package-for-guile-3.0 guile-gdbm-ffi)) +(define-public guile2.2-gdbm-ffi + (package-for-guile-2.2 guile-gdbm-ffi)) + +(define-deprecated-guile3.0-package guile3.0-gdbm-ffi) (define-public guile-sqlite3 (package @@ -565,7 +597,7 @@ Guile's foreign function interface.") ("guile" ,guile-2.2) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("sqlite" ,sqlite))) (synopsis "Access SQLite databases from Guile") (description @@ -575,8 +607,10 @@ Guile's foreign function interface.") (define-public guile2.0-sqlite3 (package-for-guile-2.0 guile-sqlite3)) -(define-public guile3.0-sqlite3 - (package-for-guile-3.0 guile-sqlite3)) +(define-public guile2.2-sqlite3 + (package-for-guile-2.2 guile-sqlite3)) + +(define-deprecated-guile3.0-package guile3.0-sqlite3) (define-public guile-bytestructures (package @@ -608,9 +642,9 @@ Guile's foreign function interface.") `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (synopsis "Structured access to bytevector contents for Guile") (description "Guile bytestructures offers a system imitating the type system @@ -624,8 +658,10 @@ type system, elevating types to first-class status.") (define-public guile2.0-bytestructures (package-for-guile-2.0 guile-bytestructures)) -(define-public guile3.0-bytestructures - (package-for-guile-3.0 guile-bytestructures)) +(define-public guile2.2-bytestructures + (package-for-guile-2.2 guile-bytestructures)) + +(define-deprecated-guile3.0-package guile3.0-bytestructures) (define-public guile-git (package @@ -643,10 +679,10 @@ type system, elevating types to first-class status.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("guile-bytestructures" ,guile-bytestructures))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("libgit2" ,libgit2))) (propagated-inputs `(("guile-bytestructures" ,guile-bytestructures))) @@ -656,8 +692,8 @@ type system, elevating types to first-class status.") manipulate repositories of the Git version control system.") (license license:gpl3+))) -(define-public guile3.0-git - (package-for-guile-3.0 guile-git)) +(define-public guile2.2-git + (package-for-guile-2.2 guile-git)) (define-public guile2.0-git (let ((base (package-for-guile-2.0 guile-git))) @@ -670,5 +706,7 @@ manipulate repositories of the Git version control system.") ,@(srfi-1:alist-delete "libgit2" (package-inputs base))))))) +(define-deprecated-guile3.0-package guile3.0-git) + ;;; guile.scm ends here diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a09c263697..988542b061 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -222,7 +222,7 @@ `(("dejagnu" ,dejagnu) ("m4" ,m4) ("texinfo" ,texinfo) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("gsasl" ,gsasl) ("gnutls" ,gnutls) ("ncurses" ,ncurses) @@ -246,14 +246,17 @@ software.") ;; Libraries are under LGPLv3+, and programs under GPLv3+. (list gpl3+ lgpl3+)))) -(define-public guile3.0-mailutils +(define-public guile2.2-mailutils (package (inherit mailutils) - (name "guile3.0-mailutils") + (name "guile2.2-mailutils") (inputs - `(("guile" ,guile-3.0) + `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs mailutils)))))) +(define-public guile3.0-mailutils + (deprecated-package "guile3.0-mailutils" mailutils)) + (define-public nullmailer (package (name "nullmailer") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 19dbf2c7b8..555019a57d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -307,7 +307,7 @@ ("sqlite" ,sqlite) ("libgcrypt" ,libgcrypt) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ;; Some of the tests use "unshare" when it is available. ("util-linux" ,util-linux) @@ -328,7 +328,7 @@ ("glibc-utf8-locales" ,glibc-utf8-locales))) (propagated-inputs - `(("gnutls" ,gnutls) + `(("gnutls" ,guile3.0-gnutls) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-3) ("guile-sqlite3" ,guile-sqlite3) @@ -360,7 +360,7 @@ the Nix package manager.") (fold alist-delete (package-native-inputs guix) '("po4a" "graphviz" "help2man"))) (inputs - `(("gnutls" ,gnutls) + `(("gnutls" ,guile3.0-gnutls) ("guile-git" ,guile-git) ("guile-json" ,guile-json-3) ("guile-gcrypt" ,guile-gcrypt) @@ -408,31 +408,34 @@ the Nix package manager.") (define-public guile2.0-guix (deprecated-package "guile2.0-guix" guix)) -(define-public guile3.0-guix +(define-public guile2.2-guix (package (inherit guix) - (name "guile3.0-guix") + (name "guile2.2-guix") (native-inputs - `(("guile" ,guile-3.0) - ("gnutls" ,guile3.0-gnutls) - ("guile-gcrypt" ,guile3.0-gcrypt) - ("guile-json" ,guile3.0-json) - ("guile-sqlite3" ,guile3.0-sqlite3) - ("guile-ssh" ,guile3.0-ssh) - ("guile-git" ,guile3.0-git) + `(("guile" ,guile-2.2) + ("gnutls" ,guile2.2-gnutls) + ("guile-gcrypt" ,guile2.2-gcrypt) + ("guile-json" ,guile2.2-json) + ("guile-sqlite3" ,guile2.2-sqlite3) + ("guile-ssh" ,guile2.2-ssh) + ("guile-git" ,guile2.2-git) ,@(fold alist-delete (package-native-inputs guix) '("guile" "gnutls" "guile-gcrypt" "guile-json" "guile-sqlite3" "guile-ssh" "guile-git")))) (inputs - `(("guile" ,guile-3.0) + `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guix)))) (propagated-inputs - `(("gnutls" ,guile3.0-gnutls) - ("guile-gcrypt" ,guile3.0-gcrypt) - ("guile-json" ,guile3.0-json) - ("guile-sqlite3" ,guile3.0-sqlite3) - ("guile-ssh" ,guile3.0-ssh) - ("guile-git" ,guile3.0-git))))) + `(("gnutls" ,gnutls) + ("guile-gcrypt" ,guile2.2-gcrypt) + ("guile-json" ,guile2.2-json) + ("guile-sqlite3" ,guile2.2-sqlite3) + ("guile-ssh" ,guile2.2-ssh) + ("guile-git" ,guile2.2-git))))) + +(define-public guile3.0-guix + (deprecated-package "guile3.0-guix" guix)) (define-public guix-minimal ;; A version of Guix which is built with the minimal set of dependencies, as @@ -837,12 +840,12 @@ written entirely in Python."))) (inputs `(("guile" ,guile-3.0))) (propagated-inputs - `(("guix" ,guile3.0-guix) - ("guile-commonmark" ,guile3.0-commonmark) - ("guile-gcrypt" ,guile3.0-gcrypt) - ("guile-pfds" ,guile3.0-pfds) - ("guile-syntax-highlight" ,guile3.0-syntax-highlight) - ("guile-wisp" ,guile3.0-wisp))) + `(("guix" ,guix) + ("guile-commonmark" ,guile-commonmark) + ("guile-gcrypt" ,guile-gcrypt) + ("guile-pfds" ,guile-pfds) + ("guile-syntax-highlight" ,guile-syntax-highlight) + ("guile-wisp" ,guile-wisp))) (home-page "https://workflows.guix.info") (synopsis "Workflow management extension for GNU Guix") (description "The @dfn{Guix Workflow Language} (GWL) provides an @@ -867,6 +870,14 @@ environments.") (sha256 (base32 "01z7jjkc7r7lj6637rcgpz40v8xqqyfp6871h94yvcnwm7zy9h1n")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("^GUILE_PKG.*") + "GUILE_PKG([3.0 2.2])\n")) + #t)) (file-name (string-append "guix-jupyter-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -925,7 +936,7 @@ environments.") ("python-ipykernel" ,python-ipykernel))) (inputs `(("guix" ,guix) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (propagated-inputs `(("guile-json" ,guile-json-3) ("guile-simple-zmq" ,guile-simple-zmq) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 7a7f30e255..a7b6e22030 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -112,7 +112,7 @@ scientific data.") #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (propagated-inputs `(("guile-cairo" ,guile-cairo))) (home-page "http://wingolog.org/software/guile-charting/") (synopsis "Create charts and graphs in Guile") @@ -121,12 +121,15 @@ scientific data.") using the Cairo drawing library.") (license license:lgpl2.1+))) -(define-public guile3.0-charting +(define-public guile2.2-charting (package (inherit guile-charting) - (name "guile3.0-charting") - (inputs `(("guile" ,guile-3.0))) - (propagated-inputs `(("guile-cairo" ,guile3.0-cairo))))) + (name "guile2.2-charting") + (inputs `(("guile" ,guile-2.2))) + (propagated-inputs `(("guile-cairo" ,guile2.2-cairo))))) + +(define-public guile3.0-charting + (deprecated-package "guile3.0-charting" guile-charting)) (define-public ploticus (package diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 4d062bbb18..9ae9e6aaaa 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -301,8 +301,8 @@ Additionally, various channel-specific options can be negotiated.") ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) ("which" ,which) - ("guile" ,guile-2.2))) ;needed when cross-compiling. - (inputs `(("guile" ,guile-2.2) + ("guile" ,guile-3.0))) ;needed when cross-compiling. + (inputs `(("guile" ,guile-3.0) ("libssh" ,libssh) ("libgcrypt" ,libgcrypt))) (synopsis "Guile bindings to libssh") @@ -322,16 +322,19 @@ libssh library.") (inputs `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -(define-public guile3.0-ssh +(define-public guile2.2-ssh (package (inherit guile-ssh) - (name "guile3.0-ssh") + (name "guile2.2-ssh") (native-inputs - `(("guile" ,guile-next) ;needed when cross-compiling. + `(("guile" ,guile-2.2) ;needed when cross-compiling. ,@(alist-delete "guile" (package-native-inputs guile-ssh)))) - (inputs `(("guile" ,guile-next) + (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) +(define-public guile3.0-ssh + (deprecated-package "guile3.0-ssh" guile-ssh)) + (define-public corkscrew (package (name "corkscrew") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6451037fdb..27c7804029 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 4899dbe3b7..d46b29ec13 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2013, 2016, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2016, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2016, 2017, 2019 Efraim Flashner @@ -136,7 +136,7 @@ Only \"Universal TUN/TAP device driver support\" is needed in the kernel.") (base32 "1g41yarz2bl0f73kbjqnywr485ghanbp7nmspklfb0n07yp0z6ak")))) (build-system gnu-build-system) - (inputs `(("guile" ,guile-2.2) ; for the wrapper scripts + (inputs `(("guile" ,guile-3.0) ; for the wrapper scripts ("coreutils" ,coreutils) ("grep" ,grep) ("iproute2" ,iproute) ; for ‘ip’ diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index db10cbf3e9..84da93b4cc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7162,7 +7162,7 @@ compressed JSON header blocks. (inputs `(("guix" ,guix))) (propagated-inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("guile-commonmark" ,guile-commonmark) ("guile-json" ,guile-json-3))) (home-page "https://github.com/UMCUGenetics/hpcguix-web") diff --git a/guix/gexp.scm b/guix/gexp.scm index 5912511530..f50104efbc 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1553,12 +1553,12 @@ TARGET, a GNU triplet." ;;; (define (default-guile) - ;; Lazily resolve 'guile-2.2' (not 'guile-final' because this is for + ;; Lazily resolve 'guile-3.0' (not 'guile-final' because this is for ;; programs returned by 'program-file' and we don't want to keep references ;; to several Guile packages). This module must not refer to (gnu …) ;; modules directly, to avoid circular dependencies, hence this hack. (module-ref (resolve-interface '(gnu packages guile)) - 'guile-2.2)) + 'guile-3.0)) (define* (load-path-expression modules #:optional (path %load-path) #:key (extensions '()) system target) diff --git a/guix/self.scm b/guix/self.scm index 6b633f9bc0..e3b36b9407 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -49,11 +49,11 @@ (module-ref (resolve-interface module) variable)))) (match-lambda ("guile" (ref '(gnu packages guile) 'guile-3.0)) - ("guile-json" (ref '(gnu packages guile) 'guile3.0-json)) - ("guile-ssh" (ref '(gnu packages ssh) 'guile3.0-ssh)) - ("guile-git" (ref '(gnu packages guile) 'guile3.0-git)) - ("guile-sqlite3" (ref '(gnu packages guile) 'guile3.0-sqlite3)) - ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile3.0-gcrypt)) + ("guile-json" (ref '(gnu packages guile) 'guile-json-3)) + ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) + ("guile-git" (ref '(gnu packages guile) 'guile-git)) + ("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3)) + ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt)) ("gnutls" (ref '(gnu packages tls) 'guile3.0-gnutls)) ("zlib" (ref '(gnu packages compression) 'zlib)) ("lzlib" (ref '(gnu packages compression) 'lzlib)) -- cgit v1.2.3 From 67a3c8ed15f62a39f8684ee9c8dda024de9296a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 10:39:47 +0100 Subject: gnu: GnuTLS: Build with Guile 3. This is a follow-up to commit b6bee63bed4f013064c0d902e7c8b83ed7514ade. * gnu/packages/tls.scm (gnutls)[inputs]: Change from GUILE-2.2 to GUILE-3.0. (guile3.0-gnutls): Rename to ... (guile2.2-gnutls): ... this. Use GUILE-2.2. (guile3.0-gnutls): New variable. --- gnu/packages/tls.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f94c2a1077..f84d29ecbb 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -229,7 +229,7 @@ living in the same process.") ("datefudge" ,datefudge) ;tests rely on 'datefudge' ("util-linux" ,util-linux))) ;one test needs 'setsid' (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (propagated-inputs ;; These are all in the 'Requires.private' field of gnutls.pc. `(("libtasn1" ,libtasn1) @@ -266,14 +266,16 @@ required structures.") (inputs `(("unbound" ,unbound) ,@(package-inputs gnutls))))) -(define-public guile3.0-gnutls +(define-public guile2.2-gnutls (package (inherit gnutls) - (name "guile3.0-gnutls") - (inputs `(("guile" ,guile-next) + (name "guile2.2-gnutls") + (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs gnutls)))))) +(define-public guile3.0-gnutls gnutls) + (define-public openssl (package (name "openssl") -- cgit v1.2.3 From cfa4de760a9c56c05f77670a1b9e004b94cef599 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 10:40:19 +0100 Subject: gnu: guile-gcrypt: Use the correct Guile version. This is a follow-up to commit b6bee63bed4f013064c0d902e7c8b83ed7514ade. * gnu/packages/gnupg.scm (guile-gcrypt)[native-inputs]: Remove GUILE-2.2. Add GUILE-3.0. (guile2.2-gcrypt)[native-inputs]: Adjust accordingly. --- gnu/packages/gnupg.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 9b6019007e..c22eb57fc7 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -491,7 +491,7 @@ gpgpme starting with version 1.7.") ("autoconf" ,autoconf) ("automake" ,automake) ("texinfo" ,texinfo) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (inputs `(("guile" ,guile-3.0) ("libgcrypt" ,libgcrypt))) @@ -518,6 +518,9 @@ interface (FFI) of Guile.") (package (inherit guile-gcrypt) (name "guile2.2-gcrypt") + (native-inputs + `(("guile" ,guile-2.2) + ,@(alist-delete "guile" (package-native-inputs guile-gcrypt)))) (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) -- cgit v1.2.3 From 02ed227f94496643cc82259f9e1c11d90a13c8b8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:13:20 +0100 Subject: gnu: guile-sqlite3: Use the correct Guile version. This is a follow-up to commit b6bee63bed4f013064c0d902e7c8b83ed7514ade.. * gnu/packages/guile.scm (guile-sqlite3)[native-inputs]: Remove GUILE-2.2. Add GUILE-3.0. --- gnu/packages/guile.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b471eccfed..e137ab610a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -594,7 +594,7 @@ Guile's foreign function interface.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-3.0) -- cgit v1.2.3 From 4e6c9f56b57891cdffadeb1fdba3bd705aa38abc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 Mar 2020 15:31:45 +0100 Subject: gnu: gnutls: Make 'guile3.0-gnutls' a deprecated alias. This is a followup to 67a3c8ed15f62a39f8684ee9c8dda024de9296a9. * gnu/packages/tls.scm (guile3.0-gnutls): Make a deprecated alias for GNUTLS. --- gnu/packages/tls.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f84d29ecbb..ce8abfb9a2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -274,7 +274,8 @@ required structures.") ,@(alist-delete "guile" (package-inputs gnutls)))))) -(define-public guile3.0-gnutls gnutls) +(define-public guile3.0-gnutls + (deprecated-package "guile3.0-gnutls" gnutls)) (define-public openssl (package -- cgit v1.2.3 From 2bc1a400aea97106c5ac8237a06908408e204164 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 Mar 2020 15:32:36 +0100 Subject: gexp: Change default Guile effective version to 3.0. This is a followup to b6bee63bed4f013064c0d902e7c8b83ed7514ade. * guix/gexp.scm (lower-gexp, gexp->derivation): #:effective-version defaults to "3.0". --- guix/gexp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index f50104efbc..99390bcafc 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -785,7 +785,7 @@ second element is the derivation to compile them." (target 'current) (graft? (%graft?)) (guile-for-build (%guile-for-build)) - (effective-version "2.2") + (effective-version "3.0") deprecation-warnings) "*Note: This API is subject to change; use at your own risk!* @@ -886,7 +886,7 @@ derivations--e.g., code evaluated for its side effects." (modules '()) (module-path %load-path) (guile-for-build (%guile-for-build)) - (effective-version "2.2") + (effective-version "3.0") (graft? (%graft?)) references-graphs allowed-references disallowed-references -- cgit v1.2.3 From d8e98e853c781dbd9f0e3167daf67651ce7ed76b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 Mar 2020 15:34:22 +0100 Subject: scripts: Refer to (default-guile) instead of 'guile-2.2'. This is a followup to b6bee63bed4f013064c0d902e7c8b83ed7514ade. * guix/scripts/environment.scm (guix-environment): Use (default-guile) instead of (canonical-package guile-2.2) when parameterizing '%guile-for-build'. * guix/scripts/pack.scm (guix-pack): Likewise. * guix/scripts/package.scm (guix-package*): Likewise. * guix/scripts/pull.scm (guix-pull): Likewise. --- guix/scripts/environment.scm | 6 ++---- guix/scripts/pack.scm | 2 +- guix/scripts/package.scm | 4 +--- guix/scripts/pull.scm | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index f04363750e..e2fe8051b9 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2018 David Thompson -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2018 Mike Gerwitz ;;; ;;; This file is part of GNU Guix. @@ -38,8 +38,6 @@ #:use-module (gnu system file-systems) #:use-module (gnu packages) #:use-module (gnu packages bash) - #:use-module (gnu packages commencement) - #:use-module (gnu packages guile) #:use-module ((gnu packages bootstrap) #:select (bootstrap-executable %bootstrap-guile)) #:use-module (ice-9 format) @@ -733,7 +731,7 @@ message if any test fails." store (if bootstrap? %bootstrap-guile - (canonical-package guile-2.2))))) + (default-guile))))) (run-with-store store ;; Containers need a Bourne shell at /bin/sh. (mlet* %store-monad ((bash (environment-bash container? diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 652b4c63c4..045fd1643e 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -1027,7 +1027,7 @@ Create a bundle of PACKAGE.\n")) store (if (assoc-ref opts 'bootstrap?) %bootstrap-guile - (canonical-package guile-2.2)) + (default-guile)) (assoc-ref opts 'system) #:graft? (assoc-ref opts 'graft?)))) (let* ((dry-run? (assoc-ref opts 'dry-run?)) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index d2f4f1ccd3..792c458850 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -55,8 +55,6 @@ #:use-module (srfi srfi-35) #:use-module (srfi srfi-37) #:use-module (gnu packages) - #:autoload (gnu packages base) (canonical-package) - #:autoload (gnu packages guile) (guile-2.2) #:autoload (gnu packages bootstrap) (%bootstrap-guile) #:export (build-and-use-profile delete-generations @@ -958,5 +956,5 @@ option processing with 'parse-command-line'." (%store) (if (assoc-ref opts 'bootstrap?) %bootstrap-guile - (canonical-package guile-2.2))))) + (default-guile))))) (process-actions (%store) opts))))))) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 51d4da209a..1c5456026c 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -798,7 +798,7 @@ Use '~/.config/guix/channels.scm' instead.")) store (if (assoc-ref opts 'bootstrap?) %bootstrap-guile - (canonical-package guile-2.2))))) + (default-guile))))) (with-profile-lock profile (run-with-store store (build-and-install instances profile -- cgit v1.2.3 From 9d0c2c6e5226bbd11e710bd4efa8f25e9ffb5a86 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 Mar 2020 15:46:15 +0100 Subject: tests: Fix up reference to 'guile-2.2'. This is a followup to b6bee63bed4f013064c0d902e7c8b83ed7514ade. * tests/inferior.scm ("inferior-package-search-paths"): Refer to 'guile-3.0' instead of 'guile-2.2'. --- tests/inferior.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/inferior.scm b/tests/inferior.scm index b4417d8629..5236a3f3e2 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm @@ -181,7 +181,7 @@ result)) (test-equal "inferior-package-search-paths" - (package-native-search-paths guile-2.2) + (package-native-search-paths guile-3.0) (let* ((inferior (open-inferior %top-builddir #:command "scripts/guix")) (guile (first (lookup-inferior-packages inferior "guile"))) -- cgit v1.2.3 From b03753d8ccf73777d2bbbe65441da6bb6dfa7e8f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 Mar 2020 15:49:06 +0100 Subject: tests: Fix compilation of 'gnu-make-for-tests'. * guix/tests.scm (gnu-make-for-tests)[arguments]: Pass "--disable-dependency-tracking" to #:configure-flags. --- guix/tests.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/tests.scm b/guix/tests.scm index ff31bcad44..95a7d7c4b8 100644 --- a/guix/tests.scm +++ b/guix/tests.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -415,6 +415,9 @@ default values, and with EXTRA-FIELDS set as specified." #:implicit-inputs? #f #:tests? #f ;cannot run "make check" ,@(substitute-keyword-arguments (package-arguments gnu-make) + ((#:configure-flags flags ''()) + ;; As in 'gnu-make-boot0', work around a 'config.status' defect. + `(cons "--disable-dependency-tracking" ,flags)) ((#:phases phases) `(modify-phases ,phases (replace 'build -- cgit v1.2.3 From 39569dbb5f86c9c330e4b9700118e090f09d9548 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 Mar 2020 16:10:58 +0100 Subject: profiles: 'profile-derivation' uses _IOLBF on Guile 2.0 only. * guix/profiles.scm (profile-derivation)[builder]: Use _IOLBF on Guile 2.0 only. --- guix/profiles.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 93ceafc4bc..fbe34c8455 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2016 Alex Kost ;;; Copyright © 2015 Mark H Weaver @@ -1511,8 +1511,10 @@ are cross-built for TARGET." (guix search-paths) (srfi srfi-1)) - (setvbuf (current-output-port) _IOLBF) - (setvbuf (current-error-port) _IOLBF) + (let ((line (cond-expand (guile-2.2 'line) + (else _IOLBF)))) ;Guile 2.0 + (setvbuf (current-output-port) line) + (setvbuf (current-error-port) line)) #+(if locales? set-utf8-locale #t) -- cgit v1.2.3 From b778989e9a299102355b7145d1963baed5db7268 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 17 Mar 2020 18:27:23 +0100 Subject: gnu: guix: Update to 'guile-3.0' also in native-inputs. * gnu/packages/package-management.scm (guix)[native-inputs]: Update to guile-3.0. --- gnu/packages/package-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 555019a57d..bcc30638e5 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Jonathan Brielmaier ;;; Copyright © 2020 Mathieu Othacehe +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -280,7 +281,7 @@ ;; Guile libraries are needed here for ;; cross-compilation. - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-3) -- cgit v1.2.3 From e607cc3a479b39d11e9d2b5979b9719e133008a0 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 23 Feb 2020 11:59:42 +0530 Subject: gnu: swig: Use guile-3.0 instead of guile-2.2. * gnu/packages/swig.scm (swig)[native-inputs]: Replace guile-2.2 with guile-3.0. Signed-off-by: Marius Bakke --- gnu/packages/swig.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 3de6343da8..86c1407da9 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,7 @@ (native-inputs `(("boost" ,boost) ("pcre" ,pcre "bin") ;for 'pcre-config' ;; The following are for tests and examples: - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("perl" ,perl))) ;;("python" ,python-wrapper) (inputs `(("pcre" ,pcre))) -- cgit v1.2.3 From 8b53495dfb50cda6b2c73b2b49115c184986ccf7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:20:02 +0100 Subject: gnu: perl-xml-parser: Update to 2.46. * gnu/packages/xml.scm (perl-xml-parser): Update to 2.46. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 6b68e6f8e0..13c8167be0 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -343,7 +343,7 @@ parsers for it. @code{XML::Descent} allows such parsers to be created.") (define-public perl-xml-parser (package (name "perl-xml-parser") - (version "2.44") + (version "2.46") (source (origin (method url-fetch) (uri (string-append @@ -351,7 +351,7 @@ parsers for it. @code{XML::Descent} allows such parsers to be created.") version ".tar.gz")) (sha256 (base32 - "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s")))) + "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk")))) (build-system perl-build-system) (arguments `(#:make-maker-flags (let ((expat (assoc-ref %build-inputs "expat"))) -- cgit v1.2.3 From 32b089f4f4e86a32bb34c2c7983be5dbe9603784 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:20:43 +0100 Subject: gnu: avahi: Do not build the static libraries. * gnu/packages/avahi.scm (avahi)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/avahi.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 8a01272486..4675f3b011 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -50,6 +50,7 @@ (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-distro=none" + "--disable-static" "--localstatedir=/var" ; for the DBus socket "--disable-python" "--disable-mono" -- cgit v1.2.3 From 850093ac24f92ae805a2ee90681d1e4cb01ff8eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:21:37 +0100 Subject: gnu: avahi: Update to 0.8. * gnu/packages/patches/avahi-CVE-2018-1000845.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/avahi.scm (avahi): Update to 0.8. [source](patches): Remove obsolete patch. [properties]: Remove. [arguments]: Remove "--disable-qt3" from #:configure-flags. Add "--disable-qt5". [inputs]: Add LIBEVENT. Sort lexicographically. [native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL. --- gnu/local.mk | 1 - gnu/packages/avahi.scm | 36 ++++++++++++------- gnu/packages/patches/avahi-CVE-2018-1000845.patch | 42 ----------------------- 3 files changed, 23 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/avahi-CVE-2018-1000845.patch diff --git a/gnu/local.mk b/gnu/local.mk index 21a149c469..1d3d6ff4e7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -743,7 +743,6 @@ dist_patch_DATA = \ %D%/packages/patches/audiofile-hurd.patch \ %D%/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ - %D%/packages/patches/avahi-CVE-2018-1000845.patch \ %D%/packages/patches/avahi-localstatedir.patch \ %D%/packages/patches/avogadro-boost148.patch \ %D%/packages/patches/avogadro-eigen3-update.patch \ diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 4675f3b011..602f9d7997 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,16 +26,18 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages dbm) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) #:use-module (gnu packages libdaemon) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages glib) #:use-module (gnu packages xml)) (define-public avahi (package (name "avahi") - (version "0.7") + (version "0.8") (home-page "https://avahi.org") (source (origin (method url-fetch) @@ -42,11 +45,17 @@ version ".tar.gz")) (sha256 (base32 - "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap")) - (patches (search-patches "avahi-localstatedir.patch" - "avahi-CVE-2018-1000845.patch")))) - ;; Hide a duplicate of the CVE fixed above. - (properties `((lint-hidden-cve . ("CVE-2017-6519")))) + "1npdixwxxn3s9q1f365x9n9rc5xgfz39hxf23faqvlrklgbhj0q6")) + (patches (search-patches "avahi-localstatedir.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix version constraint in the avahi-libevent pkg-config file. + ;; This can be removed for Avahi versions > 0.8. + (substitute* "avahi-libevent.pc.in" + (("libevent-2\\.1\\.5") + "libevent >= 2.1.5")) + #t)))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-distro=none" @@ -57,18 +66,19 @@ "--disable-doxygen-doc" "--disable-xmltoman" "--enable-tests" - "--disable-qt3" "--disable-qt4" + "--disable-qt4" "--disable-qt5" "--disable-gtk" "--disable-gtk3" "--enable-compat-libdns_sd"))) (inputs - `(("expat" ,expat) - ("glib" ,glib) - ("dbus" ,dbus) + `(("dbus" ,dbus) + ("expat" ,expat) ("gdbm" ,gdbm) + ("glib" ,glib) ("libcap" ,libcap) ;to enable chroot support in avahi-daemon - ("libdaemon" ,libdaemon))) + ("libdaemon" ,libdaemon) + ("libevent" ,libevent))) (native-inputs - `(("intltool" ,intltool) + `(("gettext" ,gettext-minimal) ("glib" ,glib "bin") ("pkg-config" ,pkg-config))) (synopsis "Implementation of mDNS/DNS-SD protocols") diff --git a/gnu/packages/patches/avahi-CVE-2018-1000845.patch b/gnu/packages/patches/avahi-CVE-2018-1000845.patch deleted file mode 100644 index e5b13e0bee..0000000000 --- a/gnu/packages/patches/avahi-CVE-2018-1000845.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001 -From: Trent Lloyd -Date: Sat, 22 Dec 2018 09:06:07 +0800 -Subject: [PATCH] Drop legacy unicast queries from address not on local link - -When handling legacy unicast queries, ensure that the source IP is -inside a subnet on the local link, otherwise drop the packet. - -Fixes #145 -Fixes #203 -CVE-2017-6519 -CVE-2018-100084 ---- - avahi-core/server.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/avahi-core/server.c b/avahi-core/server.c -index a2cb19a8..a2580e38 100644 ---- a/avahi-core/server.c -+++ b/avahi-core/server.c -@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres - - if (avahi_dns_packet_is_query(p)) { - int legacy_unicast = 0; -+ char t[AVAHI_ADDRESS_STR_MAX]; - - /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the - * AR section completely here, so far. Until the day we add -@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres - legacy_unicast = 1; - } - -+ if (!is_mdns_mcast_address(dst_address) && -+ !avahi_interface_address_on_link(i, src_address)) { -+ -+ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol); -+ return; -+ } -+ - if (legacy_unicast) - reflect_legacy_unicast_query_packet(s, p, i, src_address, port); - -- cgit v1.2.3 From 0a502c8c9bd07bfdc24aac6f3bdec939e0d9aef4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:22:34 +0100 Subject: gnu: fontforge: Update to 20200314. * gnu/packages/fontutils.scm (fontforge): Update to 20200314. [source](uri): Adjust for new tar.xz download. [native-inputs]: Remove AUTOCONF, AUTOMAKE and LIBTOOL. [build-system]: Switch to CMAKE-BUILD-SYSTEM. [arguments]: Add #:configure-flags. Remove phase 'fix-linking-with-python3.8', add phase 'do-not-override-RPATH'. --- gnu/packages/fontutils.scm | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 8e82112f1b..6784dc7cf6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -569,23 +569,17 @@ definitions.") (define-public fontforge (package (name "fontforge") - (version "20190801") + (version "20200314") (source (origin (method url-fetch) (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" - version "/fontforge-" version ".tar.gz")) + version "/fontforge-" version ".tar.xz")) (sha256 - (base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r")))) - (build-system gnu-build-system) + (base32 "0qf88wd6riycq56d24brybyc93ns74s0nyyavm43zp2kfcihn6fd")))) + (build-system cmake-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - - ;; TODO: Remove these inputs and the 'fix-linking-with-python-3.8' phase - ;; below when updating fontforge. - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + `(("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) ("fontconfig" ,fontconfig) ;dlopen'd ("freetype" ,freetype) @@ -608,18 +602,19 @@ definitions.") ("python" ,python) ("zlib" ,zlib))) (arguments - '(#:phases + '(#:configure-flags '(;; TODO: Provide GTK+ for the Wayland-friendly GDK + ;; backend, instead of the legacy X11 backend. + ;; Currently it introduces a circular dependency. + "-DENABLE_X11=ON") + #:phases (modify-phases %standard-phases - (add-before 'bootstrap 'fix-linking-with-python-3.8 + (add-after 'unpack 'do-not-override-RPATH (lambda _ - ;; Applications that embed the Python interpreter are supposed to - ;; use the new "python-3.8-embed.pc" pkg-config file starting with - ;; Python 3.8. Adjust the build system accordingly. - (substitute* "m4/fontforge_arg_enable.m4" - (("python-\"\\$\\{PYTHON_VERSION\\}\"" all) - (string-append all "-embed"))) - ;; Delete the configure script in order to force autoreconf. - (delete-file "configure") + ;; Do not attempt to set a default RPATH, as our ld-wrapper + ;; already does the right thing. + (substitute* "CMakeLists.txt" + (("^set_default_rpath\\(\\)") + "")) #t)) (add-after 'install 'set-library-path (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From f013742e27998d15ed25687b6473672840877e9a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:22:57 +0100 Subject: gnu: gdb: Remove duplicate input. * gnu/packages/gdb.scm (gdb-9.1)[inputs]: Remove PYTHON. --- gnu/packages/gdb.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 01f93f6def..3fa8e53884 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -92,7 +92,6 @@ ("readline" ,readline) ("ncurses" ,ncurses) ("guile" ,guile-2.0) - ("python" ,python) ("python-wrapper" ,python-wrapper) ("dejagnu" ,dejagnu) ("source-highlight" ,source-highlight) -- cgit v1.2.3 From 0a1559cc877fdffcc8f9ee08387a6ff62243930f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:23:18 +0100 Subject: gnu: libgsf: Remove obsolete intltool input. * gnu/packages/gnome.scm (libgsf)[native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL, PERL, and PERL-XML-PARSER (previously propagated). --- gnu/packages/gnome.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 67f0e47de1..13ffa7541d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2066,8 +2066,12 @@ XML/CSS rendering engine.") "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa")))) (build-system gnu-build-system) (native-inputs - `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal) + + ;; For tests. + ("perl" ,perl) + ("perl-xml-parser" ,perl-xml-parser))) (inputs `(("python" ,python) ("zlib" ,zlib) -- cgit v1.2.3 From 23904adbbb3d869e5b2faae805d432bf6e802376 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:23:46 +0100 Subject: gnu: libgsf: Do not build the static library. * gnu/packages/gnome.scm (libgsf)[arguments]: New field. --- gnu/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 13ffa7541d..ff3aa00c44 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2065,6 +2065,8 @@ XML/CSS rendering engine.") (base32 "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From 4ffa9f6b7542841f6e9ab546793dd57e2a144ee4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:24:03 +0100 Subject: gnu: libgsf: Remove unused input. * gnu/packages/gnome.scm (libgsf)[inputs]: Remove PYTHON. --- gnu/packages/gnome.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ff3aa00c44..cd824621c9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2075,8 +2075,7 @@ XML/CSS rendering engine.") ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser))) (inputs - `(("python" ,python) - ("zlib" ,zlib) + `(("zlib" ,zlib) ("bzip2" ,bzip2))) (propagated-inputs `(("gdk-pixbuf" ,gdk-pixbuf) -- cgit v1.2.3 From 96941537eec4421e908e44a37061a393d7ff3b37 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:24:24 +0100 Subject: gnu: at-spi2-core: Remove obsolete input. * gnu/packages/gtk.scm (at-spi2-core)[native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 10173bf124..b7f7163a79 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -636,10 +636,10 @@ in the GNOME project.") ("libxi" ,libxi) ("libxtst" ,libxtst))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) ("gtk-doc" ,gtk-doc) ("glib" ,glib "bin") - ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (synopsis "Assistive Technology Service Provider Interface, core components") (description -- cgit v1.2.3 From de2871c9faa44ee07f73470441f05d114a43bb48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:25:29 +0100 Subject: gnu: pulseaudio: Remove obsolete input. * gnu/packages/pulseaudio.scm (pulseaudio)[native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL, PERL, and PERL-XML-PARSER. --- gnu/packages/pulseaudio.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 7c4c26f009..b209fd3076 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -44,12 +44,14 @@ #:use-module (gnu packages check) #:use-module (gnu packages dbm) #:use-module (gnu packages glib) + #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) #:use-module (gnu packages web) #:use-module (gnu packages linux) #:use-module (gnu packages m4) + #:use-module (gnu packages perl) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -217,9 +219,11 @@ rates.") ("eudev" ,eudev))) ;for the detection of hardware audio devices (native-inputs `(("check" ,check) + ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("intltool" ,intltool) ("m4" ,m4) + ("perl" ,perl) + ("perl-xml-parser" ,perl-xml-parser) ("pkg-config" ,pkg-config))) (propagated-inputs ;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them. -- cgit v1.2.3 From dd4e4b037665f762e9d066af00f2e57a92c2e3bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Mar 2020 19:45:16 +0100 Subject: gnu: GCC@9: Remove obsolete patch. This patch became obsolete when the update to 9.3.0 was merged (commit 3dade1d59e7b4caa641670a76c0c48b4c90f6b3c). * gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gcc.scm (gcc-9)[source](patches): Remove it. --- gnu/local.mk | 1 - gnu/packages/gcc.scm | 1 - .../patches/gcc-9-libsanitizer-mode-size.patch | 58 ---------------------- 3 files changed, 60 deletions(-) delete mode 100644 gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch diff --git a/gnu/local.mk b/gnu/local.mk index 25f017bc57..f8414ec69f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -898,7 +898,6 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-6-libsanitizer-mode-size.patch \ %D%/packages/patches/gcc-7-libsanitizer-mode-size.patch \ %D%/packages/patches/gcc-8-libsanitizer-mode-size.patch \ - %D%/packages/patches/gcc-9-libsanitizer-mode-size.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ %D%/packages/patches/gcc-strmov-store-file-names.patch \ %D%/packages/patches/gcc-4-compile-with-gcc-5.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 09367d8184..f465470d49 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -560,7 +560,6 @@ It also includes runtime support libraries for these languages."))) (base32 "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" - "gcc-9-libsanitizer-mode-size.patch" "gcc-9-asan-fix-limits-include.patch" "gcc-5.0-libvtv-runpath.patch")))))) diff --git a/gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch b/gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch deleted file mode 100644 index 9e99a3d198..0000000000 --- a/gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix assertion failure in libsanitizer when using glibc 2.31 and later. - -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92154 -https://reviews.llvm.org/D69104 - -This is a combination of these upstream revisions: - -https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=277981 -https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=279653 - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -index 6cd4a5bac8b..d823a12190c 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -1156,8 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); - CHECK_SIZE_AND_OFFSET(ipc_perm, gid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); --#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) --/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ -+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) -+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit -+ on many architectures. */ - CHECK_SIZE_AND_OFFSET(ipc_perm, mode); - #endif - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index 73af92af1e8..6a673a7c995 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -211,26 +211,13 @@ namespace __sanitizer { - u64 __unused1; - u64 __unused2; - #elif defined(__sparc__) --#if defined(__arch64__) - unsigned mode; -- unsigned short __pad1; --#else -- unsigned short __pad1; -- unsigned short mode; - unsigned short __pad2; --#endif - unsigned short __seq; - unsigned long long __unused1; - unsigned long long __unused2; --#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) -- unsigned int mode; -- unsigned short __seq; -- unsigned short __pad1; -- unsigned long __unused1; -- unsigned long __unused2; - #else -- unsigned short mode; -- unsigned short __pad1; -+ unsigned int mode; - unsigned short __seq; - unsigned short __pad2; - #if defined(__x86_64__) && !defined(_LP64) -- cgit v1.2.3 From 1b70995498973fe899f8f039586e303c7ec7a3bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Mar 2020 20:04:57 +0100 Subject: gnu: make-ld-wrapper: Default to Guile 3.0. * gnu/packages/base.scm (make-ld-wrapper): Use GUILE-3.0 as the default Guile. --- gnu/packages/base.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 196106fa29..8dbc0b4b40 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -508,7 +508,7 @@ included.") (define* (make-ld-wrapper name #:key (target (const #f)) binutils - (guile (canonical-package guile-2.2)) + (guile (canonical-package guile-3.0)) (bash (canonical-package bash)) (guile-for-build guile)) "Return a package called NAME that contains a wrapper for the 'ld' program -- cgit v1.2.3 From 142cd4dc98ed439f32d2a903ff866ae345234c0f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Mar 2020 20:10:38 +0100 Subject: gnu: guile-readline: Build with Guile 3. * gnu/packages/guile.scm (guile-readline): Switch to GUILE-3.0. (guile2.2-readline): New public variable. (guile3.0-readline): Define in terms of DEPRECATED-GUILE3.0-PACKAGE. Move expression below the 'deprecated-guile3.0-package' definition. --- gnu/packages/guile.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index e137ab610a..c87728f432 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -358,10 +358,10 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its (license license:gpl3+))) (define-public guile-readline - (make-guile-readline guile-2.2)) + (make-guile-readline guile-3.0)) -(define-public guile3.0-readline - (make-guile-readline guile-next "guile3.0-readline")) +(define-public guile2.2-readline + (make-guile-readline guile-2.2 "guile2.2-readline")) (define (guile-variant-package-name prefix) (lambda (name) @@ -405,6 +405,8 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its (deprecated-package package-name package)) (export name)))))))) +(define-deprecated-guile3.0-package guile3.0-readline) + (define-public guile-for-guile-emacs (package (inherit guile-2.2) (name "guile-for-guile-emacs") -- cgit v1.2.3 From c95f5f0af7f3a2c674c17812fb2787112c84981e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 17:23:01 +0100 Subject: system: Switch to Guile 3.0. * gnu/system.scm (%base-packages): Change from GUILE-2.2 to GUILE-3.0. --- gnu/system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index 023007a0e6..77cc0076c1 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -594,7 +594,7 @@ of PROVENANCE-SERVICE-TYPE to its services." bash-completion - guile-2.2 + guile-3.0 guile-readline guile-colorized ;; The packages below are also in %FINAL-INPUTS, so take them from -- cgit v1.2.3 From 680b56116a4840a281a45cb130fd45d6d3d46c56 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 21 Mar 2020 00:32:20 +0100 Subject: news: Add entry for Guile 3.0. * etc/news.scm: Add entry for Guile 3.0. --- etc/news.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index 305d49366d..8c6f5f8a03 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -10,6 +10,14 @@ (channel-news (version 0) + (entry (commit "b6bee63bed4f013064c0d902e7c8b83ed7514ade") + (title (en "@code{guile} package now refers to version 3.0")) + (body (en "The @code{guile} package has been upgraded to version 3.0 + (instead of 2.2). The @code{guile3.0-} packages have been renamed to their +original name, and @code{guile2.2-} variants of these packages have been +defined. Additionally, derivations are now all built with Guile 3.0, and +system services also run on 3.0."))) + (entry (commit "e3e1a7ba08af2d58c47264c543617e499c239444") (title (en "@command{guix pull} now supports SSH authenticated repositories") -- cgit v1.2.3 From a057b88124a1b6b6401a2d0c502afc352a10b448 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Mar 2020 16:32:44 +0100 Subject: gnu: ghc@8.4: Remove redundant inputs. Incidentally, this fixes a build failure where GHC's build processes fail to link libffi and libgmp for 'ghc-cabal'. * gnu/packages/haskell.scm (ghc-8.4)[inputs]: Remove BINUTILS, GCC, and MAKE-LD-WRAPPER. [arguments]: Adjust accordingly. --- gnu/packages/haskell.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8db650e6ae..cafc3e5376 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -37,10 +37,8 @@ (define-module (gnu packages haskell) #:use-module (gnu packages) - #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) #:use-module (gnu packages elf) - #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages libffi) #:use-module (gnu packages lisp) @@ -435,11 +433,7 @@ interactive environment for the functional language Haskell.") (inputs `(("gmp" ,gmp) ("ncurses" ,ncurses) - ("libffi" ,libffi) - ("target-binutils" ,binutils) - ("target-gcc" ,gcc) - ("target-ld-wrapper" ,(make-ld-wrapper "ld-wrapper" - #:binutils binutils)))) + ("libffi" ,libffi))) (native-inputs `(("perl" ,perl) ("python" ,python) ; for tests @@ -514,9 +508,9 @@ interactive environment for the functional language Haskell.") ;; plain command names. (add-before 'configure 'set-target-programs (lambda* (#:key inputs #:allow-other-keys) - (let ((binutils (assoc-ref inputs "target-binutils")) - (gcc (assoc-ref inputs "target-gcc")) - (ld-wrapper (assoc-ref inputs "target-ld-wrapper"))) + (let ((binutils (assoc-ref inputs "binutils")) + (gcc (assoc-ref inputs "gcc")) + (ld-wrapper (assoc-ref inputs "ld-wrapper"))) (setenv "CC" (string-append gcc "/bin/gcc")) (setenv "CXX" (string-append gcc "/bin/g++")) (setenv "LD" (string-append ld-wrapper "/bin/ld")) -- cgit v1.2.3 From c711b6abdb7fc740b37e95596eab2b1b9aba0e1d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Mar 2020 16:33:06 +0100 Subject: gnu: ghc@8.4: Update to 8.4.4. * gnu/packages/haskell.scm (ghc-8.4): Update to 8.4.4. --- gnu/packages/haskell.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index cafc3e5376..6e9cfc6a9e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -422,14 +422,14 @@ interactive environment for the functional language Haskell.") (define-public ghc-8.4 (package (inherit ghc-8.0) (name "ghc") - (version "8.4.3") + (version "8.4.4") (source (origin (method url-fetch) (uri (string-append "https://www.haskell.org/ghc/dist/" version "/" name "-" version "-src.tar.xz")) (sha256 - (base32 "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf")))) + (base32 "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i")))) (inputs `(("gmp" ,gmp) ("ncurses" ,ncurses) @@ -448,7 +448,7 @@ interactive environment for the functional language Haskell.") version "/" name "-" version "-testsuite.tar.xz")) (sha256 (base32 - "1z55b1z0m3plqd2d1ks6w5wvx7igm7zsk3i4v7cms003z0as0hzz")))))) + "0s8lf9sxj7n89pjagi58b3fahnp34qvmwhnn0j1fbg6955vbrfj6")))))) (arguments `(#:test-target "test" ;; We get a smaller number of test failures by disabling parallel test -- cgit v1.2.3 From 2e9c43aa9adac2bd6bcf92373d1cf9f322afa5a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Mar 2020 19:42:56 +0100 Subject: gnu: GHC: Disable test that fails with glibc 2.30 and later. Fixes . * gnu/packages/haskell.scm (ghc-8.6)[arguments]: Add substitution to disable broken test. --- gnu/packages/haskell.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6e9cfc6a9e..8a332636ba 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2019 Jacob MacDonald +;;; Copyright © Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -582,14 +583,20 @@ interactive environment for the functional language Haskell.") ,make-flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases - ;; These two tests refer to the root user, which doesn't exist - ;; (see ). (add-after 'unpack-testsuite 'skip-tests (lambda _ + ;; These two tests refer to the root user, which doesn't exist + ;; (see ). (substitute* "libraries/unix/tests/all.T" (("^test\\('T8108'") "# guix skipped: test('T8108'")) (substitute* "libraries/unix/tests/libposix/all.T" (("^test\\('posix010'") "# guix skipped: test('posix010'")) + ;; This test attempts to dlopen() a position-independent + ;; executable(!), which is disallowed since glibc 2.30. See + ;; https://sourceware.org/bugzilla/show_bug.cgi?id=24323 + (substitute* "testsuite/tests/dynlibs/Makefile" + (("\\./T13702a") + "# ./T13702a")) #t)))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") -- cgit v1.2.3 From 53de3e74fac862bc07de160e8e226372de213dd1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 14 Mar 2020 11:39:52 +0100 Subject: gnu: cross-gcc: Add a "lib" output. Add a "lib" output to cross-gcc. This requires an upstream GCC patch adding support for --with-toolexeclibdir configure option. This option allows to install cross-built GCC libraries in a specific location. This also fixes the computation of TOOLDIR_BASE_PREFIX, that fails when /gnu/store/... directories are involved. * gnu/packages/patches/gcc-7-cross-toolexeclibdir.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/cross-base.scm (cross-gcc)[source]: Apply it, [outputs]: add a "lib" output, (cross-gcc-snippet): fix TOOLDIR_BASE_PREFIX. --- gnu/local.mk | 3 +- gnu/packages/cross-base.scm | 63 +- .../patches/gcc-7-cross-toolexeclibdir.patch | 1041 ++++++++++++++++++++ 3 files changed, 1084 insertions(+), 23 deletions(-) create mode 100644 gnu/packages/patches/gcc-7-cross-toolexeclibdir.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9db4019d2b..38dec7f081 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -14,7 +14,7 @@ # Copyright © 2016, 2017, 2018, 2019 Jan (janneke) Nieuwenhuizen # Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice # Copyright © 2017, 2018 Clément Lassieur -# Copyright © 2017 Mathieu Othacehe +# Copyright © 2017, 2020 Mathieu Othacehe # Copyright © 2017, 2018, 2019 Gábor Boskovits # Copyright © 2018 Amirouche Boubekki # Copyright © 2018, 2019, 2020 Oleg Pykhalov @@ -918,6 +918,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-6-source-date-epoch-2.patch \ %D%/packages/patches/gcc-7-cross-mingw.patch \ %D%/packages/patches/gcc-7-cross-environment-variables.patch \ + %D%/packages/patches/gcc-7-cross-toolexeclibdir.patch \ %D%/packages/patches/gcc-8-cross-environment-variables.patch \ %D%/packages/patches/gcc-8-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-asan-fix-limits-include.patch \ diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 667d1f786a..6f72653762 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2019 Carl Dong +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -162,6 +163,13 @@ base compiler and using LIBC (which may be either a libc package or #f.)" "--disable-libsanitizer" )) + ;; Install cross-built libraries such as libgcc_s.so in + ;; the "lib" output. + ,@(if libc + `((string-append "--with-toolexeclibdir=" + (assoc-ref %outputs "lib") + "/" ,target "/lib")) + '()) ;; For a newlib (non-glibc) target ,@(if (cross-newlib? target) '("--with-newlib") @@ -196,12 +204,19 @@ base compiler and using LIBC (which may be either a libc package or #f.)" (define (cross-gcc-snippet target) "Return GCC snippet needed for TARGET." - (cond ((target-mingw? target) - '(begin - (copy-recursively "libstdc++-v3/config/os/mingw32-w64" - "libstdc++-v3/config/os/newlib") - #t)) - (else #f))) + `(begin + ,@(if (target-mingw? target) + '((copy-recursively "libstdc++-v3/config/os/mingw32-w64" + "libstdc++-v3/config/os/newlib")) + '()) + ;; TOOLDIR_BASE_PREFIX is erroneous when using a separate "lib" + ;; output. Specify it correctly, otherwise GCC won't find its shared + ;; libraries installed in the "lib" output. See: + ;; https://lists.gnu.org/archive/html/bug-guix/2020-03/msg00196.html. + (substitute* "gcc/Makefile.in" + (("-DTOOLDIR_BASE_PREFIX=[^ ]*") + "-DTOOLDIR_BASE_PREFIX=\\\"../../../../\\\"")) + #t)) (define* (cross-gcc target #:key @@ -216,22 +231,26 @@ target that libc." (name (string-append "gcc-cross-" (if libc "" "sans-libc-") target)) - (source (origin (inherit (package-source xgcc)) - (patches - (append - (origin-patches (package-source xgcc)) - (cons (cond - ((version>=? (package-version xgcc) "8.0") (search-patch "gcc-8-cross-environment-variables.patch")) - ((version>=? (package-version xgcc) "6.0") (search-patch "gcc-6-cross-environment-variables.patch")) - (else (search-patch "gcc-cross-environment-variables.patch"))) - (cross-gcc-patches xgcc target)))) - (modules '((guix build utils))) - (snippet - (cross-gcc-snippet target)))) - - ;; For simplicity, use a single output. Otherwise libgcc_s & co. are not - ;; found by default, etc. - (outputs '("out")) + (source + (origin + (inherit (package-source xgcc)) + (patches + (append + (origin-patches (package-source xgcc)) + (append (cond + ((version>=? (package-version xgcc) "8.0") + (search-patches "gcc-8-cross-environment-variables.patch")) + ((version>=? (package-version xgcc) "6.0") + (search-patches "gcc-7-cross-toolexeclibdir.patch" + "gcc-6-cross-environment-variables.patch")) + (else + (search-patches "gcc-cross-environment-variables.patch"))) + (cross-gcc-patches xgcc target)))) + (modules '((guix build utils))) + (snippet + (cross-gcc-snippet target)))) + + (outputs '("out" "lib")) (arguments `(#:implicit-inputs? #f diff --git a/gnu/packages/patches/gcc-7-cross-toolexeclibdir.patch b/gnu/packages/patches/gcc-7-cross-toolexeclibdir.patch new file mode 100644 index 0000000000..49982c3474 --- /dev/null +++ b/gnu/packages/patches/gcc-7-cross-toolexeclibdir.patch @@ -0,0 +1,1041 @@ +From 46339bdf619b93dfa05d5f004d062671d3dc26d2 Mon Sep 17 00:00:00 2001 +From: Mathieu Othacehe +Date: Tue, 24 Mar 2020 13:50:56 +0100 +Subject: [PATCH] toolexec + +--- + gcc/doc/install.texi | 4 ++++ + libatomic/configure | 33 ++++++++++++++++++++++--- + libffi/configure | 33 ++++++++++++++++++++++--- + libgcc/configure | 38 +++++++++++++++++++++++++++-- + libgomp/configure | 33 ++++++++++++++++++++++--- + libhsail-rt/configure | 33 ++++++++++++++++++++++--- + libitm/configure | 33 ++++++++++++++++++++++--- + liboffloadmic/configure | 33 ++++++++++++++++++++++--- + liboffloadmic/plugin/configure | 33 ++++++++++++++++++++++--- + libquadmath/configure | 33 ++++++++++++++++++++++--- + libsanitizer/configure | 33 ++++++++++++++++++++++--- + libssp/configure | 33 ++++++++++++++++++++++--- + libstdc++-v3/configure | 44 ++++++++++++++++++++++++++-------- + 13 files changed, 374 insertions(+), 42 deletions(-) + +diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi +index 77ba08d3f21..28cb6d88da8 100644 +--- a/gcc/doc/install.texi ++++ b/gcc/doc/install.texi +@@ -2083,6 +2083,10 @@ shorthand for + The following options only apply to building cross compilers. + + @table @code ++@item --with-toolexeclibdir=@var{dir} ++Specify the installation directory for libraries built with a cross compiler. ++The default is @option{$@{gcc_tooldir@}/lib}. ++ + @item --with-sysroot + @itemx --with-sysroot=@var{dir} + Tells GCC to consider @var{dir} as the root of a tree that contains +diff --git a/libatomic/configure b/libatomic/configure +index 2ae9b8d40f3..0fa531ec4a3 100755 +--- a/libatomic/configure ++++ b/libatomic/configure +@@ -755,6 +755,7 @@ enable_option_checking + enable_version_specific_runtime_libs + enable_generated_files_in_srcdir + enable_multilib ++with_toolexeclibdir + enable_dependency_tracking + enable_shared + enable_static +@@ -1414,6 +1415,9 @@ Optional Features: + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +@@ -3185,6 +3189,22 @@ fi + ac_config_commands="$ac_config_commands default-1" + + ++ ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ + # Calculate toolexeclibdir + # Also toolexecdir, though it's only used in toolexeclibdir + case ${enable_version_specific_runtime_libs} in +@@ -3200,7 +3220,14 @@ case ${enable_version_specific_runtime_libs} in + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +@@ -11115,7 +11142,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11118 "configure" ++#line 11145 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11221,7 +11248,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11224 "configure" ++#line 11251 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +diff --git a/libffi/configure b/libffi/configure +index 790a291011f..6e37039e84c 100755 +--- a/libffi/configure ++++ b/libffi/configure +@@ -777,6 +777,7 @@ enable_debug + enable_structs + enable_raw_api + enable_purify_safety ++with_toolexeclibdir + enable_symvers + with_gcc_major_version_only + ' +@@ -1436,6 +1437,9 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-gcc-major-version-only + use only GCC major number in filesystem paths + +@@ -11390,7 +11394,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11393 "configure" ++#line 11397 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11496,7 +11500,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11499 "configure" ++#line 11507 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -16002,10 +16006,33 @@ $as_echo "#define USING_PURIFY 1" >>confdefs.h + fi + + ++ ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +diff --git a/libgcc/configure b/libgcc/configure +index 441601a1f76..976827dc57e 100644 +--- a/libgcc/configure ++++ b/libgcc/configure +@@ -669,6 +669,7 @@ enable_shared + enable_vtable_verify + with_aix_soname + enable_version_specific_runtime_libs ++with_toolexeclibdir + with_slibdir + enable_maintainer_mode + with_build_libsubdir +@@ -1329,6 +1330,9 @@ Optional Packages: + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-slibdir=DIR shared libraries in DIR LIBDIR + --with-build-libsubdir=DIR Directory where to find libraries for build system + --with-system-libunwind use installed libunwind +@@ -2403,6 +2407,22 @@ fi + $as_echo "$version_specific_libs" >&6; } + + ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ ++ + # Check whether --with-slibdir was given. + if test "${with_slibdir+set}" = set; then : + withval=$with_slibdir; slibdir="$with_slibdir" +@@ -2410,7 +2430,14 @@ else + if test "${version_specific_libs}" = yes; then + slibdir='$(libsubdir)' + elif test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then +- slibdir='$(exec_prefix)/$(host_noncanonical)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ slibdir='$(exec_prefix)/$(host_noncanonical)/lib' ++ ;; ++ *) ++ slibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + slibdir='$(libdir)' + fi +@@ -2640,7 +2667,14 @@ case ${version_specific_libs} in + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_noncanonical)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' + toolexeclibdir='$(libdir)' +diff --git a/libgomp/configure b/libgomp/configure +index 06166c66120..6b3beae0f63 100755 +--- a/libgomp/configure ++++ b/libgomp/configure +@@ -782,6 +782,7 @@ enable_option_checking + enable_version_specific_runtime_libs + enable_generated_files_in_srcdir + enable_multilib ++with_toolexeclibdir + enable_dependency_tracking + enable_shared + enable_static +@@ -1455,6 +1456,9 @@ Optional Features: + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +@@ -3338,6 +3342,22 @@ fi + ac_config_commands="$ac_config_commands default-1" + + ++ ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ + # Calculate toolexeclibdir + # Also toolexecdir, though it's only used in toolexeclibdir + case ${enable_version_specific_runtime_libs} in +@@ -3353,7 +3373,14 @@ case ${enable_version_specific_runtime_libs} in + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +@@ -11155,7 +11182,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11158 "configure" ++#line 11185 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11261,7 +11288,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11264 "configure" ++#line 11295 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +diff --git a/libhsail-rt/configure b/libhsail-rt/configure +index a4fcc10c1f9..1b4f2a953d0 100755 +--- a/libhsail-rt/configure ++++ b/libhsail-rt/configure +@@ -737,6 +737,7 @@ enable_option_checking + enable_maintainer_mode + enable_dependency_tracking + enable_version_specific_runtime_libs ++with_toolexeclibdir + enable_shared + enable_static + with_pic +@@ -1395,6 +1396,9 @@ Optional Features: + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +@@ -4418,6 +4422,22 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_version_specific_runtime_libs" >&5 + $as_echo "$enable_version_specific_runtime_libs" >&6; } + ++ ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ + # Calculate toolexeclibdir + # Also toolexecdir, though it's only used in toolexeclibdir + case ${enable_version_specific_runtime_libs} in +@@ -4433,7 +4453,14 @@ case ${enable_version_specific_runtime_libs} in + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +@@ -10973,7 +11000,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10976 "configure" ++#line 11003 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11079,7 +11106,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11082 "configure" ++#line 11113 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +diff --git a/libitm/configure b/libitm/configure +index 96c494d4a3f..ed47fab3c83 100644 +--- a/libitm/configure ++++ b/libitm/configure +@@ -766,6 +766,7 @@ enable_option_checking + enable_version_specific_runtime_libs + enable_generated_files_in_srcdir + enable_multilib ++with_toolexeclibdir + enable_dependency_tracking + enable_shared + enable_static +@@ -1430,6 +1431,9 @@ Optional Features: + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +@@ -3371,6 +3375,22 @@ fi + ac_config_commands="$ac_config_commands default-1" + + ++ ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ + # Calculate toolexeclibdir + # Also toolexecdir, though it's only used in toolexeclibdir + case ${enable_version_specific_runtime_libs} in +@@ -3386,7 +3406,14 @@ case ${enable_version_specific_runtime_libs} in + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +@@ -11794,7 +11821,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11797 "configure" ++#line 11824 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11900,7 +11927,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11903 "configure" ++#line 11934 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +diff --git a/liboffloadmic/configure b/liboffloadmic/configure +index f873716991b..6dfe9e37642 100644 +--- a/liboffloadmic/configure ++++ b/liboffloadmic/configure +@@ -739,6 +739,7 @@ enable_maintainer_mode + enable_dependency_tracking + enable_multilib + enable_version_specific_runtime_libs ++with_toolexeclibdir + enable_shared + enable_static + with_pic +@@ -1397,6 +1398,9 @@ Optional Features: + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +@@ -5003,6 +5007,22 @@ else + fi + + ++ ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ + # Calculate toolexeclibdir. + # Also toolexecdir, though it's only used in toolexeclibdir. + case ${enable_version_specific_runtime_libs} in +@@ -5018,7 +5038,14 @@ case ${enable_version_specific_runtime_libs} in + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +@@ -11108,7 +11135,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11111 "configure" ++#line 11138 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11214,7 +11241,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11217 "configure" ++#line 11248 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +diff --git a/liboffloadmic/plugin/configure b/liboffloadmic/plugin/configure +index c031eb3e7fa..570758344b4 100644 +--- a/liboffloadmic/plugin/configure ++++ b/liboffloadmic/plugin/configure +@@ -735,6 +735,7 @@ enable_maintainer_mode + enable_dependency_tracking + enable_multilib + enable_version_specific_runtime_libs ++with_toolexeclibdir + enable_shared + enable_static + with_pic +@@ -1394,6 +1395,9 @@ Optional Features: + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +@@ -4311,6 +4315,22 @@ fi + $as_echo "$enable_version_specific_runtime_libs" >&6; } + + ++ ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ + # Calculate toolexeclibdir. + # Also toolexecdir, though it's only used in toolexeclibdir. + case ${enable_version_specific_runtime_libs} in +@@ -4326,7 +4346,14 @@ case ${enable_version_specific_runtime_libs} in + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +@@ -10815,7 +10842,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10818 "configure" ++#line 10845 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10921,7 +10948,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10924 "configure" ++#line 10955 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +diff --git a/libquadmath/configure b/libquadmath/configure +index 76a2c20b7e1..e887071aeb2 100755 +--- a/libquadmath/configure ++++ b/libquadmath/configure +@@ -749,6 +749,7 @@ enable_fast_install + with_gnu_ld + enable_libtool_lock + enable_maintainer_mode ++with_toolexeclibdir + enable_symvers + enable_generated_files_in_srcdir + with_gcc_major_version_only +@@ -1408,6 +1409,9 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-gcc-major-version-only + use only GCC major number in filesystem paths + +@@ -10572,7 +10576,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10575 "configure" ++#line 10579 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10678,7 +10682,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10681 "configure" ++#line 10689 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11917,6 +11921,22 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ++ ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ + # Calculate toolexeclibdir + # Also toolexecdir, though it's only used in toolexeclibdir + case ${version_specific_libs} in +@@ -11932,7 +11952,14 @@ case ${version_specific_libs} in + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +diff --git a/libsanitizer/configure b/libsanitizer/configure +index a3a08d635f4..5f4cdcad38d 100755 +--- a/libsanitizer/configure ++++ b/libsanitizer/configure +@@ -767,6 +767,7 @@ enable_multilib + enable_version_specific_runtime_libs + enable_dependency_tracking + enable_maintainer_mode ++with_toolexeclibdir + enable_shared + enable_static + with_pic +@@ -1425,6 +1426,9 @@ Optional Features: + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +@@ -4773,6 +4777,22 @@ fi + + + ++ ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ + # Calculate toolexeclibdir + # Also toolexecdir, though it's only used in toolexeclibdir + case ${version_specific_libs} in +@@ -4788,7 +4808,14 @@ case ${version_specific_libs} in + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +@@ -12032,7 +12059,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12035 "configure" ++#line 12062 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12138,7 +12165,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12141 "configure" ++#line 12168 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +diff --git a/libssp/configure b/libssp/configure +index ee1751d20db..3273cd40ab1 100755 +--- a/libssp/configure ++++ b/libssp/configure +@@ -743,6 +743,7 @@ with_pic + enable_fast_install + with_gnu_ld + enable_libtool_lock ++with_toolexeclibdir + with_gcc_major_version_only + ' + ac_precious_vars='build_alias +@@ -1389,6 +1390,9 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-gcc-major-version-only + use only GCC major number in filesystem paths + +@@ -10671,7 +10675,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10674 "configure" ++#line 10678 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10777,7 +10781,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10780 "configure" ++#line 10784 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11039,6 +11043,22 @@ esac + + + ++ ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ ++ ++ + # Calculate toolexeclibdir + # Also toolexecdir, though it's only used in toolexeclibdir + case ${version_specific_libs} in +@@ -11054,7 +11074,14 @@ case ${version_specific_libs} in + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ toolexeclibdir='$(toolexecdir)/lib' ++ ;; ++ *) ++ toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure +index de8390703e2..88de3f728d4 100755 +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -903,6 +903,7 @@ enable_libstdcxx_threads + enable_libstdcxx_filesystem_ts + with_gxx_include_dir + enable_version_specific_runtime_libs ++with_toolexeclibdir + with_gcc_major_version_only + ' + ac_precious_vars='build_alias +@@ -1623,6 +1624,9 @@ Optional Packages: + set the std::string ABI to use by default + --with-gxx-include-dir=DIR + installation directory for include files ++ --with-toolexeclibdir=DIR ++ install libraries built with a cross compiler within ++ DIR + --with-gcc-major-version-only + use only GCC major number in filesystem paths + +@@ -11606,7 +11610,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11609 "configure" ++#line 11613 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11712,7 +11716,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11715 "configure" ++#line 11723 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -15398,7 +15402,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } + # Fake what AC_TRY_COMPILE does. + + cat > conftest.$ac_ext << EOF +-#line 15401 "configure" ++#line 15409 "configure" + int main() + { + typedef bool atomic_type; +@@ -15433,7 +15437,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } + rm -f conftest* + + cat > conftest.$ac_ext << EOF +-#line 15436 "configure" ++#line 15440 "configure" + int main() + { + typedef short atomic_type; +@@ -15468,7 +15472,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } + rm -f conftest* + + cat > conftest.$ac_ext << EOF +-#line 15471 "configure" ++#line 15475 "configure" + int main() + { + // NB: _Atomic_word not necessarily int. +@@ -15504,7 +15508,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } + rm -f conftest* + + cat > conftest.$ac_ext << EOF +-#line 15507 "configure" ++#line 15511 "configure" + int main() + { + typedef long long atomic_type; +@@ -15585,7 +15589,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu + # unnecessary for this test. + + cat > conftest.$ac_ext << EOF +-#line 15588 "configure" ++#line 15592 "configure" + int main() + { + _Decimal32 d1; +@@ -15627,7 +15631,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + # unnecessary for this test. + + cat > conftest.$ac_ext << EOF +-#line 15630 "configure" ++#line 15634 "configure" + template + struct same + { typedef T2 type; }; +@@ -15661,7 +15665,7 @@ $as_echo "$enable_int128" >&6; } + rm -f conftest* + + cat > conftest.$ac_ext << EOF +-#line 15664 "configure" ++#line 15668 "configure" + template + struct same + { typedef T2 type; }; +@@ -81674,6 +81678,19 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version_specific_libs" >&5 + $as_echo "$version_specific_libs" >&6; } + ++# Check whether --with-toolexeclibdir was given. ++if test "${with_toolexeclibdir+set}" = set; then : ++ withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in ++ /) ++ ;; ++ */) ++ with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` ++ ;; ++esac ++else ++ with_toolexeclibdir=no ++fi ++ + # Default case for install directory for include files. + if test $version_specific_libs = no && test $gxx_include_dir = no; then + gxx_include_dir='include/c++/${gcc_version}' +@@ -81704,7 +81721,14 @@ $as_echo "$version_specific_libs" >&6; } + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + glibcxx_toolexecdir='${exec_prefix}/${host_alias}' +- glibcxx_toolexeclibdir='${toolexecdir}/lib' ++ case ${with_toolexeclibdir} in ++ no) ++ glibcxx_toolexeclibdir='${toolexecdir}/lib' ++ ;; ++ *) ++ glibcxx_toolexeclibdir=${with_toolexeclibdir} ++ ;; ++ esac + else + glibcxx_toolexecdir='${libdir}/gcc/${host_alias}' + glibcxx_toolexeclibdir='${libdir}' +-- +2.24.0 + -- cgit v1.2.3 From c75db693713e74a632bafe849de68a87ee7e34eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Mar 2020 17:58:20 +0100 Subject: gnu: ghc: Really disable test that fails with glibc 2.30 and later. This follows up commit 2e9c43aa9adac2bd6bcf92373d1cf9f322afa5a3, which was incomplete. Fixes . * gnu/packages/patches/ghc-testsuite-dlopen-pie.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Also use tabs instead of spaces on surrounding patches. * gnu/packages/haskell.scm (ghc-8.6)[native-inputs]: Add patch for "ghc-testsuite". [arguments]: Remove incomplete workaround for the same issue. --- gnu/local.mk | 5 +- gnu/packages/haskell.scm | 9 +--- .../patches/ghc-testsuite-dlopen-pie.patch | 54 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/ghc-testsuite-dlopen-pie.patch diff --git a/gnu/local.mk b/gnu/local.mk index 38dec7f081..f335ee1d25 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -930,9 +930,10 @@ dist_patch_DATA = \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ %D%/packages/patches/geoclue-config.patch \ - %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ - %D%/packages/patches/ghc-diff-swap-cover-args.patch \ + %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ + %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ + %D%/packages/patches/ghc-diff-swap-cover-args.patch \ %D%/packages/patches/ghc-haddock-api-fix-haddock.patch \ %D%/packages/patches/ghc-hpack-fix-tests.patch \ %D%/packages/patches/ghc-microlens-aeson-fix-tests.patch \ diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8a332636ba..a11b6995ce 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2019 Jacob MacDonald -;;; Copyright © Marius Bakke +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -568,6 +568,7 @@ interactive environment for the functional language Haskell.") (uri (string-append "https://www.haskell.org/ghc/dist/" version "/" name "-" version "-testsuite.tar.xz")) + (patches (search-patches "ghc-testsuite-dlopen-pie.patch")) (sha256 (base32 "0pw9r91g2np3i806g2f4f8z4jfdd7mx226cmdizk4swa7av1qf91")))) @@ -591,12 +592,6 @@ interactive environment for the functional language Haskell.") (("^test\\('T8108'") "# guix skipped: test('T8108'")) (substitute* "libraries/unix/tests/libposix/all.T" (("^test\\('posix010'") "# guix skipped: test('posix010'")) - ;; This test attempts to dlopen() a position-independent - ;; executable(!), which is disallowed since glibc 2.30. See - ;; https://sourceware.org/bugzilla/show_bug.cgi?id=24323 - (substitute* "testsuite/tests/dynlibs/Makefile" - (("\\./T13702a") - "# ./T13702a")) #t)))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") diff --git a/gnu/packages/patches/ghc-testsuite-dlopen-pie.patch b/gnu/packages/patches/ghc-testsuite-dlopen-pie.patch new file mode 100644 index 0000000000..99ba3ac42f --- /dev/null +++ b/gnu/packages/patches/ghc-testsuite-dlopen-pie.patch @@ -0,0 +1,54 @@ +Do not attempt to dlopen PIE objects, which was disallowed with glibc 2.30. + +https://gitlab.haskell.org/ghc/ghc/issues/17952 +https://sourceware.org/bugzilla/show_bug.cgi?id=24323 + +Patch submitted upstream: +https://gitlab.haskell.org/ghc/ghc/-/merge_requests/2947 + +diff --git a/testsuite/tests/dynlibs/Makefile b/testsuite/tests/dynlibs/Makefile +--- a/testsuite/tests/dynlibs/Makefile ++++ b/testsuite/tests/dynlibs/Makefile +@@ -60,6 +60,4 @@ T5373: + .PHONY: T13702 + T13702: + '$(TEST_HC)' -v0 -dynamic -rdynamic -fPIC -pie T13702.hs +- '$(TEST_HC)' -v0 -dynamic T13702a.hs +- ./T13702 # first make sure executable itself works +- ./T13702a # then try dynamically loading it as library ++ ./T13702 +diff --git a/testsuite/tests/dynlibs/T13702.hs b/testsuite/tests/dynlibs/T13702.hs +--- a/testsuite/tests/dynlibs/T13702.hs ++++ b/testsuite/tests/dynlibs/T13702.hs +@@ -2,8 +2,3 @@ + + main :: IO () + main = putStrLn "hello world" +- +-foreign export ccall "hello" hello :: IO () +- +-hello :: IO () +-hello = putStrLn "hello world again" +diff --git a/testsuite/tests/dynlibs/T13702.stdout b/testsuite/tests/dynlibs/T13702.stdout +--- a/testsuite/tests/dynlibs/T13702.stdout ++++ b/testsuite/tests/dynlibs/T13702.stdout +@@ -1,2 +1 @@ + hello world +-hello world again +diff --git a/testsuite/tests/dynlibs/T13702a.hs b/testsuite/tests/dynlibs/T13702a.hs +deleted file mode 100644 +--- a/testsuite/tests/dynlibs/T13702a.hs ++++ /dev/null +@@ -1,12 +0,0 @@ +-{-# LANGUAGE ForeignFunctionInterface #-} +- +-import Foreign +-import System.Posix.DynamicLinker +- +-main :: IO () +-main = do +- dl <- dlopen "./T13702" [RTLD_NOW] +- funptr <- dlsym dl "hello" :: IO (FunPtr (IO ())) +- mkAction funptr +- +-foreign import ccall "dynamic" mkAction :: FunPtr (IO ()) -> IO () -- cgit v1.2.3 From f4e183320515e00a68912d98e1f8367c72886527 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Mar 2020 17:59:18 +0100 Subject: gnu: ghc@8.0: Remove obsolete patch. * gnu/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/haskell.scm (ghc-8.0)[source](patches): Remove it. --- gnu/local.mk | 1 - gnu/packages/haskell.scm | 4 +--- ...dont-pass-linker-flags-via-response-files.patch | 27 ---------------------- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 gnu/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch diff --git a/gnu/local.mk b/gnu/local.mk index f335ee1d25..6ed9789481 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -932,7 +932,6 @@ dist_patch_DATA = \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ - %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ %D%/packages/patches/ghc-diff-swap-cover-args.patch \ %D%/packages/patches/ghc-haddock-api-fix-haddock.patch \ %D%/packages/patches/ghc-hpack-fix-tests.patch \ diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a11b6995ce..739b86a100 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -320,9 +320,7 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi")) (patches - (search-patches - "ghc-dont-pass-linker-flags-via-response-files.patch" - "ghc-8.0-fall-back-to-madv_dontneed.patch")))) + (search-patches "ghc-8.0-fall-back-to-madv_dontneed.patch")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (outputs '("out" "doc")) diff --git a/gnu/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch b/gnu/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch deleted file mode 100644 index 40aae7a9d7..0000000000 --- a/gnu/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch +++ /dev/null @@ -1,27 +0,0 @@ -Don’t add linker flags via ‘response files’ since ld-wrapper -doesn’t handle them. -See https://github.com/NixOS/nixpkgs/commit/a421e7bd4a28c69bded8b17888325e31554f61a1 -https://gcc.gnu.org/ml/gcc/2016-10/msg00151.html - -diff --git a/compiler/main/SysTools.hs.orig b/compiler/main/SysTools.hs -index 1ab5b13..99270fc 100644 ---- a/compiler/main/SysTools.hs.orig -+++ b/compiler/main/SysTools.hs -@@ -424,7 +424,7 @@ runCc dflags args = do - args1 = map Option (getOpts dflags opt_c) - args2 = args0 ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env -+ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env - where - -- discard some harmless warnings from gcc that we can't turn off - cc_filter = unlines . doFilter . lines -@@ -945,7 +945,7 @@ runLink dflags args = do - args1 = map Option (getOpts dflags opt_l) - args2 = args0 ++ linkargs ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env -+ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env - where - ld_filter = case (platformOS (targetPlatform dflags)) of - OSSolaris2 -> sunos_ld_filter -- cgit v1.2.3 From eac54126fbb0712a436eaa1b152a55efb32046ab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Mar 2020 17:59:45 +0100 Subject: gnu: GHC: Enable RUNPATH validation. * gnu/packages/haskell.scm (ghc-7, ghc-8.0, ghc-8.4)[arguments]: Remove #:validate-runpath?. --- gnu/packages/haskell.scm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 739b86a100..982dced5d0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -171,10 +171,6 @@ top of CLISP.") ;; execution. #:parallel-tests? #f - ;; The DSOs use $ORIGIN to refer to each other, but (guix build - ;; gremlin) doesn't support it yet, so skip this phase. - #:validate-runpath? #f - ;; Don't pass --build=, because the configure script ;; auto-detects slightly different triplets for --host and --target and ;; then complains that they don't match. @@ -348,10 +344,6 @@ interactive environment for the functional language Haskell.") ;; execution. #:parallel-tests? #f - ;; The DSOs use $ORIGIN to refer to each other, but (guix build - ;; gremlin) doesn't support it yet, so skip this phase. - #:validate-runpath? #f - ;; Don't pass --build=, because the configure script ;; auto-detects slightly different triplets for --host and --target and ;; then complains that they don't match. @@ -454,10 +446,6 @@ interactive environment for the functional language Haskell.") ;; execution. #:parallel-tests? #f - ;; The DSOs use $ORIGIN to refer to each other, but (guix build - ;; gremlin) doesn't support it yet, so skip this phase. - #:validate-runpath? #f - ;; Don't pass --build=, because the configure script ;; auto-detects slightly different triplets for --host and --target and ;; then complains that they don't match. -- cgit v1.2.3 From 654de94e74547f61a0996cae70ddba2826bfd8d4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 11 Mar 2020 00:33:24 +0100 Subject: gnu: grub: Support for the Hurd. * gnu/packages/virtualization.scm (qemu)[supported-systems]: Remove the Hurd. * gnu/packages/linux.scm (mdadm)[supported-systems]: Likewise. (lvm2)[supported-systems]: Likewise. (fuse)[supported-systems]: Likewise. * gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch: New file * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/bootloaders.scm (grub): Use it. [inputs, native-inputs]: Remove non-supported dependencies on non-supported systems. Fixes build for the Hurd. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 26 +++++++++++--- gnu/packages/linux.scm | 3 ++ .../grub-verifiers-Blocklist-fallout-cleanup.patch | 41 ++++++++++++++++++++++ gnu/packages/virtualization.scm | 3 +- 5 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6ed9789481..adeaa6deaa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -994,6 +994,7 @@ dist_patch_DATA = \ %D%/packages/patches/grep-timing-sensitive-test.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ + %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 44808e1225..afbd1909bf 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -91,7 +91,9 @@ (sha256 (base32 "0zgp5m3hmc9jh8wpjx6czzkh5id2y8n1k823x2mjvm2sk6b28ag5")) - (patches (search-patches "grub-efi-fat-serial-number.patch")))) + (patches (search-patches + "grub-efi-fat-serial-number.patch" + "grub-verifiers-Blocklist-fallout-cleanup.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -152,11 +154,19 @@ ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and ;; 'grub-install' to recognize mapped devices (LUKS, etc.) - ("lvm2" ,lvm2) + ,@(if (member (or (%current-target-system) + (%current-system)) + (package-supported-systems lvm2)) + `(("lvm2" ,lvm2)) + '()) ;; Depend on mdadm, which is invoked by 'grub-probe' and 'grub-install' ;; to determine whether the root file system is RAID. - ("mdadm" ,mdadm) + ,@(if (member (or (%current-target-system) + (%current-system)) + (package-supported-systems mdadm)) + `(("mdadm" ,mdadm)) + '()) ;; Console-setup's ckbcomp is invoked by grub-kbdcomp. It is required ;; for generating alternative keyboard layouts. @@ -164,7 +174,11 @@ ;; Needed for ‘grub-mount’, the only reliable way to tell whether a given ;; file system will be readable by GRUB without rebooting. - ("fuse" ,fuse) + ,@(if (member (or (%current-target-system) + (%current-system)) + (package-supported-systems fuse)) + `(("fuse" ,fuse)) + '()) ("freetype" ,freetype) ;; ("libusb" ,libusb) @@ -196,7 +210,9 @@ ;; Dependencies for the test suite. The "real" QEMU is needed here, ;; because several targets are used. ("parted" ,parted) - ("qemu" ,qemu-minimal) + ,@(if (member (%current-system) (package-supported-systems qemu-minimal)) + `(("qemu" ,qemu-minimal)) + '()) ("xorriso" ,xorriso))) (home-page "https://www.gnu.org/software/grub/") (synopsis "GRand Unified Boot loader") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 69c2818355..b73b86b0e8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2401,6 +2401,7 @@ processes currently causing I/O.") (("-DFUSERMOUNT_DIR=[[:graph:]]+") "-DFUSERMOUNT_DIR=\\\"/var/empty\\\"")) #t))))) + (supported-systems (delete "i586-gnu" %supported-systems)) (home-page "https://github.com/libfuse/libfuse") (synopsis "Support file systems implemented in user space") (description @@ -3009,6 +3010,7 @@ time.") ;; The tests use 'mknod', which requires root access. #:tests? #f)) + (supported-systems (delete "i586-gnu" %supported-systems)) (home-page "https://sourceware.org/lvm2/") (synopsis "Logical volume management for Linux") (description @@ -3920,6 +3922,7 @@ MPEG-2 and audio over Linux IEEE 1394.") (delete 'configure)) ;;tests must be done as root #:tests? #f)) + (supported-systems (delete "i586-gnu" %supported-systems)) (home-page "http://neil.brown.name/blog/mdadm") (synopsis "Tool for managing Linux Software RAID arrays") (description diff --git a/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch b/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch new file mode 100644 index 0000000000..2bea74ea95 --- /dev/null +++ b/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch @@ -0,0 +1,41 @@ +This patch is needed to build Grub on the Hurd. + +Taken from upstream: https://git.savannah.gnu.org/cgit/grub.git/commit//?id=dabdfa1c6a80639197d05f683a445fa8615517fe + +From 7606547586b2d6ca1b384e15e0358d3a3ddc48a6 Mon Sep 17 00:00:00 2001 +From: David Michael +Date: Fri, 5 Jul 2019 07:45:59 -0400 +Subject: verifiers: Blocklist fallout cleanup + +Blocklist fallout cleanup after commit 5c6f9bc15 (generic/blocklist: Fix +implicit declaration of function grub_file_filter_disable_compression()). + +Signed-off-by: David Michael +Reviewed-by: Daniel Kiper + +--- + grub-core/osdep/generic/blocklist.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/grub-core/osdep/generic/blocklist.c b/grub-core/osdep/generic/blocklist.c +index ea2a511b6..2d9040302 100644 +--- a/grub-core/osdep/generic/blocklist.c ++++ b/grub-core/osdep/generic/blocklist.c +@@ -59,7 +59,7 @@ grub_install_get_blocklist (grub_device_t root_dev, + + grub_disk_cache_invalidate_all (); + +- file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS); ++ file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS); + if (file) + { + if (grub_file_size (file) != core_size) +@@ -116,7 +116,7 @@ grub_install_get_blocklist (grub_device_t root_dev, + + grub_file_t file; + /* Now read the core image to determine where the sectors are. */ +- file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS); ++ file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS); + if (! file) + grub_util_error ("%s", grub_errmsg); + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c04ff8810e..9fcea5f7ea 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -285,7 +285,8 @@ server and embedded PowerPC, and S390 guests.") (license license:gpl2) ;; Several tests fail on MIPS; see . - (supported-systems (delete "mips64el-linux" %supported-systems)))) + (supported-systems (fold delete %supported-systems + '("mips64el-linux" "i586-gnu"))))) (define-public qemu-minimal ;; QEMU without GUI support. -- cgit v1.2.3 From 9b943db357ad63b7a3d063c658b1f557697ef0fa Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 4 Mar 2020 11:49:46 -0500 Subject: gnu: hurd: Fix hurd-target?, add hurd-system?. * gnu/packages/hurd.scm (hurd-target?): Bugfix; the arguments to string-suffix? to test (%current-system) were transposed, always resulting in #f. Use hurd-triplet?. (hurd-system?): New exported variable. --- gnu/packages/hurd.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index c147bac8a3..59d5c31e33 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,8 +35,9 @@ #:use-module (gnu packages base) #:use-module (gnu packages texinfo) #:use-module (guix git-download) - #:export (hurd-triplet? - hurd-target?)) + #:export (hurd-system? + hurd-target? + hurd-triplet?)) (define (hurd-triplet? triplet) (and (string-suffix? "-gnu" triplet) @@ -45,7 +47,12 @@ "Return true if the cross-compilation target or the current system is GNU/Hurd." (or (and=> (%current-target-system) hurd-triplet?) - (string-suffix? (%current-system) "-gnu"))) + (and (not (%current-target-system)) + (and=> (%current-system) hurd-triplet?)))) + +(define (hurd-system?) + "Return true if the current system is the Hurd." + (and=> (%current-system) hurd-triplet?)) (define (hurd-source-url version) (string-append "mirror://gnu/hurd/hurd-" -- cgit v1.2.3 From 974c42a70a12f0c4ed298c2c8dab3f154338de58 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 1 Mar 2020 16:37:37 +0100 Subject: gnu: glibc: Add clock patches for the Hurd. * gnu/packages/patches/glibc-hurd-clock_t_centiseconds.patch: New file. * gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch: New file. * gnu/local.mk (dist_patch_DATA): Update them. * gnu/packages/base.scm (glibc): Use them. --- gnu/local.mk | 4 +- gnu/packages/base.scm | 4 +- .../glibc-hurd-clock_gettime_monotonic.patch | 84 ++++++++++++++++++++ .../patches/glibc-hurd-clock_t_centiseconds.patch | 90 ++++++++++++++++++++++ 4 files changed, 180 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch create mode 100644 gnu/packages/patches/glibc-hurd-clock_t_centiseconds.patch diff --git a/gnu/local.mk b/gnu/local.mk index adeaa6deaa..f7b0a2577d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -11,7 +11,7 @@ # Copyright © 2016 Ben Woodcroft # Copyright © 2016, 2017, 2018, 2019 Alex Vong # Copyright © 2016, 2017, 2018, 2019 Efraim Flashner -# Copyright © 2016, 2017, 2018, 2019 Jan (janneke) Nieuwenhuizen +# Copyright © 2016, 2017, 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen # Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice # Copyright © 2017, 2018 Clément Lassieur # Copyright © 2017, 2020 Mathieu Othacehe @@ -962,6 +962,8 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-bootstrap-system-2.16.0.patch \ %D%/packages/patches/glibc-bootstrap-system.patch \ %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \ + %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch \ + %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c3298b3cec..1b7a834ac8 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -612,7 +612,9 @@ the store.") "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" - "glibc-supported-locales.patch")))) + "glibc-supported-locales.patch" + "glibc-hurd-clock_t_centiseconds.patch" + "glibc-hurd-clock_gettime_monotonic.patch")))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc diff --git a/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch b/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch new file mode 100644 index 0000000000..1c3fe427f9 --- /dev/null +++ b/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch @@ -0,0 +1,84 @@ +This is needed to run Python on the Hurd, especially during the build of +python-boot0. + +Adapted from https://salsa.debian.org/glibc-team/glibc/-/blob/glibc-2.31/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff + +Use the realtime clock for the monotonic clock. This is of course not a proper +implementation (which is being done in Mach), but will permit to fix at least +the iceweasel stack. + +vlc however doesn't build when _POSIX_CLOCK_SELECTION is enabled but +_POSIX_TIMERS is not, and they refuse to fix that (see #765578), so disable the +former. + +From 0aa1dfd580cf9ad7b812c307b128decb782b825f Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Mon, 2 Mar 2020 18:59:04 +0100 +Subject: [PATCH 2/2] Use realtime clock for the monotonic clock. + +--- + sysdeps/mach/clock_gettime.c | 2 +- + sysdeps/mach/hurd/bits/posix_opt.h | 6 +++--- + sysdeps/posix/clock_getres.c | 1 + + sysdeps/pthread/timer_create.c | 2 +- + 4 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/sysdeps/mach/clock_gettime.c b/sysdeps/mach/clock_gettime.c +index ac3547df3c..af8681ba4e 100644 +--- a/sysdeps/mach/clock_gettime.c ++++ b/sysdeps/mach/clock_gettime.c +@@ -25,7 +25,7 @@ + int + __clock_gettime (clockid_t clock_id, struct timespec *ts) + { +- if (clock_id != CLOCK_REALTIME) ++ if (clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME) + { + errno = EINVAL; + return -1; +diff --git a/sysdeps/mach/hurd/bits/posix_opt.h b/sysdeps/mach/hurd/bits/posix_opt.h +index 0050151332..27b3a28ab7 100644 +--- a/sysdeps/mach/hurd/bits/posix_opt.h ++++ b/sysdeps/mach/hurd/bits/posix_opt.h +@@ -163,10 +163,10 @@ + #define _POSIX_THREAD_PROCESS_SHARED -1 + + /* The monotonic clock might be available. */ +-#define _POSIX_MONOTONIC_CLOCK 0 ++#define _POSIX_MONOTONIC_CLOCK 200809L + +-/* The clock selection interfaces are available. */ +-#define _POSIX_CLOCK_SELECTION 200809L ++/* The clock selection interfaces are not really available yet. */ ++#define _POSIX_CLOCK_SELECTION -1 + + /* Advisory information interfaces could be available in future. */ + #define _POSIX_ADVISORY_INFO 0 +diff --git a/sysdeps/posix/clock_getres.c b/sysdeps/posix/clock_getres.c +index fcd79fd554..1dd02aa449 100644 +--- a/sysdeps/posix/clock_getres.c ++++ b/sysdeps/posix/clock_getres.c +@@ -52,6 +52,7 @@ __clock_getres (clockid_t clock_id, struct timespec *res) + switch (clock_id) + { + case CLOCK_REALTIME: ++ case CLOCK_MONOTONIC: + retval = realtime_getres (res); + break; + +diff --git a/sysdeps/pthread/timer_create.c b/sysdeps/pthread/timer_create.c +index 9d8a9ea8ae..3430582c09 100644 +--- a/sysdeps/pthread/timer_create.c ++++ b/sysdeps/pthread/timer_create.c +@@ -48,7 +48,7 @@ timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid) + return -1; + } + +- if (clock_id != CLOCK_REALTIME) ++ if (clock_id != CLOCK_REALTIME && clock_id != CLOCK_MONOTONIC) + { + __set_errno (EINVAL); + return -1; +-- +2.24.0 + diff --git a/gnu/packages/patches/glibc-hurd-clock_t_centiseconds.patch b/gnu/packages/patches/glibc-hurd-clock_t_centiseconds.patch new file mode 100644 index 0000000000..8f9676c873 --- /dev/null +++ b/gnu/packages/patches/glibc-hurd-clock_t_centiseconds.patch @@ -0,0 +1,90 @@ +This is needed to run Python on the Hurd, especially during the build of +python-boot0. + +Adapted from https://salsa.debian.org/glibc-team/glibc/-/blob/glibc-2.31/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff + + commit d57f2f9b4bd007846af2fb4217486ea572579010 + Author: Richard Braun + Date: Tue Aug 27 11:35:31 2013 +0200 + + Express CPU time (clock_t of times(2)) in centiseconds + +From 170c292b643fdc1eb56881e6592b07c0c019993e Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Mon, 2 Mar 2020 18:28:54 +0100 +Subject: [PATCH 1/2] Express CPU time (clock_t) in centiseconds + +--- + sysdeps/mach/hurd/clock.c | 8 ++++---- + sysdeps/mach/hurd/getclktck.c | 5 ++--- + sysdeps/mach/hurd/setitimer.c | 2 +- + sysdeps/mach/hurd/times.c | 2 +- + 4 files changed, 8 insertions(+), 9 deletions(-) + +diff --git a/sysdeps/mach/hurd/clock.c b/sysdeps/mach/hurd/clock.c +index 7cb42df786..4db49b579d 100644 +--- a/sysdeps/mach/hurd/clock.c ++++ b/sysdeps/mach/hurd/clock.c +@@ -44,10 +44,10 @@ clock (void) + if (err) + return __hurd_fail (err); + +- total = bi.user_time.seconds * 1000000 + bi.user_time.microseconds; +- total += tti.user_time.seconds * 1000000 + tti.user_time.microseconds; +- total += bi.system_time.seconds * 1000000 + bi.system_time.microseconds; +- total += tti.system_time.seconds * 1000000 + tti.system_time.microseconds; ++ total = bi.user_time.seconds * 100 + bi.user_time.microseconds / 10000; ++ total += tti.user_time.seconds * 100 + tti.user_time.microseconds / 10000; ++ total += bi.system_time.seconds * 100 + bi.system_time.microseconds / 10000; ++ total += tti.system_time.seconds * 100 + tti.system_time.microseconds / 10000; + + return total; + } +diff --git a/sysdeps/mach/hurd/getclktck.c b/sysdeps/mach/hurd/getclktck.c +index 943e36e805..5a3cf0930b 100644 +--- a/sysdeps/mach/hurd/getclktck.c ++++ b/sysdeps/mach/hurd/getclktck.c +@@ -18,12 +18,11 @@ + + #include + +-/* Return frequency of `times'. +- Since Mach reports CPU times in microseconds, we always use 1 million. */ ++/* Return frequency of `times'. */ + int + __getclktck (void) + { +- return 1000000; ++ return 100; + } + + /* Before glibc 2.2, the Hurd actually did this differently, so we +diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c +index b16f4ddd5d..8bf1464830 100644 +--- a/sysdeps/mach/hurd/setitimer.c ++++ b/sysdeps/mach/hurd/setitimer.c +@@ -43,7 +43,7 @@ quantize_timeval (struct timeval *tv) + static time_t quantum = -1; + + if (quantum == -1) +- quantum = 1000000 / __getclktck (); ++ quantum = 100 / __getclktck (); + + tv->tv_usec = ((tv->tv_usec + (quantum - 1)) / quantum) * quantum; + if (tv->tv_usec >= 1000000) +diff --git a/sysdeps/mach/hurd/times.c b/sysdeps/mach/hurd/times.c +index 23ed992783..cbf6039b19 100644 +--- a/sysdeps/mach/hurd/times.c ++++ b/sysdeps/mach/hurd/times.c +@@ -29,7 +29,7 @@ + static inline clock_t + clock_from_time_value (const time_value_t *t) + { +- return t->seconds * 1000000 + t->microseconds; ++ return t->seconds * 100 + t->microseconds / 10000; + } + + /* Store the CPU time used by this process and all its +-- +2.24.0 + -- cgit v1.2.3 From 096a8e35e746d623810e214e3e4a1008b99598fe Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 8 Mar 2020 14:01:17 +0100 Subject: gnu: glibc: Add signal SA_SIGINFO support for the Hurd. * gnu/packages/patches/glibc-hurd-signal-sa-siginfo.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/base.scm (glibc): Use it. --- gnu/local.mk | 1 + gnu/packages/base.scm | 3 +- .../patches/glibc-hurd-signal-sa-siginfo.patch | 637 +++++++++++++++++++++ 3 files changed, 640 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-hurd-signal-sa-siginfo.patch diff --git a/gnu/local.mk b/gnu/local.mk index f7b0a2577d..f0f47aa691 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -965,6 +965,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch \ %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ + %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ %D%/packages/patches/glibc-locales-2.28.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1b7a834ac8..5c976aee52 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -614,7 +614,8 @@ the store.") "glibc-reinstate-prlimit64-fallback.patch" "glibc-supported-locales.patch" "glibc-hurd-clock_t_centiseconds.patch" - "glibc-hurd-clock_gettime_monotonic.patch")))) + "glibc-hurd-clock_gettime_monotonic.patch" + "glibc-hurd-signal-sa-siginfo.patch")))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc diff --git a/gnu/packages/patches/glibc-hurd-signal-sa-siginfo.patch b/gnu/packages/patches/glibc-hurd-signal-sa-siginfo.patch new file mode 100644 index 0000000000..36ea55e188 --- /dev/null +++ b/gnu/packages/patches/glibc-hurd-signal-sa-siginfo.patch @@ -0,0 +1,637 @@ +This patch is needed to build e2fsprogs, util-linux. + +Taken from https://salsa.debian.org/glibc-team/glibc/-/blob/glibc-2.31/debian/patches/hurd-i386/tg-hurdsig-SA_SIGINFO.diff + +From: Jeremie Koenig +Subject: [PATCH] implement SA_SIGINFO signal handlers. + + 52baaca Hurd signals: Copy bits/sigaction.h + 4232c66 Hurd signals: SA_SIGINFO support + 1831cfe Hurd signals: Use POSIX sigcodes + +--- + hurd/hurd/signal.h | 5 + + hurd/hurdfault.c | 2 + hurd/hurdinit.c | 2 + hurd/hurdsig.c | 6 - + sysdeps/mach/hurd/bits/sigaction.h | 86 +++++++++++++++++++++ + sysdeps/mach/hurd/i386/bits/sigcontext.h | 4 + sysdeps/mach/hurd/i386/exc2signal.c | 123 +++++++++++++++++++----------- + sysdeps/mach/hurd/i386/trampoline.c | 125 ++++++++++++++++++++++++++++--- + sysdeps/mach/hurd/kill.c | 2 + sysdeps/mach/hurd/setitimer.c | 2 + 10 files changed, 293 insertions(+), 64 deletions(-) + +Index: glibc-2.31/hurd/hurd/signal.h +=================================================================== +--- glibc-2.31.orig/hurd/hurd/signal.h ++++ glibc-2.31/hurd/hurd/signal.h +@@ -290,6 +290,11 @@ extern int _hurd_raise_signal (struct hu + extern void _hurd_exception2signal (struct hurd_signal_detail *detail, + int *signo); + ++/* Translate a Mach exception into a signal with a legacy sigcode. */ ++ ++extern void _hurd_exception2signal_legacy (struct hurd_signal_detail *detail, ++ int *signo); ++ + + /* Make the thread described by SS take the signal described by SIGNO and + DETAIL. If the process is traced, this will in fact stop with a SIGNO +Index: glibc-2.31/hurd/hurdfault.c +=================================================================== +--- glibc-2.31.orig/hurd/hurdfault.c ++++ glibc-2.31/hurd/hurdfault.c +@@ -70,7 +70,7 @@ _hurdsig_fault_catch_exception_raise (ma + codes into a signal number and subcode. */ + _hurd_exception2signal (&d, &signo); + +- return HURD_PREEMPT_SIGNAL_P (&_hurdsig_fault_preemptor, signo, d.code) ++ return HURD_PREEMPT_SIGNAL_P (&_hurdsig_fault_preemptor, signo, d.exc_subcode) + ? 0 : EGREGIOUS; + } + +Index: glibc-2.31/hurd/hurdinit.c +=================================================================== +--- glibc-2.31.orig/hurd/hurdinit.c ++++ glibc-2.31/hurd/hurdinit.c +@@ -177,7 +177,7 @@ _hurd_new_proc_init (char **argv, + /* This process is "traced", meaning it should stop on signals or exec. + We are all set up now to handle signals. Stop ourselves, to inform + our parent (presumably a debugger) that the exec has completed. */ +- __msg_sig_post (_hurd_msgport, SIGTRAP, 0, __mach_task_self ()); ++ __msg_sig_post (_hurd_msgport, SIGTRAP, TRAP_TRACE, __mach_task_self ()); + } + + #include +Index: glibc-2.31/hurd/hurdsig.c +=================================================================== +--- glibc-2.31.orig/hurd/hurdsig.c ++++ glibc-2.31/hurd/hurdsig.c +@@ -730,7 +730,7 @@ post_signal (struct hurd_sigstate *ss, + { /* PE cannot be null. */ + do + { +- if (HURD_PREEMPT_SIGNAL_P (pe, signo, detail->code)) ++ if (HURD_PREEMPT_SIGNAL_P (pe, signo, detail->exc_subcode)) + { + if (pe->preemptor) + { +@@ -1374,7 +1374,7 @@ _S_msg_sig_post (mach_port_t me, + if (err = signal_allowed (signo, refport)) + return err; + +- d.code = sigcode; ++ d.code = d.exc_subcode = sigcode; + d.exc = 0; + + /* Post the signal to a global receiver thread (or mark it pending in +@@ -1403,7 +1403,7 @@ _S_msg_sig_post_untraced (mach_port_t me + if (err = signal_allowed (signo, refport)) + return err; + +- d.code = sigcode; ++ d.code = d.exc_subcode = sigcode; + d.exc = 0; + + /* Post the signal to the designated signal-receiving thread. This will +Index: glibc-2.31/sysdeps/mach/hurd/bits/sigaction.h +=================================================================== +--- /dev/null ++++ glibc-2.31/sysdeps/mach/hurd/bits/sigaction.h +@@ -0,0 +1,86 @@ ++/* Copyright (C) 1991-2015 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#ifndef _BITS_SIGACTION_H ++#define _BITS_SIGACTION_H 1 ++ ++#ifndef _SIGNAL_H ++# error "Never include directly; use instead." ++#endif ++ ++/* These definitions match those used by the 4.4 BSD kernel. ++ If the operating system has a `sigaction' system call that correctly ++ implements the POSIX.1 behavior, there should be a system-dependent ++ version of this file that defines `struct sigaction' and the `SA_*' ++ constants appropriately. */ ++ ++/* Structure describing the action to be taken when a signal arrives. */ ++struct sigaction ++ { ++ /* Signal handler. */ ++#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED ++ union ++ { ++ /* Used if SA_SIGINFO is not set. */ ++ __sighandler_t sa_handler; ++ /* Used if SA_SIGINFO is set. */ ++ void (*sa_sigaction) (int, siginfo_t *, void *); ++ } ++ __sigaction_handler; ++# define sa_handler __sigaction_handler.sa_handler ++# define sa_sigaction __sigaction_handler.sa_sigaction ++#else ++ __sighandler_t sa_handler; ++#endif ++ ++ /* Additional set of signals to be blocked. */ ++ __sigset_t sa_mask; ++ ++ /* Special flags. */ ++ int sa_flags; ++ }; ++ ++/* Bits in `sa_flags'. */ ++#if defined __USE_XOPEN_EXTENDED || defined __USE_MISC ++# define SA_ONSTACK 0x0001 /* Take signal on signal stack. */ ++#endif ++#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 ++# define SA_RESTART 0x0002 /* Restart syscall on signal return. */ ++# define SA_NODEFER 0x0010 /* Don't automatically block the signal when ++ its handler is being executed. */ ++# define SA_RESETHAND 0x0004 /* Reset to SIG_DFL on entry to handler. */ ++#endif ++#define SA_NOCLDSTOP 0x0008 /* Don't send SIGCHLD when children stop. */ ++#define SA_SIGINFO 0x0040 /* Signal handler with SA_SIGINFO args */ ++ ++#ifdef __USE_MISC ++# define SA_INTERRUPT 0 /* Historical no-op ("not SA_RESTART"). */ ++ ++/* Some aliases for the SA_ constants. */ ++# define SA_NOMASK SA_NODEFER ++# define SA_ONESHOT SA_RESETHAND ++# define SA_STACK SA_ONSTACK ++#endif ++ ++ ++/* Values for the HOW argument to `sigprocmask'. */ ++#define SIG_BLOCK 1 /* Block signals. */ ++#define SIG_UNBLOCK 2 /* Unblock signals. */ ++#define SIG_SETMASK 3 /* Set the set of blocked signals. */ ++ ++#endif +Index: glibc-2.31/sysdeps/mach/hurd/i386/bits/sigcontext.h +=================================================================== +--- glibc-2.31.orig/sysdeps/mach/hurd/i386/bits/sigcontext.h ++++ glibc-2.31/sysdeps/mach/hurd/i386/bits/sigcontext.h +@@ -97,6 +97,10 @@ struct sigcontext + #define sc_ps sc_efl + + ++/* The deprecated sigcode values below are passed as an extra, non-portable ++ argument to regular signal handlers. You should use SA_SIGINFO handlers ++ instead, which use the standard POSIX signal codes. */ ++ + /* Codes for SIGFPE. */ + #define FPE_INTOVF_TRAP 0x1 /* integer overflow */ + #define FPE_INTDIV_FAULT 0x2 /* integer divide by zero */ +Index: glibc-2.31/sysdeps/mach/hurd/i386/exc2signal.c +=================================================================== +--- glibc-2.31.orig/sysdeps/mach/hurd/i386/exc2signal.c ++++ glibc-2.31/sysdeps/mach/hurd/i386/exc2signal.c +@@ -23,8 +23,8 @@ + /* Translate the Mach exception codes, as received in an `exception_raise' RPC, + into a signal number and signal subcode. */ + +-void +-_hurd_exception2signal (struct hurd_signal_detail *detail, int *signo) ++static void ++exception2signal (struct hurd_signal_detail *detail, int *signo, int posix) + { + detail->error = 0; + +@@ -36,44 +36,62 @@ _hurd_exception2signal (struct hurd_sign + break; + + case EXC_BAD_ACCESS: +- if (detail->exc_code == KERN_INVALID_ADDRESS +- || detail->exc_code == KERN_PROTECTION_FAILURE +- || detail->exc_code == KERN_WRITE_PROTECTION_FAILURE) +- *signo = SIGSEGV; +- else +- *signo = SIGBUS; +- detail->code = detail->exc_subcode; ++ switch (detail->exc_code) ++ { ++ case KERN_INVALID_ADDRESS: ++ case KERN_MEMORY_FAILURE: ++ *signo = SIGSEGV; ++ detail->code = posix ? SEGV_MAPERR : detail->exc_subcode; ++ break; ++ ++ case KERN_PROTECTION_FAILURE: ++ case KERN_WRITE_PROTECTION_FAILURE: ++ *signo = SIGSEGV; ++ detail->code = posix ? SEGV_ACCERR : detail->exc_subcode; ++ break; ++ ++ default: ++ *signo = SIGBUS; ++ detail->code = posix ? BUS_ADRERR : detail->exc_subcode; ++ break; ++ } + detail->error = detail->exc_code; + break; + + case EXC_BAD_INSTRUCTION: + *signo = SIGILL; +- if (detail->exc_code == EXC_I386_INVOP) +- detail->code = ILL_INVOPR_FAULT; +- else if (detail->exc_code == EXC_I386_STKFLT) +- detail->code = ILL_STACK_FAULT; +- else +- detail->code = 0; ++ switch (detail->exc_code) ++ { ++ case EXC_I386_INVOP: ++ detail->code = posix ? ILL_ILLOPC : ILL_INVOPR_FAULT; ++ break; ++ ++ case EXC_I386_STKFLT: ++ detail->code = posix ? ILL_BADSTK : ILL_STACK_FAULT; ++ break; ++ ++ default: ++ detail->code = 0; ++ break; ++ } + break; + + case EXC_ARITHMETIC: ++ *signo = SIGFPE; + switch (detail->exc_code) + { + case EXC_I386_DIV: /* integer divide by zero */ +- *signo = SIGFPE; +- detail->code = FPE_INTDIV_FAULT; ++ detail->code = posix ? FPE_INTDIV : FPE_INTDIV_FAULT; + break; + + case EXC_I386_INTO: /* integer overflow */ +- *signo = SIGFPE; +- detail->code = FPE_INTOVF_TRAP; ++ detail->code = posix ? FPE_INTOVF : FPE_INTOVF_TRAP; + break; + + /* These aren't anywhere documented or used in Mach 3.0. */ + case EXC_I386_NOEXT: + case EXC_I386_EXTOVR: + default: +- *signo = SIGFPE; + detail->code = 0; + break; + +@@ -82,51 +100,43 @@ _hurd_exception2signal (struct hurd_sign + Give an error code corresponding to the first bit set. */ + if (detail->exc_subcode & FPS_IE) + { +- *signo = SIGILL; +- detail->code = ILL_FPEOPR_FAULT; ++ /* NB: We used to send SIGILL here but we can't distinguish ++ POSIX vs. legacy with respect to what signal we send. */ ++ detail->code = posix ? FPE_FLTINV : 0 /*ILL_FPEOPR_FAULT*/; + } + else if (detail->exc_subcode & FPS_DE) + { +- *signo = SIGFPE; +- detail->code = FPE_FLTDNR_FAULT; ++ detail->code = posix ? FPE_FLTUND : FPE_FLTDNR_FAULT; + } + else if (detail->exc_subcode & FPS_ZE) + { +- *signo = SIGFPE; +- detail->code = FPE_FLTDIV_FAULT; ++ detail->code = posix ? FPE_FLTDIV : FPE_FLTDIV_FAULT; + } + else if (detail->exc_subcode & FPS_OE) + { +- *signo = SIGFPE; +- detail->code = FPE_FLTOVF_FAULT; ++ detail->code = posix ? FPE_FLTOVF : FPE_FLTOVF_FAULT; + } + else if (detail->exc_subcode & FPS_UE) + { +- *signo = SIGFPE; +- detail->code = FPE_FLTUND_FAULT; ++ detail->code = posix ? FPE_FLTUND : FPE_FLTUND_FAULT; + } + else if (detail->exc_subcode & FPS_PE) + { +- *signo = SIGFPE; +- detail->code = FPE_FLTINX_FAULT; ++ detail->code = posix ? FPE_FLTRES : FPE_FLTINX_FAULT; + } + else + { +- *signo = SIGFPE; + detail->code = 0; + } + break; + + /* These two can only be arithmetic exceptions if we +- are in V86 mode, which sounds like emulation to me. +- (See Mach 3.0 i386/trap.c.) */ ++ are in V86 mode. (See Mach 3.0 i386/trap.c.) */ + case EXC_I386_EMERR: +- *signo = SIGFPE; +- detail->code = FPE_EMERR_FAULT; ++ detail->code = posix ? 0 : FPE_EMERR_FAULT; + break; + case EXC_I386_BOUND: +- *signo = SIGFPE; +- detail->code = FPE_EMBND_FAULT; ++ detail->code = posix ? FPE_FLTSUB : FPE_EMBND_FAULT; + break; + } + break; +@@ -143,7 +153,7 @@ _hurd_exception2signal (struct hurd_sign + if (detail->exc_code == EXC_I386_BOUND) + { + *signo = SIGFPE; +- detail->code = FPE_SUBRNG_FAULT; ++ detail->code = posix ? FPE_FLTSUB : FPE_SUBRNG_FAULT; + } + else + { +@@ -154,13 +164,34 @@ _hurd_exception2signal (struct hurd_sign + + case EXC_BREAKPOINT: + *signo = SIGTRAP; +- if (detail->exc_code == EXC_I386_SGL) +- detail->code = DBG_SINGLE_TRAP; +- else if (detail->exc_code == EXC_I386_BPT) +- detail->code = DBG_BRKPNT_FAULT; +- else +- detail->code = 0; ++ switch (detail->exc_code) ++ { ++ case EXC_I386_SGL: ++ detail->code = posix ? TRAP_BRKPT : DBG_SINGLE_TRAP; ++ break; ++ ++ case EXC_I386_BPT: ++ detail->code = posix ? TRAP_BRKPT : DBG_BRKPNT_FAULT; ++ break; ++ ++ default: ++ detail->code = 0; ++ break; ++ } + break; + } + } + libc_hidden_def (_hurd_exception2signal) ++ ++void ++_hurd_exception2signal (struct hurd_signal_detail *detail, int *signo) ++{ ++ exception2signal (detail, signo, 1); ++} ++ ++void ++_hurd_exception2signal_legacy (struct hurd_signal_detail *detail, int *signo) ++{ ++ exception2signal (detail, signo, 0); ++} ++ +Index: glibc-2.31/sysdeps/mach/hurd/i386/trampoline.c +=================================================================== +--- glibc-2.31.orig/sysdeps/mach/hurd/i386/trampoline.c ++++ glibc-2.31/sysdeps/mach/hurd/i386/trampoline.c +@@ -19,13 +19,66 @@ + #include + #include + #include ++#include + #include + #include + #include + #include "hurdfault.h" + #include ++#include + + ++/* Fill in a siginfo_t structure for SA_SIGINFO-enabled handlers. */ ++static void fill_siginfo (siginfo_t *si, int signo, ++ const struct hurd_signal_detail *detail, ++ const struct machine_thread_all_state *state) ++{ ++ si->si_signo = signo; ++ si->si_errno = detail->error; ++ si->si_code = detail->code; ++ ++ /* XXX We would need a protocol change for sig_post to include ++ * this information. */ ++ si->si_pid = -1; ++ si->si_uid = -1; ++ ++ /* Address of the faulting instruction or memory access. */ ++ if (detail->exc == EXC_BAD_ACCESS) ++ si->si_addr = (void *) detail->exc_subcode; ++ else ++ si->si_addr = (void *) state->basic.eip; ++ ++ /* XXX On SIGCHLD, this should be the exit status of the child ++ * process. We would need a protocol change for the proc server ++ * to send this information along with the signal. */ ++ si->si_status = 0; ++ ++ si->si_band = 0; /* SIGPOLL is not supported yet. */ ++ si->si_value.sival_int = 0; /* sigqueue() is not supported yet. */ ++} ++ ++/* Fill in a ucontext_t structure SA_SIGINFO-enabled handlers. */ ++static void fill_ucontext (ucontext_t *uc, const struct sigcontext *sc) ++{ ++ uc->uc_flags = 0; ++ uc->uc_link = NULL; ++ uc->uc_sigmask = sc->sc_mask; ++ uc->uc_stack.ss_sp = (__ptr_t) sc->sc_esp; ++ uc->uc_stack.ss_size = 0; ++ uc->uc_stack.ss_flags = 0; ++ ++ /* Registers. */ ++ memcpy (&uc->uc_mcontext.gregs[REG_GS], &sc->sc_gs, ++ (REG_TRAPNO - REG_GS) * sizeof (int)); ++ uc->uc_mcontext.gregs[REG_TRAPNO] = 0; ++ uc->uc_mcontext.gregs[REG_ERR] = 0; ++ memcpy (&uc->uc_mcontext.gregs[REG_EIP], &sc->sc_eip, ++ (NGREG - REG_EIP) * sizeof (int)); ++ ++ /* XXX FPU state. */ ++ memset (&uc->uc_mcontext.fpregs, 0, sizeof (fpregset_t)); ++} ++ + struct sigcontext * + _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, + int signo, struct hurd_signal_detail *detail, +@@ -43,15 +96,38 @@ _hurd_setup_sighandler (struct hurd_sigs + struct + { + int signo; +- long int sigcode; +- struct sigcontext *scp; /* Points to ctx, below. */ ++ union ++ { ++ /* Extra arguments for traditional signal handlers */ ++ struct ++ { ++ long int sigcode; ++ struct sigcontext *scp; /* Points to ctx, below. */ ++ } legacy; ++ ++ /* Extra arguments for SA_SIGINFO handlers */ ++ struct ++ { ++ siginfo_t *siginfop; /* Points to siginfo, below. */ ++ ucontext_t *uctxp; /* Points to uctx, below. */ ++ } posix; ++ }; + void *sigreturn_addr; + void *sigreturn_returns_here; + struct sigcontext *return_scp; /* Same; arg to sigreturn. */ ++ ++ /* NB: sigreturn assumes link is next to ctx. */ + struct sigcontext ctx; + struct hurd_userlink link; ++ ucontext_t ucontext; ++ siginfo_t siginfo; + } *stackframe; + ++ /* sigaction for preemptors */ ++ static const struct sigaction legacy_sigaction = { ++ .sa_flags = SA_RESTART ++ }; ++ + if (ss->context) + { + /* We have a previous sigcontext that sigreturn was about +@@ -94,9 +170,13 @@ _hurd_setup_sighandler (struct hurd_sigs + the SP on sigreturn. */ + state->basic.uesp = state->basic.ecx; + +- /* XXX what if handler != action->handler (for instance, if a signal +- * preemptor took over) ? */ + action = & _hurd_sigstate_actions (ss) [signo]; ++ if ( (action->sa_flags & SA_SIGINFO) ++ && handler != (__sighandler_t) action->sa_sigaction ++ || !(action->sa_flags & SA_SIGINFO) ++ && handler != action->sa_handler) ++ /* A signal preemptor took over, use legacy semantic. */ ++ action = &legacy_sigaction; + + if ((action->sa_flags & SA_ONSTACK) + && !(ss->sigaltstack.ss_flags & (SS_DISABLE|SS_ONSTACK))) +@@ -140,15 +220,9 @@ _hurd_setup_sighandler (struct hurd_sigs + = &stackframe->link.thread.next; + ss->active_resources = &stackframe->link; + +- /* Set up the arguments for the signal handler. */ +- stackframe->signo = signo; +- stackframe->sigcode = detail->code; +- stackframe->scp = stackframe->return_scp = scp = &stackframe->ctx; +- stackframe->sigreturn_addr = &__sigreturn; +- stackframe->sigreturn_returns_here = firewall; /* Crash on return. */ +- + /* Set up the sigcontext from the current state of the thread. */ + ++ scp = &stackframe->ctx; + scp->sc_onstack = ss->sigaltstack.ss_flags & SS_ONSTACK ? 1 : 0; + + /* struct sigcontext is laid out so that starting at sc_gs mimics a +@@ -162,6 +236,35 @@ _hurd_setup_sighandler (struct hurd_sigs + &state->fpu, &scp->sc_i386_float_state, + sizeof (state->fpu)); + ++ /* Set up the arguments for the signal handler. */ ++ stackframe->signo = signo; ++ if (action->sa_flags & SA_SIGINFO) ++ { ++ stackframe->posix.siginfop = &stackframe->siginfo; ++ stackframe->posix.uctxp = &stackframe->ucontext; ++ fill_siginfo (&stackframe->siginfo, signo, detail, state); ++ fill_ucontext (&stackframe->ucontext, scp); ++ } ++ else ++ { ++ if (detail->exc) ++ { ++ int nsigno; ++ _hurd_exception2signal_legacy (detail, &nsigno); ++ assert (nsigno == signo); ++ } ++ else ++ detail->code = 0; ++ ++ stackframe->legacy.sigcode = detail->code; ++ stackframe->legacy.scp = &stackframe->ctx; ++ } ++ ++ /* Set up the bottom of the stack. */ ++ stackframe->sigreturn_addr = &__sigreturn; ++ stackframe->sigreturn_returns_here = firewall; /* Crash on return. */ ++ stackframe->return_scp = &stackframe->ctx; ++ + _hurdsig_end_catch_fault (); + + if (! ok) +Index: glibc-2.31/sysdeps/mach/hurd/kill.c +=================================================================== +--- glibc-2.31.orig/sysdeps/mach/hurd/kill.c ++++ glibc-2.31/sysdeps/mach/hurd/kill.c +@@ -64,7 +64,7 @@ __kill (pid_t pid, int sig) + { + if (msgport != MACH_PORT_NULL) + /* Send a signal message to his message port. */ +- return __msg_sig_post (msgport, sig, 0, refport); ++ return __msg_sig_post (msgport, sig, SI_USER, refport); + + /* The process has no message port. Perhaps try direct + frobnication of the task. */ +Index: glibc-2.31/sysdeps/mach/hurd/setitimer.c +=================================================================== +--- glibc-2.31.orig/sysdeps/mach/hurd/setitimer.c ++++ glibc-2.31/sysdeps/mach/hurd/setitimer.c +@@ -105,7 +105,7 @@ timer_thread (void) + __msg_sig_post_request (_hurd_msgport, + _hurd_itimer_port, + MACH_MSG_TYPE_MAKE_SEND_ONCE, +- SIGALRM, 0, __mach_task_self ()); ++ SIGALRM, SI_TIMER, __mach_task_self ()); + break; + + case MACH_RCV_INTERRUPTED: +Index: glibc-2.31/sysdeps/mach/hurd/i386/sigcontextinfo.h +=================================================================== +--- glibc-2.31.orig/sysdeps/mach/hurd/i386/sigcontextinfo.h ++++ glibc-2.31/sysdeps/mach/hurd/i386/sigcontextinfo.h +@@ -18,11 +18,10 @@ + #ifndef _SIGCONTEXTINFO_H + #define _SIGCONTEXTINFO_H + +-#define SIGCONTEXT struct sigcontext + static inline uintptr_t +-sigcontext_get_pc (struct sigcontext ctx) ++sigcontext_get_pc (struct ucontext_t *ctx) + { +- return ctx.sc_eip; ++ return ctx->uc_mcontext.gregs[REG_EIP]; + } + + #endif -- cgit v1.2.3 From ee1cf1dd80244fe187038db609bde282b21a05fc Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 9 Mar 2020 14:38:18 +0100 Subject: gnu: cross-libc: Build fix for the Hurd. This fixes cross building of coreutils, e.g. ./pre-inst-env guix build --target=i586-pc-gnu coreutils * gnu/packages/cross-base.scm (cross-libc): Add -lhurduser, -lmachuser for the Hurd. --- gnu/packages/cross-base.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 6f72653762..538f406043 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -513,7 +513,17 @@ and the cross tool chain." ',%gcc-cross-include-paths) (setenv "CROSS_LIBRARY_PATH" (string-append kernel "/lib")) ; for Hurd's libihash - #t))))))) + #t))) + ,@(if (hurd-triplet? target) + '((add-after 'install 'augment-libc.so + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/lib/libc.so") + (("/[^ ]+/lib/libc.so.0.3") + (string-append out "/lib/libc.so.0.3" + " libmachuser.so libhurduser.so")))) + #t))) + '()))))) ;; Shadow the native "kernel-headers" because glibc's recipe expects the ;; "kernel-headers" input to point to the right thing. -- cgit v1.2.3 From eef44fea17a735d2f4048a747d16af478d4b9dbc Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 12 Mar 2020 10:54:35 +0100 Subject: Revert "gnu: guile-static-stripped: Update to 2.2." As discussed on IRC, keeping bootstrap Guile on 2.0 simplifies adding new architectures and removes the need for parameterizing gnu/packages/bootstrap.scm. This reverts commit 2acfe022a740f79b593348cc6362cc4ee8f33bb4. * gnu/packages/make-bootstrap.scm (%guile-static): Revert to guile-2.0. Retain build recipe. * gnu/packages/patches/guile-relocatable.patch: Update for Guile 2.0.14. --- gnu/local.mk | 1 - gnu/packages/make-bootstrap.scm | 30 ++++----- gnu/packages/patches/guile-2.2-default-utf8.patch | 82 ----------------------- gnu/packages/patches/guile-relocatable.patch | 36 +++++++--- 4 files changed, 40 insertions(+), 109 deletions(-) delete mode 100644 gnu/packages/patches/guile-2.2-default-utf8.patch diff --git a/gnu/local.mk b/gnu/local.mk index f0f47aa691..aed50d4d1a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1000,7 +1000,6 @@ dist_patch_DATA = \ %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ - %D%/packages/patches/guile-2.2-default-utf8.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-3.0-crash.patch \ %D%/packages/patches/guile-default-utf8.patch \ diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 335d5c811d..709fb39e43 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -679,18 +679,18 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; .scm and .go files relative to its installation directory, rather ;; than in hard-coded configure-time paths. (let* ((patches (cons* (search-patch "guile-relocatable.patch") - (search-patch "guile-2.2-default-utf8.patch") + (search-patch "guile-default-utf8.patch") (search-patch "guile-linux-syscalls.patch") - (origin-patches (package-source guile-2.2)))) - (source (origin (inherit (package-source guile-2.2)) + (origin-patches (package-source guile-2.0)))) + (source (origin (inherit (package-source guile-2.0)) (patches patches))) - (guile (package (inherit guile-2.2) - (name (string-append (package-name guile-2.2) "-static")) + (guile (package (inherit guile-2.0) + (name (string-append (package-name guile-2.0) "-static")) (source source) (synopsis "Statically-linked and relocatable Guile") ;; Remove the 'debug' output (see above for the reason.) - (outputs (delete "debug" (package-outputs guile-2.2))) + (outputs (delete "debug" (package-outputs guile-2.0))) (inputs `(("libunistring:static" ,libunistring "static") @@ -699,9 +699,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (propagated-inputs `(("bdw-gc" ,libgc) ,@(alist-delete "bdw-gc" - (package-propagated-inputs guile-2.2)))) + (package-propagated-inputs guile-2.0)))) (arguments - (substitute-keyword-arguments (package-arguments guile-2.2) + (substitute-keyword-arguments (package-arguments guile-2.0) ((#:configure-flags flags '()) ;; When `configure' checks for ltdl availability, it ;; doesn't try to link using libtool, and thus fails @@ -724,7 +724,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (("^guile_LDFLAGS =") "guile_LDFLAGS = -all-static") - ;; Add `-ldl' *after* libguile-2.2.la. + ;; Add `-ldl' *after* libguile-2.0.la. (("^guile_LDADD =(.*)$" _ ldadd) (string-append "guile_LDADD = " (string-trim-right ldadd) @@ -756,13 +756,13 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (out (assoc-ref %outputs "out")) (guile1 (string-append in "/bin/guile")) (guile2 (string-append out "/bin/guile"))) - (mkdir-p (string-append out "/share/guile/2.2")) - (copy-recursively (string-append in "/share/guile/2.2") - (string-append out "/share/guile/2.2")) + (mkdir-p (string-append out "/share/guile/2.0")) + (copy-recursively (string-append in "/share/guile/2.0") + (string-append out "/share/guile/2.0")) - (mkdir-p (string-append out "/lib/guile/2.2/ccache")) - (copy-recursively (string-append in "/lib/guile/2.2/ccache") - (string-append out "/lib/guile/2.2/ccache")) + (mkdir-p (string-append out "/lib/guile/2.0/ccache")) + (copy-recursively (string-append in "/lib/guile/2.0/ccache") + (string-append out "/lib/guile/2.0/ccache")) (mkdir (string-append out "/bin")) (copy-file guile1 guile2) diff --git a/gnu/packages/patches/guile-2.2-default-utf8.patch b/gnu/packages/patches/guile-2.2-default-utf8.patch deleted file mode 100644 index f55a6430c1..0000000000 --- a/gnu/packages/patches/guile-2.2-default-utf8.patch +++ /dev/null @@ -1,82 +0,0 @@ -This hack makes Guile default to UTF-8. This avoids calls to -`iconv_open'; `iconv_open' tries to open shared objects that aren't -available during bootstrap, so using UTF-8 avoids that (and UTF-8 has -built-in conversions in glibc, too.) - -diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c -index 0ac5ea6a6..f73301e2f 100644 ---- a/libguile/bytevectors.c -+++ b/libguile/bytevectors.c -@@ -1931,7 +1931,7 @@ utf_encoding_name (char *name, size_t utf_width, SCM endianness) - if (scm_i_is_narrow_string (str)) \ - { \ - err = mem_iconveh (scm_i_string_chars (str), c_strlen, \ -- "ISO-8859-1", c_utf_name, \ -+ "UTF-8", c_utf_name, \ - iconveh_question_mark, NULL, \ - &c_utf, &c_utf_len); \ - if (SCM_UNLIKELY (err)) \ -diff --git a/libguile/ports.c b/libguile/ports.c -index 45e62f4e4..42012f3aa 100644 ---- a/libguile/ports.c -+++ b/libguile/ports.c -@@ -974,7 +974,9 @@ canonicalize_encoding (const char *enc) - char *ret; - int i; - -- if (!enc || encoding_matches (enc, sym_ISO_8859_1)) -+ if (enc == NULL) -+ return sym_UTF_8; -+ if (encoding_matches (enc, sym_ISO_8859_1)) - return sym_ISO_8859_1; - if (encoding_matches (enc, sym_UTF_8)) - return sym_UTF_8; -@@ -4198,7 +4200,7 @@ scm_init_ports (void) - scm_c_define ("%default-port-conversion-strategy", - scm_make_fluid_with_default (sym_substitute)); - /* Use the locale as the default port encoding. */ -- scm_i_set_default_port_encoding (locale_charset ()); -+ scm_i_set_default_port_encoding ("UTF-8"); - - scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, - "scm_init_ice_9_ports", -diff --git a/libguile/strings.c b/libguile/strings.c -index 056b4c99f..63a6c050d 100644 ---- a/libguile/strings.c -+++ b/libguile/strings.c -@@ -1579,7 +1579,7 @@ scm_i_default_string_failed_conversion_handler (void) - SCM - scm_from_locale_stringn (const char *str, size_t len) - { -- return scm_from_stringn (str, len, locale_charset (), -+ return scm_from_stringn (str, len, "UTF-8", - scm_i_default_string_failed_conversion_handler ()); - } - -@@ -1907,7 +1907,7 @@ char * - scm_to_locale_stringn (SCM str, size_t *lenp) - { - return scm_to_stringn (str, lenp, -- locale_charset (), -+ "UTF-8", - scm_i_default_string_failed_conversion_handler ()); - } - -@@ -2195,7 +2195,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, - scm_wrong_type_arg_msg (NULL, 0, str, "string"); - - if (encoding == NULL) -- encoding = "ISO-8859-1"; -+ encoding = "UTF-8"; - - if (c_strcasecmp (encoding, "UTF-8") == 0) - /* This is the most common case--e.g., when calling libc bindings -@@ -2247,7 +2247,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, - if (scm_i_is_narrow_string (str)) - { - ret = mem_iconveh (scm_i_string_chars (str), ilen, -- "ISO-8859-1", encoding, -+ "UTF-8", encoding, - (enum iconv_ilseq_handler) handler, NULL, - &buf, &len); - diff --git a/gnu/packages/patches/guile-relocatable.patch b/gnu/packages/patches/guile-relocatable.patch index 464333880c..d8726b4807 100644 --- a/gnu/packages/patches/guile-relocatable.patch +++ b/gnu/packages/patches/guile-relocatable.patch @@ -1,6 +1,17 @@ -This patch changes Guile to use a default search path relative to the -location of the `guile' binary, allowing it to be relocated. +From 501ad55982a8f92a7a95c76c75944d644870181d Mon Sep 17 00:00:00 2001 +From: Ludovic Courtès +Date: Thu, 12 Mar 2020 15:16:04 +0100 +Subject: [PATCH] load: Make Guile run-time relocatable using /proc/self/exe. +Import from + + http://git.savannah.gnu.org/cgit/guix.git/commit/?id=920f2c42ce3345dc1355a41377ebf01a33fdae51 +--- + libguile/load.c | 35 +++++++++++++++++++++++++++++------ + 1 file changed, 29 insertions(+), 6 deletions(-) + +diff --git a/libguile/load.c b/libguile/load.c +index c2ee5093a..128cdf95a 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -26,6 +26,7 @@ @@ -11,7 +22,7 @@ location of the `guile' binary, allowing it to be relocated. #include "libguile/_scm.h" #include "libguile/alist.h" -@@ -326,6 +327,32 @@ scm_init_load_path () +@@ -325,6 +326,32 @@ scm_init_load_path () SCM cpath = SCM_EOL; #ifdef SCM_LIBRARY_DIR @@ -44,25 +55,28 @@ location of the `guile' binary, allowing it to be relocated. env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_PATH")); if (env && strcmp (env, "") == 0) /* special-case interpret system-path=="" as meaning no system path instead -@@ -334,10 +361,7 @@ scm_init_load_path () +@@ -333,10 +360,7 @@ scm_init_load_path () else if (env) path = scm_parse_path (scm_from_locale_string (env), path); else -- path = scm_list_4 (scm_from_utf8_string (SCM_LIBRARY_DIR), -- scm_from_utf8_string (SCM_SITE_DIR), -- scm_from_utf8_string (SCM_GLOBAL_SITE_DIR), -- scm_from_utf8_string (SCM_PKGDATA_DIR)); +- path = scm_list_4 (scm_from_locale_string (SCM_LIBRARY_DIR), +- scm_from_locale_string (SCM_SITE_DIR), +- scm_from_locale_string (SCM_GLOBAL_SITE_DIR), +- scm_from_locale_string (SCM_PKGDATA_DIR)); + path = scm_list_1 (scm_from_locale_string (module_dir)); env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_COMPILED_PATH")); if (env && strcmp (env, "") == 0) -@@ -347,8 +371,7 @@ scm_init_load_path () +@@ -346,8 +370,7 @@ scm_init_load_path () cpath = scm_parse_path (scm_from_locale_string (env), cpath); else { -- cpath = scm_list_2 (scm_from_utf8_string (SCM_CCACHE_DIR), -- scm_from_utf8_string (SCM_SITE_CCACHE_DIR)); +- cpath = scm_list_2 (scm_from_locale_string (SCM_CCACHE_DIR), +- scm_from_locale_string (SCM_SITE_CCACHE_DIR)); + cpath = scm_list_1 (scm_from_locale_string (ccache_dir)); } #endif /* SCM_LIBRARY_DIR */ +-- +2.24.0 + -- cgit v1.2.3 From 25bc0f34c6c059394f546f29a203c2cb9b7cdcf6 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 12 Mar 2020 10:58:44 +0100 Subject: gnu: bootstrap: gcc-static: Use gcc-5. * gnu/packages/make-bootstrap.scm (gcc-static): Use gcc-5. This fixes building libstdc++-boot0 with a newly built %bootstrap-gcc. (%gcc-stripped): Likewise. (gcc-for-bootstrap): Likewise. * gnu/packages/patches/gcc-5-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gcc.scm (gcc-5): Use it. --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 3 +- gnu/packages/make-bootstrap.scm | 20 +++++------ gnu/packages/patches/gcc-5-hurd.patch | 63 +++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/gcc-5-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index aed50d4d1a..1b268fd1c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -909,6 +909,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-4-compile-with-gcc-5.patch \ %D%/packages/patches/gcc-4.6-gnu-inline.patch \ %D%/packages/patches/gcc-4.9.3-mingw-gthr-default.patch \ + %D%/packages/patches/gcc-5-hurd.patch \ %D%/packages/patches/gcc-5.0-libvtv-runpath.patch \ %D%/packages/patches/gcc-5-source-date-epoch-1.patch \ %D%/packages/patches/gcc-5-source-date-epoch-2.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5c5c51a0ad..6221a123d8 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -471,7 +471,8 @@ Go. It also includes runtime support libraries for these languages.") "gcc-5-source-date-epoch-1.patch" "gcc-5-source-date-epoch-2.patch" "gcc-6-libsanitizer-mode-size.patch" - "gcc-fix-texi2pod.patch")) + "gcc-fix-texi2pod.patch" + "gcc-5-hurd.patch")) (modules '((guix build utils))) (snippet ;; Fix 'libcc1/configure' error when cross-compiling GCC. diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 709fb39e43..f8d782f5ab 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -93,13 +93,13 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (mlambdaq (glibc) "Return a variant of GCC that uses the bootstrap variant of GLIBC." (package - (inherit gcc) + (inherit gcc-5) (outputs '("out")) ;all in one so libgcc_s is easily found (inputs `( ;; Distinguish the name so we can refer to it below. ("bootstrap-libc" ,(glibc-for-bootstrap glibc)) ("libc:static" ,(glibc-for-bootstrap glibc) "static") - ,@(package-inputs gcc)))))) + ,@(package-inputs gcc-5)))))) (define (package-with-relocatable-glibc p) "Return a variant of P that uses the libc as defined by @@ -138,7 +138,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (cons (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") (files '("include"))) - (package-search-paths gcc))))) + (package-search-paths gcc-5))))) ("cross-binutils" ,(cross-binutils target)) ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap glibc)) @@ -459,7 +459,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define %gcc-static ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc - (package (inherit gcc) + (package (inherit gcc-5) (name "gcc-static") (outputs '("out")) ; all in one (arguments @@ -468,7 +468,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (srfi srfi-1) (srfi srfi-26) (ice-9 regex)) - ,@(substitute-keyword-arguments (package-arguments gcc) + ,@(substitute-keyword-arguments (package-arguments gcc-5) ((#:guile _) #f) ((#:implicit-inputs? _) #t) ((#:configure-flags flags) @@ -513,8 +513,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t))))))) (inputs `(("zlib:static" ,zlib "static") - ("isl:static" ,isl "static") - ,@(package-inputs gcc))) + ("isl:static" ,isl-0.18 "static") + ,@(package-inputs gcc-5))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both @@ -527,12 +527,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ("gmp-native" ,gmp) ("mpfr-native" ,mpfr) ("mpc-native" ,mpc) - ,@(package-native-inputs gcc)) - (package-native-inputs gcc)))))) + ,@(package-native-inputs gcc-5)) + (package-native-inputs gcc-5)))))) (define %gcc-stripped ;; The subset of GCC files needed for bootstrap. - (package (inherit gcc) + (package (inherit gcc-5) (name "gcc-stripped") (build-system trivial-build-system) (source #f) diff --git a/gnu/packages/patches/gcc-5-hurd.patch b/gnu/packages/patches/gcc-5-hurd.patch new file mode 100644 index 0000000000..ae66424243 --- /dev/null +++ b/gnu/packages/patches/gcc-5-hurd.patch @@ -0,0 +1,63 @@ +This patch is needed to build gcc-5.5.0 on the Hurd. + +Backported from upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6cd9cb89ebdc1e1394b81c4a418c2b3b0eb86c57 + +commit b590b96ebc3f5b42a4829170e069722dd940e2543 +Author: jason +Date: Sat May 9 04:50:23 2015 +0000 + + * src/c++98/Makefile.am (AM_CXXFLAGS): Add -std=gnu++98. + * src/c++98/Makefile.in: Regenerate. + * src/Makefile.am (AM_CXXFLAGS): Add -std=gnu++98. + * src/Makefile.in: Regenerate. + + git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222964 138bc75d-0d04-0410-961f-82ee72b054a4 + +diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am +index a5f48b22c6d..cd07ccd81bc 100644 +--- a/libstdc++-v3/src/Makefile.am ++++ b/libstdc++-v3/src/Makefile.am +@@ -168,6 +168,7 @@ compatibility-condvar.o: compatibility-condvar.cc + # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden + # as the occasion calls for it. + AM_CXXFLAGS = \ ++ -std=gnu++98 \ + $(glibcxx_compiler_pic_flag) \ + $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ + $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) +diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in +index 433f9ea121a..31b56282e26 100644 +--- a/libstdc++-v3/src/Makefile.in ++++ b/libstdc++-v3/src/Makefile.in +@@ -429,6 +429,7 @@ libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) + # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden + # as the occasion calls for it. + AM_CXXFLAGS = \ ++ -std=gnu++98 \ + $(glibcxx_compiler_pic_flag) \ + $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ + $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) +diff --git a/libstdc++-v3/src/c++98/Makefile.am b/libstdc++-v3/src/c++98/Makefile.am +index e348dfb1205..a5b68a19a8b 100644 +--- a/libstdc++-v3/src/c++98/Makefile.am ++++ b/libstdc++-v3/src/c++98/Makefile.am +@@ -215,6 +215,7 @@ parallel_settings.o: parallel_settings.cc + # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden + # as the occasion calls for it. + AM_CXXFLAGS = \ ++ -std=gnu++98 \ + $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ + $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ + $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) +diff --git a/libstdc++-v3/src/c++98/Makefile.in b/libstdc++-v3/src/c++98/Makefile.in +index 3c69791bb66..ce86136906b 100644 +--- a/libstdc++-v3/src/c++98/Makefile.in ++++ b/libstdc++-v3/src/c++98/Makefile.in +@@ -421,6 +421,7 @@ PARALLEL_FLAGS = -D_GLIBCXX_PARALLEL + # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden + # as the occasion calls for it. + AM_CXXFLAGS = \ ++ -std=gnu++98 \ + $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ + $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ + $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) -- cgit v1.2.3 From fef77109370e6bda675297f74ac1073bfe5518ec Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 16 Mar 2020 08:17:16 +0100 Subject: gnu: bootstrap: Use fall-back mechanism for bootstrap-executables. * gnu/packages/bootstrap.scm (%bootstrap-executable-base-urls): New variable. Add lilypond.org url as a fall-back. (bootstrap-executable-file-name): New function. (bootstrap-executable): Use them to implement fall-back for donwloads of bootstrap executables. --- gnu/packages/bootstrap.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 0fbe8ef64a..63760c7555 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -114,12 +114,17 @@ ("xz" ,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5"))))) -(define (bootstrap-executable-url program system) - "Return the URL where PROGRAM can be found for SYSTEM." - (string-append - "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/" - system "/" program - "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")) +(define %bootstrap-executable-base-urls + ;; This is where the bootstrap executables come from. + '("https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/" + "http://lilypond.org/janneke/guix/")) + +(define (bootstrap-executable-file-name system program) + "Return the FILE-NAME part of url where PROGRAM can be found for SYSTEM." + (match system + ("i586-gnu" (string-append system "/20200315/" program)) + (_ (string-append system "/" program + "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")))) (define bootstrap-executable (mlambda (program system) @@ -140,7 +145,9 @@ for system '~a'") ((sha256) (origin (method url-fetch/executable) - (uri (bootstrap-executable-url program system)) + (uri (map (cute string-append <> + (bootstrap-executable-file-name system program)) + %bootstrap-executable-base-urls)) (file-name program) (sha256 sha256))))))) -- cgit v1.2.3 From 3342a1182b15ec031f0ec6f602fd96c1dca3d4b0 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 26 Mar 2020 07:39:13 +0100 Subject: gnu: make-bootstrap: Use _IOLBF on Guile 2.0 only. * gnu/packages/make-bootstrap.scm (%binutils-static-stripped, %gcc-stripped, %bootstrap-tarballs)[arguments]: Wrap use of '_IOLBF' in 'cond-expand' and use 'line instead on Guile > 2.0. --- gnu/packages/make-bootstrap.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index f8d782f5ab..b3610afc8e 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -405,7 +405,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (begin (use-modules (guix build utils)) - (setvbuf (current-output-port) _IOLBF) + (setvbuf (current-output-port) + (cond-expand (guile-2.0 _IOLBF) (else 'line))) (let* ((in (assoc-ref %build-inputs "binutils")) (out (assoc-ref %outputs "out")) (bin (string-append out "/bin"))) @@ -545,7 +546,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (srfi srfi-26) (guix build utils)) - (setvbuf (current-output-port) _IOLBF) + (setvbuf (current-output-port) + (cond-expand (guile-2.0 _IOLBF) (else 'line))) (let* ((out (assoc-ref %outputs "out")) (bindir (string-append out "/bin")) (libdir (string-append out "/lib")) @@ -869,7 +871,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (ice-9 match) (srfi srfi-26)) - (setvbuf (current-output-port) _IOLBF) + (setvbuf (current-output-port) + (cond-expand (guile-2.0 _IOLBF) (else 'line))) (mkdir out) (chdir out) (for-each (match-lambda -- cgit v1.2.3 From 6741f543e6f09069961edd741cd210b7f49aadcc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 31 Jan 2020 16:28:23 +0200 Subject: gnu: bootstrap: Add support for the Hurd. On 3342a1182b15ec031f0ec6f602fd96c1dca3d4b0 gnu: make-bootstrap: Use _IOLBF on Guile 2.0 only. Run ./pre-inst-env guix build --target=i586-pc-gnu bootstrap-tarballs --verbosity=1 Producing /gnu/store/lhca65c997pvic5cfrpm0dasniwqlg2a-bootstrap-tarballs-0 With guix hash -rx /gnu/store/lhca65c997pvic5cfrpm0dasniwqlg2a-bootstrap-tarballs-0 07jnq2by98f2a45k8wd2gj62iazvwfa4z7p3w3id4m1g0fdsvc3b * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for the Hurd. (bootstrap-executable-url): Use lilypond url for the Hurd. (bootstrap-guile-url-path): Likewise. (bootstrap-guile-hash): Add entry for the Hurd. (%bootstrap-coreutils&co): Likewise. (%bootstrap-binutils): Likewise. (%bootstrap-glibc): Likewise. (%bootstrap-gcc): Likewise. * guix/packages.scm (%supported-systems): Add i586-gnu. Co-authored-by: Jan Nieuwenhuizen --- gnu/packages/bootstrap.scm | 41 +++++++++++++++++++++++++++++++++++++---- guix/packages.scm | 4 ++-- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 63760c7555..f58ce2de93 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,8 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver -;;; Copyright © 2017 Efraim Flashner -;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2017, 2020 Efraim Flashner +;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Carl Dong ;;; ;;; This file is part of GNU Guix. @@ -104,6 +104,15 @@ ,(base32 "07830bx29ad5i0l1ykj0g0b1jayjdblf01sr3ww9wbnwdbzinqms")) ("xz" ,(base32 "0i9kxdi17bm5gxfi2xzm0y73p3ii0cqxli1sbljm6rh2fjgyn90k"))) + ("i586-gnu" + ("bash" + ,(base32 "1as8649aqaibahhhrvkj10ci8shpi4hq5n7gnik8rhhy0dc1jarg")) + ("mkdir" + ,(base32 "1snqgpfrl00hfn82lm29jqylzjsfb9jd6ha74dp12phwb8fpbmb9")) + ("tar" + ,(base32 "0nq2c1zb3wv5bf7kd83sziaashydazrn7xgq6kijlk0zj2syzc2m")) + ("xz" + ,(base32 "033rhpk6zrpxpd6ffjyg5y2zwq9x9cnq0zljb7k8jlncbalsayq5"))) ("mips64el-linux" ("bash" ,(base32 "1aw046dhda240k9pb9iaj5aqkm23gkvxa9j82n4k7fk87nbrixw6")) @@ -122,7 +131,7 @@ (define (bootstrap-executable-file-name system program) "Return the FILE-NAME part of url where PROGRAM can be found for SYSTEM." (match system - ("i586-gnu" (string-append system "/20200315/" program)) + ("i586-gnu" (string-append system "/20200326/" program)) (_ (string-append system "/" program "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")))) @@ -319,6 +328,8 @@ or false to signal an error." "/20170217/guile-2.0.14.tar.xz") ("armhf-linux" "/20150101/guile-2.0.11.tar.xz") + ("i586-gnu" + "/20200326/guile-static-stripped-2.0.14-i586-pc-gnu.tar.xz") (_ "/20131110/guile-2.0.9.tar.xz")))) @@ -334,7 +345,9 @@ or false to signal an error." ("armhf-linux" (base32 "1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5")) ("aarch64-linux" - (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")))) + (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")) + ("i586-gnu" + (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac")))) (define (bootstrap-guile-origin system) "Return an object for the Guile tarball of SYSTEM." @@ -464,6 +477,8 @@ $out/bin/guile --version~%" "/20150101/static-binaries.tar.xz") ("aarch64-linux" "/20170217/static-binaries.tar.xz") + ("i586-gnu" + "/20200326/static-binaries-0-i586-pc-gnu.tar.xz") (_ "/20131110/static-binaries.tar.xz"))) %bootstrap-base-urls)) @@ -481,6 +496,9 @@ $out/bin/guile --version~%" ("aarch64-linux" (base32 "18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh")) + ("i586-gnu" + (base32 + "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")) ("mips64el-linux" (base32 "072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753")))))) @@ -527,6 +545,8 @@ $out/bin/guile --version~%" "/20150101/binutils-2.25.tar.xz") ("aarch64-linux" "/20170217/binutils-2.27.tar.xz") + ("i586-gnu" + "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz") (_ "/20131110/binutils-2.23.2.tar.xz"))) %bootstrap-base-urls)) @@ -544,6 +564,9 @@ $out/bin/guile --version~%" ("aarch64-linux" (base32 "111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n")) + ("i586-gnu" + (base32 + "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")) ("mips64el-linux" (base32 "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7")))))) @@ -597,6 +620,8 @@ $out/bin/guile --version~%" "/20150101/glibc-2.20.tar.xz") ("aarch64-linux" "/20170217/glibc-2.25.tar.xz") + ("i586-gnu" + "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz") (_ "/20131110/glibc-2.18.tar.xz"))) %bootstrap-base-urls)) @@ -614,6 +639,9 @@ $out/bin/guile --version~%" ("aarch64-linux" (base32 "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c")) + ("i586-gnu" + (base32 + "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952")) ("mips64el-linux" (base32 "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg"))))))))) @@ -683,6 +711,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/20150101/gcc-4.8.4.tar.xz") ("aarch64-linux" "/20170217/gcc-5.4.0.tar.xz") + ("i586-gnu" + "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz") (_ "/20131110/gcc-4.8.2.tar.xz"))) %bootstrap-base-urls)) @@ -700,6 +730,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ("aarch64-linux" (base32 "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1")) + ("i586-gnu" + (base32 + "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")) ("mips64el-linux" (base32 "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) diff --git a/guix/packages.scm b/guix/packages.scm index 5c6d1a92d5..1ae16b60d1 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2017, 2018 Mark H Weaver ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Alex Kost -;;; Copyright © 2017, 2019 Efraim Flashner +;;; Copyright © 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -232,7 +232,7 @@ name of its URI." (define %supported-systems ;; This is the list of system types that are supported. By default, we ;; expect all packages to build successfully here. - '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux")) + '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux" "i586-gnu")) (define %hurd-systems ;; The GNU/Hurd systems for which support is being developed. -- cgit v1.2.3 From 9820d6eda66e0056e2969bcc16a2564c065baaec Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 03:41:49 -0500 Subject: gnu: java-jansi-native: Compile fix for the Hurd. * gnu/packages/java.scm (java-jansi-native): Add catch-all clause; fixes running guix refresh. --- gnu/packages/java.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c9d59bbabd..edf8d3ce8e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018, 2019 Efraim Flashner ;;; Copyright © 2019, 2020 Björn Höfling +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -10137,7 +10138,8 @@ that is part of the SWT Tools project.") "linux32") ((or "x86_64-linux" "aarch64-linux" "mips64el-linux") - "linux64"))))) + "linux64") + (_ "unknown-kernel"))))) (install-file "src/main/native-package/src/libjansi.so" dir)) #t)) (add-after 'install 'install-native -- cgit v1.2.3 From 846f5da1296c09d667179c7da2cbb18929bcde67 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 26 Feb 2020 20:22:18 -0500 Subject: gnu: make: Support for the Hurd. * gnu/packages/base.scm (gnu-make): Use fork/exec rather than posix_spawn on the Hurd. Also, add __alloca linkage workaround. --- gnu/packages/base.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5c976aee52..aa5200294f 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -369,7 +369,11 @@ standard.") (inputs `(("guile" ,guile-3.0))) (outputs '("out" "debug")) (arguments - '(#:phases + `(,@(if (hurd-target?) + '(#:configure-flags '("CFLAGS=-D__alloca=alloca" + "ac_cv_func_posix_spawn=no")) + '()) + #:phases (modify-phases %standard-phases (add-before 'build 'set-default-shell (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From a50bbf44c7f24067fcb3f2ee1f16d5b7f28226b7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 1 Mar 2020 13:49:04 +0100 Subject: gnu: commencement: gnumach-headers-boot0: Build from tarball. The 'gnumach-headers' package now uses a git checkout and added dependencies on autoconf, automake and texinfo to build. Using those in commencement creates a bootstrap loop. So, revert to a tarball release. * gnu/packages/commencement.scm (gnumach-headers-boot0): Build from tarball; remove autoconf, automake, texinfo bootstrap dependencies. --- gnu/packages/commencement.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 65797af244..c436a78792 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3028,7 +3028,20 @@ exec " gcc "/bin/" program %bootstrap-guile)) (define gnumach-headers-boot0 - (with-boot0 (package-with-bootstrap-guile gnumach-headers))) + (with-boot0 + (package-with-bootstrap-guile + (package + (inherit gnumach-headers) + (version "1.8") + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gnumach/gnumach-" + version ".tar.gz")) + (sha256 + (base32 + "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f"))))) + (native-inputs '()))))) (define mig-boot0 (let* ((mig (package -- cgit v1.2.3 From c9c5e032c34a3d643b9de52eb3705a948e90440c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 1 Mar 2020 13:50:40 +0100 Subject: gnu: commencement: hurd-headers-boot0: Build from tarball. The 'hurd-headers' package now uses a git checkout and added dependencies on autoconf and automake to build. Using those in commencement creates a bootstrap loop. So, revert to a tarball release. * gnu/packages/commencement.scm (hurd-version-boot0, hurd-source-boot0): New variable. (hurd-headers-boot0): Use it to build from tarball; remove autoconf, automake, texinfo bootstrap dependencies. --- gnu/packages/commencement.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c436a78792..7e4aeafb31 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3055,10 +3055,24 @@ exec " gcc "/bin/" program (assoc-ref %build-inputs "flex") "/lib/"))))))) (with-boot0 mig))) +(define hurd-version-boot0 "0.9") +(define hurd-source-boot0 + (let ((version hurd-version-boot0)) + (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/hurd/hurd-" + version ".tar.gz")) + (sha256 + (base32 + "1nw9gly0n7pyv3cpfm4mmxy4yccrx4g0lyrvd3vk2vil26jpbggw")))))) + (define hurd-headers-boot0 (let ((hurd-headers (package (inherit hurd-headers) - (native-inputs `(("mig" ,mig-boot0))) - (inputs '())))) + (version hurd-version-boot0) + (source hurd-source-boot0) + (native-inputs `(("mig" ,mig-boot0))) + (inputs '())))) (with-boot0 (package-with-bootstrap-guile hurd-headers)))) (define hurd-minimal-boot0 -- cgit v1.2.3 From 0c7b63e065d7e3c167fef2473e1158e9eff70dc5 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 1 Mar 2020 13:52:14 +0100 Subject: gnu: commencement: hurd-minimal-boot0: Build from tarball. The 'hurd-minimal' package (via hurd-headers) now uses a git checkout and added dependencies on autoconf, automake and teiinfo to build. Using those in commencement creates a bootstrap loop. So, revert to a tarball release. * gnu/packages/commencement.scm (hurd-minimal-boot0): Build from tarball; remove autoconf, automake, texinfo bootstrap dependencies. --- gnu/packages/commencement.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7e4aeafb31..7e3109fca7 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3077,8 +3077,10 @@ exec " gcc "/bin/" program (define hurd-minimal-boot0 (let ((hurd-minimal (package (inherit hurd-minimal) - (native-inputs `(("mig" ,mig-boot0))) - (inputs '())))) + (version hurd-version-boot0) + (source hurd-source-boot0) + (native-inputs `(("mig" ,mig-boot0))) + (inputs '())))) (with-boot0 (package-with-bootstrap-guile hurd-minimal)))) (define hurd-core-headers-boot0 -- cgit v1.2.3 From 05a852d8dda891dfd7f7e5d3f8c475ce378b1396 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 2 Mar 2020 23:59:56 -0500 Subject: gnu: commencement: glibc-intermediate: Build fixes for the Hurd. * gnu/packages/commencement.scm (glibc-intermediate): Configure with --disable-werror, update pthreads workaround. --- gnu/packages/commencement.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7e3109fca7..446e3260ae 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3230,7 +3230,9 @@ the bootstrap environment." ((#:configure-flags flags) `(append (list ,(string-append "--host=" (boot-triplet)) ,(string-append "--build=" - (nix-system->gnu-triplet))) + (nix-system->gnu-triplet)) + ,(if (hurd-system?) "--disable-werror" + "")) ,flags)) ((#:phases phases) `(modify-phases ,phases @@ -3241,13 +3243,14 @@ the bootstrap environment." (unsetenv "CPATH") ;; Tell 'libpthread' where to find 'libihash' on Hurd systems. - ,@(if (hurd-triplet? (%current-system)) - `((substitute* "libpthread/Makefile" - (("LDLIBS-pthread.so =.*") - (string-append "LDLIBS-pthread.so = " - (assoc-ref %build-inputs "kernel-headers") - "/lib/libihash.a\n")))) - '()) + ,@(if (hurd-system?) + '((substitute* '("sysdeps/mach/Makefile" + "sysdeps/mach/hurd/Makefile") + (("LDLIBS-pthread.so =.*") + (string-append "LDLIBS-pthread.so = " + (assoc-ref %build-inputs "kernel-headers") + "/lib/libihash.a\n")))) + '()) ;; 'rpcgen' needs native libc headers to be built. (substitute* "sunrpc/Makefile" @@ -3268,7 +3271,7 @@ the bootstrap environment." ,@(%boot1-inputs) ;; A native MiG is needed to build Glibc on Hurd. - ,@(if (hurd-triplet? (%current-system)) + ,@(if (hurd-system?) `(("mig" ,mig-boot0)) '()) -- cgit v1.2.3 From 61249ba27cc1e2366b930ba6955baee60cca8b1c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 3 Mar 2020 00:00:53 -0500 Subject: gnu: commencement: hurd-source: Update to latest git. * gnu/packages/commencement.scm (hurd-source-version): Update to 0.9-229-ga1efcee8. (hurd-source-boot0): Update url to updated lilypond tarball. --- gnu/packages/commencement.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 446e3260ae..342b2a3ba1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3055,17 +3055,17 @@ exec " gcc "/bin/" program (assoc-ref %build-inputs "flex") "/lib/"))))))) (with-boot0 mig))) -(define hurd-version-boot0 "0.9") +(define hurd-version-boot0 "0.9-229-ga1efcee8") (define hurd-source-boot0 (let ((version hurd-version-boot0)) (bootstrap-origin (origin (method url-fetch) - (uri (string-append "mirror://gnu/hurd/hurd-" - version ".tar.gz")) + (uri (string-append "https://lilypond.org/janneke/hurd/" + "hurd-v" version ".tar.gz")) (sha256 (base32 - "1nw9gly0n7pyv3cpfm4mmxy4yccrx4g0lyrvd3vk2vil26jpbggw")))))) + "0bq2q2jisxcy0kgcm6rz0z2fddwxxm7azsama7li28a2m08kdpzy")))))) (define hurd-headers-boot0 (let ((hurd-headers (package (inherit hurd-headers) -- cgit v1.2.3 From 1320885ffa006ace07fe7fb59ba6a09ae112e823 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 3 Mar 2020 00:37:14 -0500 Subject: gnu: commencement: gnumach-headers-boot0: Update to 1.8-116-g28b53508. * gnu/packages/commencement.scm (gnumach-headers-boot0): Update to 1.8-116-g28b53508. --- gnu/packages/commencement.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 342b2a3ba1..ea80c5048a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3032,15 +3032,15 @@ exec " gcc "/bin/" program (package-with-bootstrap-guile (package (inherit gnumach-headers) - (version "1.8") + (version "1.8-116-g28b53508") (source (bootstrap-origin (origin (method url-fetch) - (uri (string-append "mirror://gnu/gnumach/gnumach-" - version ".tar.gz")) + (uri (string-append "https://lilypond.org/janneke/hurd/" + "gnumach-" version ".tar.gz")) (sha256 (base32 - "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f"))))) + "006i0zgwy81vxarpfm12vip4q6i5mgmi5mmy5ldvxp5hx9h3l0zg"))))) (native-inputs '()))))) (define mig-boot0 -- cgit v1.2.3 From aaa4cb0caddd594188153da37d3eb9509de90289 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 3 Mar 2020 20:14:24 +0100 Subject: gnu: commencement: glibc-final: Allow gnumach-headers references. * gnu/packages/commencement.scm (glibc-final): Allow gnumach-headers-boot0 references for the Hurd. --- gnu/packages/commencement.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ea80c5048a..09758d1c3f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3426,10 +3426,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; if 'allowed-references' were per-output. (arguments `(#:allowed-references - ,(cons* `(,gcc-boot0 "lib") (kernel-headers-boot0) - static-bash-for-glibc - (package-outputs glibc-final-with-bootstrap-bash)) - + ((,gcc-boot0 "lib") + ,(kernel-headers-boot0) + ,static-bash-for-glibc + ,@(if (hurd-system?) + `(,gnumach-headers-boot0 + ,hurd-headers-boot0) + '()) + ,@(package-outputs glibc-final-with-bootstrap-bash)) ,@(package-arguments glibc-final-with-bootstrap-bash))))) (define gcc-boot0-wrapped -- cgit v1.2.3 From 496d607db3cf1e438ffd1526c4153be551bbef50 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 8 Mar 2020 14:07:51 -0400 Subject: gnu: hurd: Update to hurd-headers version: 0.9-91a51672. * gnu/packages/patches/hurd-cross.patch: New file. * gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch: Remove unused file. * gnu/local.mk (dist_patch_DATA): Update admin. * gnu/packages/hurd.scm (hurd): Update to latest git master: version and source from hurd-headers; Add hurd-cross patch. --- gnu/local.mk | 2 +- gnu/packages/hurd.scm | 18 ++++++------ gnu/packages/patches/hurd-cross.patch | 33 ++++++++++++++++++++++ .../hurd-fix-eth-multiplexer-dependency.patch | 26 ----------------- 4 files changed, 42 insertions(+), 37 deletions(-) create mode 100644 gnu/packages/patches/hurd-cross.patch delete mode 100644 gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1b268fd1c7..f80f577f00 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1038,7 +1038,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ %D%/packages/patches/higan-remove-march-native-flag.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ - %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ + %D%/packages/patches/hurd-cross.patch \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-makeicecat.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 59d5c31e33..b2a53b5f41 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -282,14 +282,9 @@ Hurd-minimal package which are needed for both glibc and GCC.") (define-public hurd (package (name "hurd") - (version "0.9") - (source (origin - (method url-fetch) - (uri (hurd-source-url version)) - (sha256 - (base32 - "1nw9gly0n7pyv3cpfm4mmxy4yccrx4g0lyrvd3vk2vil26jpbggw")) - (patches (search-patches "hurd-fix-eth-multiplexer-dependency.patch")))) + (version (package-version hurd-headers)) + (source (origin (inherit (package-source hurd-headers)) + (patches (search-patches "hurd-cross.patch")))) (arguments `(#:phases (modify-phases %standard-phases @@ -308,8 +303,11 @@ Hurd-minimal package which are needed for both glibc and GCC.") (build-system gnu-build-system) (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers))) (native-inputs - `(("mig" ,mig) - ("perl" ,perl))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("mig" ,mig) + ("perl" ,perl) + ("texinfo" ,texinfo-4))) (supported-systems %hurd-systems) (home-page "https://www.gnu.org/software/hurd/hurd.html") (synopsis "The kernel servers for the GNU operating system") diff --git a/gnu/packages/patches/hurd-cross.patch b/gnu/packages/patches/hurd-cross.patch new file mode 100644 index 0000000000..cc95dddccc --- /dev/null +++ b/gnu/packages/patches/hurd-cross.patch @@ -0,0 +1,33 @@ +This fixes linking libfstest/test-fcntl (and others). + +As discussed with upstream: https://lists.gnu.org/archive/html/bug-hurd/2020-03/msg00018.html + +From 96a9f67a8685e713f25259c18306797d54cc27a5 Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Sat, 14 Mar 2020 11:28:31 +0100 +Subject: [PATCH] build: Fix cross build on Guix. + +As discussed in https://lists.gnu.org/archive/html/bug-hurd/2020-03/msg00018.html. + +* Makeconf (lpath): Add -Wl,-rpath-link= next to -L. +--- + Makeconf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makeconf b/Makeconf +index 67f7ab1c..f68ff6e3 100644 +--- a/Makeconf ++++ b/Makeconf +@@ -325,7 +325,8 @@ _libsubst=${libsubst$(patsubst %,-override,${libsubst-override})} + + # Direct the linker where to find shared objects specified in the + # dependencies of other shared objects it encounters. +-lpath := -L. $(patsubst %,-L%,$(dir $(wildcard ../lib*/lib*.so))) ++lib_dirs := $(dir $(wildcard ../lib*/lib*.so)) ++lpath := -L. $(lib_dirs:%=-L%) $(lib_dirs:%=-Wl,-rpath-link=%) + + # Main rule to link executables + # +-- +2.24.0 + diff --git a/gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch b/gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch deleted file mode 100644 index 5f0da3eab3..0000000000 --- a/gnu/packages/patches/hurd-fix-eth-multiplexer-dependency.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ef0399bad41e60cb30d5073129abeb206076394a Mon Sep 17 00:00:00 2001 -From: Manolis Ragkousis -Date: Sat, 8 Apr 2017 16:44:52 +0300 -Subject: [PATCH] eth-multiplexer: Fix iohelp missing dependency. - -* eth-multiplexer/Makefile (HURDLIBS): Add iohelp. ---- - eth-multiplexer/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eth-multiplexer/Makefile b/eth-multiplexer/Makefile -index 07f909e7..cefa0abd 100644 ---- a/eth-multiplexer/Makefile -+++ b/eth-multiplexer/Makefile -@@ -26,7 +26,7 @@ MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h - device-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name" - OBJS = $(SRCS:.c=.o) $(MIGSTUBS) - LCLHDRS = ethernet.h util.h vdev.h netfs_impl.h --HURDLIBS = ports ihash fshelp shouldbeinlibc netfs bpf -+HURDLIBS = ports ihash iohelp fshelp shouldbeinlibc netfs bpf - LDLIBS = -lpthread - - CFLAGS += -I$(top_srcdir)/libbpf --- -2.12.2 - -- cgit v1.2.3 From 9c3b28b911ef8774f42d35d500a86fb25bd50d3c Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Sun, 7 Aug 2016 17:48:30 +0300 Subject: daemon: Do not use clone on the Hurd. Checking for CLONE_NEWNS is only needed for using tha Linux specific clone(2), otherwise we can use fork(2). Using clone on the Hurd needs some work, only support LINUX for now. See https://lists.gnu.org/archive/html/guix-devel/2020-03/msg00190.html * nix/libstore/build.cc (CHROOT_ENABLED): Break into CHROOT_ENABLED and CLONE_ENABLED. (DerivationGoal::startBuilder): Replace CHROOT_ENABLED with __linux__. (DerivationGoal::runChild): Only define pivot_root() if SYS_pivot_root is defined. Co-authored-by: Jan Nieuwenhuizen --- nix/libstore/build.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index 17e92c68a7..29266f1dd6 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -52,7 +52,12 @@ #endif -#define CHROOT_ENABLED HAVE_CHROOT && HAVE_SYS_MOUNT_H && defined(MS_BIND) && defined(MS_PRIVATE) && defined(CLONE_NEWNS) && defined(SYS_pivot_root) +#define CHROOT_ENABLED HAVE_CHROOT && HAVE_SYS_MOUNT_H && defined(MS_BIND) && defined(MS_PRIVATE) +#define CLONE_ENABLED defined(CLONE_NEWNS) + +#if defined(SYS_pivot_root) +#define pivot_root(new_root, put_old) (syscall(SYS_pivot_root, new_root,put_old)) +#endif #if CHROOT_ENABLED #include @@ -2005,7 +2010,7 @@ void DerivationGoal::startBuilder() - The UTS namespace ensures that builders see a hostname of localhost rather than the actual hostname. */ -#if CHROOT_ENABLED +#if __linux__ if (useChroot) { char stack[32 * 1024]; int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | SIGCHLD; @@ -2186,10 +2191,8 @@ void DerivationGoal::runChild() if (mkdir("real-root", 0) == -1) throw SysError("cannot create real-root directory"); -#define pivot_root(new_root, put_old) (syscall(SYS_pivot_root, new_root, put_old)) if (pivot_root(".", "real-root") == -1) throw SysError(format("cannot pivot old root directory onto '%1%'") % (chrootRootDir + "/real-root")); -#undef pivot_root if (chroot(".") == -1) throw SysError(format("cannot change root directory to '%1%'") % chrootRootDir); -- cgit v1.2.3 From d0ed201e0a9736c64cb3c59d8c987c79fd6046d6 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Wed, 28 Dec 2016 02:49:22 +0200 Subject: daemon: Avoid kill -1 bug on the Hurd. This allows for native builds on the Hurd, doing sudo ./pre-inst-env guix-daemon --disable-chroot --build-users-group=guixbuild & ./pre-inst-env guix build hello * nix/libutil/util.cc (killUser)[__GNU__]: Avoid kill -1 bug; kill only current process and ignore SIGKILL status in parent. Co-authored-by: Jan Nieuwenhuizen --- nix/libutil/util.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc index fb2dfad1f7..17d145b4c6 100644 --- a/nix/libutil/util.cc +++ b/nix/libutil/util.cc @@ -861,6 +861,10 @@ void killUser(uid_t uid) which means "follow POSIX", which we don't want here */ if (syscall(SYS_kill, -1, SIGKILL, false) == 0) break; +#elif __GNU__ + /* Killing all a user's processes using PID=-1 does currently + not work on the Hurd. */ + if (kill(getpid(), SIGKILL) == 0) break; #else if (kill(-1, SIGKILL) == 0) break; #endif @@ -873,6 +877,10 @@ void killUser(uid_t uid) }); int status = pid.wait(true); +#if __GNU__ + /* When the child killed itself, status = SIGKILL. */ + if (status == SIGKILL) return; +#endif if (status != 0) throw Error(format("cannot kill processes for uid `%1%': %2%") % uid % statusToString(status)); -- cgit v1.2.3 From 7baa8c78983424497f5db522243e9e396c99eb12 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 14:55:35 +0100 Subject: gnu: less: Build fix for the Hurd. * gnu/packages/patches/less-hurd-path-max.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/less.scm (less): Use it. --- gnu/local.mk | 1 + gnu/packages/less.scm | 3 +++ gnu/packages/patches/less-hurd-path-max.patch | 36 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 gnu/packages/patches/less-hurd-path-max.patch diff --git a/gnu/local.mk b/gnu/local.mk index f80f577f00..5f5b449ab2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1110,6 +1110,7 @@ dist_patch_DATA = \ %D%/packages/patches/ldc-bootstrap-disable-tests.patch \ %D%/packages/patches/ldc-disable-phobos-tests.patch \ %D%/packages/patches/leela-zero-gtest.patch \ + %D%/packages/patches/less-hurd-path-max.patch \ %D%/packages/patches/liba52-enable-pic.patch \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm index 91c269a67e..d01a423d28 100644 --- a/gnu/packages/less.scm +++ b/gnu/packages/less.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ (define-module (gnu packages less) #:use-module (guix licenses) + #:use-module (gnu packages) #:use-module (gnu packages ncurses) #:use-module (guix packages) #:use-module (guix download) @@ -35,6 +37,7 @@ version ".tar.gz") (string-append "http://www.greenwoodsoftware.com/less/less-" version ".tar.gz"))) + (patches (search-patches "less-hurd-path-max.patch")) (sha256 (base32 "0ggyjl3yzn7c450zk1rixi9ls6asdhgqynhk34zsd0ckhmsm45pz")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/less-hurd-path-max.patch b/gnu/packages/patches/less-hurd-path-max.patch new file mode 100644 index 0000000000..4d23a08788 --- /dev/null +++ b/gnu/packages/patches/less-hurd-path-max.patch @@ -0,0 +1,36 @@ +Avoid usage of PATH_MAX. + +Submitted to bug-less@gnu.org. + +From ef652341ed8b2c14ac40312ccd4ed329cb69fd0c Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Sat, 7 Mar 2020 14:57:19 +0100 +Subject: [PATCH] Avoid usage of PATH_MAX. + +* filename.c (lrealpath): Have realpath allocate the buffer. Fixes +compilation on the Hurd and avoids possible buffer overflow on other +systems. +--- + filename.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/filename.c b/filename.c +index e420837..faa71b0 100644 +--- a/filename.c ++++ b/filename.c +@@ -795,9 +795,9 @@ lrealpath(path) + char *path; + { + #if HAVE_REALPATH +- char rpath[PATH_MAX]; +- if (realpath(path, rpath) != NULL) +- return (save(rpath)); ++ char *rpath = NULL; ++ if ((rpath = realpath(path, rpath)) != NULL) ++ return (rpath); + #endif + return (save(path)); + } +-- +2.24.0 + -- cgit v1.2.3 From 9dd9e8fabfd0b3f3d11e8e26a7aa13d1b0ceea49 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 8 Mar 2020 20:07:24 -0400 Subject: gnu: fontconfig: Build fix for the Hurd. * gnu/packages/patches/fontconfig-hurd-path-max.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/fontutils.scm (fontconfig): Use it. --- gnu/local.mk | 1 + gnu/packages/fontutils.scm | 1 + gnu/packages/patches/fontconfig-hurd-path-max.patch | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 gnu/packages/patches/fontconfig-hurd-path-max.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5f5b449ab2..2ab58b9cf9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -886,6 +886,7 @@ dist_patch_DATA = \ %D%/packages/patches/foobillard++-pkg-config.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ + %D%/packages/patches/fontconfig-hurd-path-max.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/gawk-shell.patch \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 6784dc7cf6..ba0d075900 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -296,6 +296,7 @@ fonts to/from the WOFF2 format.") (uri (string-append "https://www.freedesktop.org/software/fontconfig/release/fontconfig-" version ".tar.bz2")) + (patches (search-patches "fontconfig-hurd-path-max.patch")) (sha256 (base32 "0hb700a68kk0ip51wdlnjjc682kvlrmb6q920mzajykdk0mdsmgn")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/fontconfig-hurd-path-max.patch b/gnu/packages/patches/fontconfig-hurd-path-max.patch new file mode 100644 index 0000000000..f804e6801f --- /dev/null +++ b/gnu/packages/patches/fontconfig-hurd-path-max.patch @@ -0,0 +1,17 @@ +Avoid usage of PATH_MAX. + +Taken from https://salsa.debian.org/freedesktop-team/fontconfig/-/blob/master/debian/patches/path_max.patch + +Index: fontconfig-2.13.1/src/fccfg.c +=================================================================== +--- fontconfig-2.13.1.orig/src/fccfg.c ++++ fontconfig-2.13.1/src/fccfg.c +@@ -2231,7 +2231,7 @@ FcConfigRealFilename (FcConfig *config, + + if (n) + { +- FcChar8 buf[PATH_MAX]; ++ FcChar8 buf[FC_PATH_MAX]; + ssize_t len; + + if (sysroot) -- cgit v1.2.3 From 1a9b3faaf25c40552e100f4a00bef8f0a32ba1dc Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 02:35:00 -0500 Subject: gnu: shadow: Add linux-pam dependency for the Hurd. * gnu/packages/admin.scm (shadow): Also include linux-pam dependency for the Hurd. --- gnu/packages/admin.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f5cebc0283..a296d6cacf 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -503,11 +504,7 @@ hostname.") (for-each delete-file (find-files man "^groups\\.")) #t)))))) - (inputs (if (string-contains (or (%current-target-system) - (%current-system)) - "-linux") - `(("linux-pam" ,linux-pam)) - '())) + (inputs `(("linux-pam" ,linux-pam))) (home-page "https://github.com/shadow-maint/shadow") (synopsis "Authentication-related tools such as passwd, su, and login") (description -- cgit v1.2.3 From 22ee7209797c023b95e22ced156df62cbff90184 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 04:05:02 -0500 Subject: gnu: pciutils: Build fixes for the Hurd. * gnu/packages/linux.scm (kmod)[supported-systems]: Remove the Hurd. * gnu/packages/patches/pciutils-hurd-configure.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/pciutils.scm (pciutils): Use it. [inputs]: Include kmod only for supported systems. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 1 + gnu/packages/patches/pciutils-hurd-configure.patch | 35 ++++++++++++++++++++++ gnu/packages/pciutils.scm | 10 ++++++- 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/pciutils-hurd-configure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2ab58b9cf9..b25d369e07 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1281,6 +1281,7 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-remove-unused-code.patch \ %D%/packages/patches/pam-mount-luks2-support.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \ + %D%/packages/patches/pciutils-hurd-configure.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \ %D%/packages/patches/sdl-pango-blit_overflow.patch \ %D%/packages/patches/sdl-pango-fillrect_crash.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b73b86b0e8..3abfc469ba 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2784,6 +2784,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") '("insmod" "rmmod" "lsmod" "modprobe" "modinfo" "depmod")) #t)))))) + (supported-systems (delete "i586-gnu" %supported-systems)) (home-page "https://www.kernel.org/") (synopsis "Kernel module tools") (description "Kmod is a set of tools to handle common tasks with Linux diff --git a/gnu/packages/patches/pciutils-hurd-configure.patch b/gnu/packages/patches/pciutils-hurd-configure.patch new file mode 100644 index 0000000000..226891a995 --- /dev/null +++ b/gnu/packages/patches/pciutils-hurd-configure.patch @@ -0,0 +1,35 @@ +Add ability to detect GNU/Hurd when configuring. + +Adapted from https://git.hadrons.org/cgit/debian/pkgs/pciutils.git/tree/debian/patches/00-configure-hurd.patch + +From e39a3af22501234a91cf28e8c57b45f9379f9101 Mon Sep 17 00:00:00 2001 +From: Damien Zammit +Date: Fri, 26 Oct 2018 09:24:04 -0400 +Subject: [PATCH 2/2] Add ability to detect GNU/Hurd when configuring + +--- + lib/configure | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/lib/configure ++++ b/lib/configure +@@ -25,7 +25,7 @@ if [ -z "$HOST" ] ; then + proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` + cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` + else +- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'` ++ cpu=`uname -m | sed 's/^i.86-AT386/i386/;s/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'` + fi + if [ "$sys" = "DragonFly" ] + then +@@ -39,6 +39,10 @@ if [ -z "$HOST" ] ; then + then + sys=cygwin + fi ++ if [ "$sys" = "GNU" ] ++ then ++ sys=gnu ++ fi + HOST=${3:-$cpu-$sys} + fi + [ -n "$RELEASE" ] && rel="${RELEASE}" diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 0a55299c93..c992988437 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,8 +26,10 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages hurd) #:use-module (gnu packages linux) #:use-module (gnu packages base)) @@ -39,6 +42,7 @@ (uri (string-append "mirror://kernel.org/software/utils/pciutils/pciutils-" version ".tar.xz")) + (patches (search-patches "pciutils-hurd-configure.patch")) (sha256 (base32 "0mb0f2phdcmp4kfiqsszn2k6nlln0w160ffzrjjv4bbfjwrgfzzn")))) @@ -100,7 +104,11 @@ `(("which" ,which) ("pkg-config" ,pkg-config))) (inputs - `(("kmod" ,kmod) + `(,@(if (member (or (%current-target-system) + (%current-system)) + (package-supported-systems kmod)) + `(("kmod" ,kmod)) + '()) ("zlib" ,zlib))) (home-page "https://mj.ucw.cz/sw/pciutils/") (synopsis "Programs for inspecting and manipulating PCI devices") -- cgit v1.2.3 From c0a5cd1be3fce740c634596959321a76f22623a9 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 16:11:48 +0100 Subject: gnu: shepherd: Build fix for the Hurd. * gnu/packages/patches/shepherd-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (shepherd): Use it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 2 ++ gnu/packages/patches/shepherd-hurd.patch | 44 ++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 gnu/packages/patches/shepherd-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index b25d369e07..0ff248fe70 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1428,6 +1428,7 @@ dist_patch_DATA = \ %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ + %D%/packages/patches/shepherd-hurd.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ %D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-config.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a296d6cacf..4958d67b06 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages file) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) + #:use-module (gnu packages hurd) #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) #:use-module (gnu packages lua) @@ -202,6 +203,7 @@ and provides a \"top-like\" mode (monitoring).") (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) + (patches (search-patches "shepherd-hurd.patch")) (sha256 (base32 "07j3vd0y8zab2nwbrwj0ahrfif1ldm5sjssn7m3dw4s307fsrfzx")))) diff --git a/gnu/packages/patches/shepherd-hurd.patch b/gnu/packages/patches/shepherd-hurd.patch new file mode 100644 index 0000000000..5043e831f2 --- /dev/null +++ b/gnu/packages/patches/shepherd-hurd.patch @@ -0,0 +1,44 @@ +Fixes compilation on the Hurd. + +Taken from upstream: http://git.savannah.gnu.org/cgit/shepherd.git/commit/?id=232331369fe2a0495c7c777e11eecabee6257b3f + +From 232331369fe2a0495c7c777e11eecabee6257b3f Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Sat, 7 Mar 2020 22:01:23 +0100 +Subject: [PATCH] system: Support compilation on the Hurd. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* modules/shepherd/system.scm.in (prctl): Wrap 'dynamic-func' call in +'false-if-exception'. + +Co-authored-by: Ludovic Courtès +--- + modules/shepherd/system.scm.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules/shepherd/system.scm.in b/modules/shepherd/system.scm.in +index 769404a..0b2cc9d 100644 +--- a/modules/shepherd/system.scm.in ++++ b/modules/shepherd/system.scm.in +@@ -1,6 +1,7 @@ + ;; system.scm -- Low-level operating system interface. + ;; Copyright (C) 2013, 2014, 2016, 2018 Ludovic Courtès + ;; Copyright (C) 2018 Carlo Zancanaro ++;; Copyright (C) 2020 Jan (janneke) Nieuwenhuizen + ;; + ;; This file is part of the GNU Shepherd. + ;; +@@ -145,7 +146,7 @@ ctrlaltdel(8) and see kernel/reboot.c in Linux." + (define PR_SET_CHILD_SUBREAPER @PR_SET_CHILD_SUBREAPER@) + + (define prctl +- (if (dynamic-func "prctl" (dynamic-link)) ++ (if (false-if-exception (dynamic-func "prctl" (dynamic-link))) + (let ((proc (syscall->procedure long "prctl" (list int int)))) + (lambda (process operation) + "Perform an operation on the given process" +-- +2.24.0 + -- cgit v1.2.3 From 3d3ca76f1cde964aa61433cdd40dd701c39e60e7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 11:12:15 -0500 Subject: gnu: inetutils: Support for the Hurd. * gnu/packages/linux.scm (net-tools)[supported-systems]: Remove the Hurd. * gnu/packages/patches/inetutils-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (inetutils): Use it. Disable some features on the Hurd. [native-inputs]: Include net-tools only on supported systems --- gnu/local.mk | 1 + gnu/packages/admin.scm | 17 +- gnu/packages/linux.scm | 1 + gnu/packages/patches/inetutils-hurd.patch | 583 ++++++++++++++++++++++++++++++ 4 files changed, 601 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/inetutils-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0ff248fe70..9e4ce6ce92 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1052,6 +1052,7 @@ dist_patch_DATA = \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/ilmbase-openexr-pkg-config.patch \ + %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4958d67b06..9662468b55 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -438,6 +438,7 @@ re-executing them as necessary.") (method url-fetch) (uri (string-append "mirror://gnu/inetutils/inetutils-" version ".tar.gz")) + (patches (search-patches "inetutils-hurd.patch")) (sha256 (base32 "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy")))) @@ -449,13 +450,27 @@ re-executing them as necessary.") ;; cross-compiling (by default it does not.) ,@(if (%current-target-system) '("--with-path-procnet-dev=/proc/net/dev") + '()) + ,@(if (hurd-target?) + '("--disable-rcp" + "--disable-rexec" + "--disable-rexecd" + "--disable-rlogin" + "--disable-rlogind" + "--disable-rsh" + "--disable-rshd" + "--disable-uucpd" + "--disable-whois") '())) ;; On some systems, 'libls.sh' may fail with an error such as: ;; "Failed to tell switch -a apart from -A". #:parallel-tests? #f)) (inputs `(("ncurses" ,ncurses) ("readline" ,readline))) ;for 'ftp' - (native-inputs `(("netstat" ,net-tools))) ;for tests + (native-inputs (if (member (%current-system) + (package-supported-systems net-tools)) + `(("netstat" ,net-tools)) ;for tests + '())) (home-page "https://www.gnu.org/software/inetutils/") (synopsis "Basic networking utilities") (description diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3abfc469ba..1c157205d3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2031,6 +2031,7 @@ inadequately in modern network environments, and both should be deprecated.") (string-append "mandir=/share/man"))))) (native-inputs `(("gettext" ,gettext-minimal) ("unzip" ,unzip))) + (supported-systems (delete "i586-gnu" %supported-systems)) (synopsis "Tools for controlling the network subsystem in Linux") (description "This package includes the important tools for controlling the network diff --git a/gnu/packages/patches/inetutils-hurd.patch b/gnu/packages/patches/inetutils-hurd.patch new file mode 100644 index 0000000000..bd65c4feb1 --- /dev/null +++ b/gnu/packages/patches/inetutils-hurd.patch @@ -0,0 +1,583 @@ +Support compiling on the Hurd. + +Taken from https://git.hadrons.org/cgit/debian/pkgs/inetutils.git/tree/debian/patches/0002-ifconfig-Improve-the-support-for-GNU-Hurd.patch + +From 9a90d9b9119906df23cb2db1503cb0f099942dd9 Mon Sep 17 00:00:00 2001 +From: Mats Erik Andersson +Date: Sat, 18 Jul 2015 01:12:41 +0200 +Subject: [PATCH 02/35] ifconfig: Improve the support for GNU/Hurd. + +Use system specific code instead of generic code. +This provides abilities similar to other systems. +--- + ChangeLog | 17 +++ + ifconfig/system.c | 10 +- + ifconfig/system.h | 2 + + ifconfig/system/Makefile.am | 4 +- + ifconfig/system/generic.c | 14 +- + ifconfig/system/hurd.c | 292 ++++++++++++++++++++++++++++++++++++ + ifconfig/system/hurd.h | 50 ++++++ + 7 files changed, 381 insertions(+), 8 deletions(-) + create mode 100644 ifconfig/system/hurd.c + create mode 100644 ifconfig/system/hurd.h + +diff --git a/ifconfig/system.c b/ifconfig/system.c +index 30677e41..e108dc2e 100644 +--- a/ifconfig/system.c ++++ b/ifconfig/system.c +@@ -25,10 +25,12 @@ + # include "system/solaris.c" + #elif defined __QNX__ + # include "system/qnx.c" +-# elif defined __DragonFly__ || defined __FreeBSD__ || \ +- defined __FreeBSD_kernel__ || \ +- defined __NetBSD__ || defined __OpenBSD__ +-# include "system/bsd.c" ++#elif defined __DragonFly__ || defined __FreeBSD__ || \ ++ defined __FreeBSD_kernel__ || \ ++ defined __NetBSD__ || defined __OpenBSD__ ++# include "system/bsd.c" ++#elif defined __GNU__ ++# include "system/hurd.c" + #else + # include "system/generic.c" + #endif +diff --git a/ifconfig/system.h b/ifconfig/system.h +index 8521ad95..66878d3a 100644 +--- a/ifconfig/system.h ++++ b/ifconfig/system.h +@@ -97,6 +97,8 @@ extern struct if_nameindex* (*system_if_nameindex) (void); + defined __FreeBSD_kernel__ || \ + defined __NetBSD__ || defined __OpenBSD__ + # include "system/bsd.h" ++# elif defined __GNU__ ++# include "system/hurd.h" + # else + # include "system/generic.h" + # endif +diff --git a/ifconfig/system/Makefile.am b/ifconfig/system/Makefile.am +index 954c6774..62a9f1c4 100644 +--- a/ifconfig/system/Makefile.am ++++ b/ifconfig/system/Makefile.am +@@ -26,8 +26,10 @@ noinst_HEADERS = \ + linux.h \ + solaris.h \ + qnx.h \ ++ hurd.h \ + bsd.c \ + generic.c \ + linux.c \ + solaris.c \ +- qnx.c ++ qnx.c \ ++ hurd.c +diff --git a/ifconfig/system/generic.c b/ifconfig/system/generic.c +index 9a2bda55..20a78bde 100644 +--- a/ifconfig/system/generic.c ++++ b/ifconfig/system/generic.c +@@ -22,6 +22,8 @@ + #include + + #include "../ifconfig.h" ++ ++#include + + + /* Output format stuff. */ +@@ -36,19 +38,25 @@ const char *system_help; + struct argp_child system_argp_child; + + int +-system_parse_opt (struct ifconfig **ifp, char option, char *optarg) ++system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER, ++ char option _GL_UNUSED_PARAMETER, ++ char *optarg _GL_UNUSED_PARAMETER) + { + return 0; + } + + int +-system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[]) ++system_parse_opt_rest (struct ifconfig **ifp _GL_UNUSED_PARAMETER, ++ int argc _GL_UNUSED_PARAMETER, ++ char *argv[] _GL_UNUSED_PARAMETER) + { + return 0; + } + + int +-system_configure (int sfd, struct ifreq *ifr, struct system_ifconfig *ifs) ++system_configure (int sfd _GL_UNUSED_PARAMETER, ++ struct ifreq *ifr _GL_UNUSED_PARAMETER, ++ struct system_ifconfig *ifs _GL_UNUSED_PARAMETER) + { + return 0; + } +diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c +new file mode 100644 +index 00000000..3bd19775 +--- /dev/null ++++ b/ifconfig/system/hurd.c +@@ -0,0 +1,292 @@ ++/* hurd.c -- Code for ifconfig specific to GNU/Hurd. ++ Copyright (C) 2015 Free Software Foundation, Inc. ++ ++ This file is part of GNU Inetutils. ++ ++ GNU Inetutils is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or (at ++ your option) any later version. ++ ++ GNU Inetutils is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see `http://www.gnu.org/licenses/'. */ ++ ++/* Mostly written by Marcus Brinkmann. ++ Adaptions to GNU/Hurd by Mats Erik Andersson. */ ++ ++#include ++ ++#include ++#include ++#include ++#include "../ifconfig.h" ++ ++#include ++ ++ ++/* Output format stuff. */ ++ ++const char *system_default_format = "gnu"; ++ ++ ++/* Argument parsing stuff. */ ++ ++const char *system_help = "NAME [ADDR]\ ++ [broadcast BRDADDR] [netmask MASK]\ ++ [mtu N] [up|down] [FLAGS]"; ++ ++struct argp_child system_argp_child; ++ ++int ++system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER, ++ char option _GL_UNUSED_PARAMETER, ++ char *optarg _GL_UNUSED_PARAMETER) ++{ ++ return 0; ++} ++ ++int ++system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[]) ++{ ++ int i = 0, mask, rev; ++ enum { ++ EXPECT_NOTHING, ++ EXPECT_AF, ++ EXPECT_BROADCAST, ++ EXPECT_NETMASK, ++ EXPECT_METRIC, ++ EXPECT_MTU ++ } expect = EXPECT_AF; ++ ++ *ifp = parse_opt_new_ifs (argv[0]); ++ ++ while (++i < argc) ++ { ++ switch (expect) ++ { ++ case EXPECT_BROADCAST: ++ parse_opt_set_brdaddr (*ifp, argv[i]); ++ break; ++ ++ case EXPECT_NETMASK: ++ parse_opt_set_netmask (*ifp, argv[i]); ++ break; ++ ++ case EXPECT_MTU: ++ parse_opt_set_mtu (*ifp, argv[i]); ++ break; ++ ++ /* XXX: 2015-07-18, GNU/Hurd does not yet support ++ ioctl(SIOCSIFMETRIC), but we let the code ++ handle this standard ability anyway! ++ */ ++ case EXPECT_METRIC: ++ parse_opt_set_metric (*ifp, argv[i]); ++ break; ++ ++ case EXPECT_AF: ++ expect = EXPECT_NOTHING; ++ if (!strcmp (argv[i], "inet")) ++ continue; ++ else if (!strcmp (argv[i], "inet6")) ++ { ++ error (0, 0, "%s is not a supported address family", argv[i]); ++ return 0; ++ } ++ break; ++ ++ case EXPECT_NOTHING: ++ break; ++ } ++ ++ if (expect != EXPECT_NOTHING) ++ expect = EXPECT_NOTHING; ++ else if (!strcmp (argv[i], "broadcast")) ++ expect = EXPECT_BROADCAST; ++ else if (!strcmp (argv[i], "netmask")) ++ expect = EXPECT_NETMASK; ++ else if (!strcmp (argv[i], "metric")) ++ expect = EXPECT_METRIC; ++ else if (!strcmp (argv[i], "mtu")) ++ expect = EXPECT_MTU; ++ else if (!strcmp (argv[i], "up")) ++ parse_opt_set_flag (*ifp, IFF_UP | IFF_RUNNING, 0); ++ else if (!strcmp (argv[i], "down")) ++ parse_opt_set_flag (*ifp, IFF_UP, 1); ++ else if (((mask = if_nameztoflag (argv[i], &rev)) ++ & ~IU_IFF_CANTCHANGE) != 0) ++ parse_opt_set_flag (*ifp, mask, rev); ++ else ++ { ++ if (!((*ifp)->valid & IF_VALID_ADDR)) ++ parse_opt_set_address (*ifp, argv[i]); ++ else if (!((*ifp)->valid & IF_VALID_DSTADDR)) ++ parse_opt_set_dstaddr (*ifp, argv[i]); ++ } ++ } ++ ++ switch (expect) ++ { ++ case EXPECT_BROADCAST: ++ error (0, 0, "option `broadcast' requires an argument"); ++ break; ++ ++ case EXPECT_NETMASK: ++ error (0, 0, "option `netmask' requires an argument"); ++ break; ++ ++ case EXPECT_METRIC: ++ error (0, 0, "option `metric' requires an argument"); ++ break; ++ ++ case EXPECT_MTU: ++ error (0, 0, "option `mtu' requires an argument"); ++ break; ++ ++ case EXPECT_AF: ++ case EXPECT_NOTHING: ++ return 1; ++ } ++ ++ return 0; ++} ++ ++int ++system_configure (int sfd _GL_UNUSED_PARAMETER, ++ struct ifreq *ifr _GL_UNUSED_PARAMETER, ++ struct system_ifconfig *ifs _GL_UNUSED_PARAMETER) ++{ ++ return 0; ++} ++ ++struct if_nameindex* (*system_if_nameindex) (void) = if_nameindex; ++ ++static void ++print_hwaddr_ether (format_data_t form _GL_UNUSED_PARAMETER, ++ unsigned char *data) ++{ ++ *column += printf ("%02X:%02X:%02X:%02X:%02X:%02X", ++ data[0], data[1], data[2], data[3], data[4], data[5]); ++ had_output = 1; ++} ++ ++struct arphrd_symbol ++{ ++ const char *name; ++ const char *title; ++ int value; ++ void (*print_hwaddr) (format_data_t form, unsigned char *data); ++} arphrd_symbols[] = ++ { ++#ifdef ARPHRD_ETHER /* Ethernet 10/100Mbps. */ ++ { "ETHER", "Ethernet", ARPHRD_ETHER, print_hwaddr_ether}, ++#endif ++#ifdef ARPHRD_LOOPBACK /* Loopback device. */ ++ { "LOOPBACK", "Local Loopback", ARPHRD_LOOPBACK, NULL}, ++#endif ++ /* XXX: The image debian-hurd-20150424 returns the value 4 ++ instead of expected ARPHRD_LOOPBACK. This has been ++ discussed in the list debian-hurd, where I was asked ++ to resist the temptation of a work around! ++ */ ++ { NULL, NULL, 0, NULL} ++ }; ++ ++struct arphrd_symbol * ++arphrd_findvalue (int value) ++{ ++ struct arphrd_symbol *arp = arphrd_symbols; ++ while (arp->name != NULL) ++ { ++ if (arp->value == value) ++ break; ++ arp++; ++ } ++ if (arp->name) ++ return arp; ++ else ++ return NULL; ++} ++ ++void ++system_fh_hwaddr_query (format_data_t form, int argc, char *argv[]) ++{ ++#ifdef SIOCGIFHWADDR ++ struct arphrd_symbol *arp; ++ ++ if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0) ++ select_arg (form, argc, argv, 1); ++ ++ arp = arphrd_findvalue (form->ifr->ifr_hwaddr.sa_family); ++ select_arg (form, argc, argv, (arp && arp->print_hwaddr) ? 0 : 1); ++#else ++ select_arg (form, argc, argv, 1); ++#endif ++} ++ ++void ++system_fh_hwaddr (format_data_t form, int argc _GL_UNUSED_PARAMETER, ++ char *argv[] _GL_UNUSED_PARAMETER) ++{ ++#ifdef SIOCGIFHWADDR ++ if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0) ++ error (EXIT_FAILURE, errno, ++ "SIOCGIFHWADDR failed for interface `%s'", ++ form->ifr->ifr_name); ++ else ++ { ++ struct arphrd_symbol *arp; ++ ++ arp = arphrd_findvalue (form->ifr->ifr_hwaddr.sa_family); ++ if (arp && arp->print_hwaddr) ++ arp->print_hwaddr (form, ++ (unsigned char *) form->ifr->ifr_hwaddr.sa_data); ++ else ++ put_string (form, "(hwaddr unknown)"); ++ } ++#else ++ *column += printf ("(not available)"); ++ had_output = 1; ++#endif ++} ++ ++void ++system_fh_hwtype_query (format_data_t form, int argc, char *argv[]) ++{ ++#ifdef SIOCGIFHWADDR ++ if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) >= 0) ++ select_arg (form, argc, argv, 0); ++ else ++#endif ++ select_arg (form, argc, argv, 1); ++} ++ ++void ++system_fh_hwtype (format_data_t form, int argc _GL_UNUSED_PARAMETER, ++ char *argv[] _GL_UNUSED_PARAMETER) ++{ ++#ifdef SIOCGIFHWADDR ++ if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0) ++ error (EXIT_FAILURE, errno, ++ "SIOCGIFHWADDR failed for interface `%s'", ++ form->ifr->ifr_name); ++ else ++ { ++ struct arphrd_symbol *arp; ++ ++ arp = arphrd_findvalue (form->ifr->ifr_hwaddr.sa_family); ++ if (arp) ++ put_string (form, arp->title); ++ else ++ put_string (form, "(hwtype unknown)"); ++ } ++#else ++ *column += printf ("(not available)"); ++ had_output = 1; ++#endif ++} +diff --git a/ifconfig/system/hurd.h b/ifconfig/system/hurd.h +new file mode 100644 +index 00000000..bab14565 +--- /dev/null ++++ b/ifconfig/system/hurd.h +@@ -0,0 +1,50 @@ ++/* ++ Copyright (C) 2015 Free Software Foundation, Inc. ++ ++ This file is part of GNU Inetutils. ++ ++ GNU Inetutils is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or (at ++ your option) any later version. ++ ++ GNU Inetutils is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see `http://www.gnu.org/licenses/'. */ ++ ++/* Written by Mats Erik Andersson. */ ++ ++#ifndef IFCONFIG_SYSTEM_HURD_H ++# define IFCONFIG_SYSTEM_HURD_H ++ ++# include "../printif.h" ++# include "../options.h" ++ ++ ++/* Option support. */ ++ ++struct system_ifconfig ++{ ++ int valid; ++}; ++ ++ ++/* Output format support. */ ++ ++# define SYSTEM_FORMAT_HANDLER \ ++ { "hurd", fh_nothing}, \ ++ { "hwaddr?", system_fh_hwaddr_query}, \ ++ { "hwaddr", system_fh_hwaddr}, \ ++ { "hwtype?", system_fh_hwtype_query}, \ ++ { "hwtype", system_fh_hwtype}, ++ ++void system_fh_hwaddr_query (format_data_t form, int argc, char *argv[]); ++void system_fh_hwaddr (format_data_t form, int argc, char *argv[]); ++void system_fh_hwtype_query (format_data_t form, int argc, char *argv[]); ++void system_fh_hwtype (format_data_t form, int argc, char *argv[]); ++ ++#endif /* !IFCONFIG_SYSTEM_HURD_H */ +-- +2.23.0.rc1.170.gbd704faa3e + +From 589dab9c7d3119da82837dabae34c8a3d16cbe49 Mon Sep 17 00:00:00 2001 +From: Mats Erik Andersson +Date: Thu, 30 Jul 2015 01:06:42 +0200 +Subject: [PATCH 07/35] ifconfig: Hardware detection in GNU/Hurd. + +A work-around needed to distinguish hardware type. +--- + ChangeLog | 10 ++++++++++ + ifconfig/system/hurd.c | 19 ++++++++++++------- + 2 files changed, 22 insertions(+), 7 deletions(-) + +diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c +index 3bd19775..b6261a00 100644 +--- a/ifconfig/system/hurd.c ++++ b/ifconfig/system/hurd.c +@@ -175,6 +175,16 @@ print_hwaddr_ether (format_data_t form _GL_UNUSED_PARAMETER, + had_output = 1; + } + ++/* GNU/Hurd and Mach are using a mixture of BSD definitions ++ * and GNU/Linux interface headers, which in this situation ++ * means that sa_family_t is an unsigned char, from BSD, while ++ * all ARPHRD_* come from GNU/Linux and are thus 16 bits wide. ++ * We must account for this. The following bitmask will ++ * adapt to any future change! ++ */ ++ ++#define _ARP_MASK ((sizeof (sa_family_t) == 1) ? 0xff : 0xffff) ++ + struct arphrd_symbol + { + const char *name; +@@ -184,16 +194,11 @@ struct arphrd_symbol + } arphrd_symbols[] = + { + #ifdef ARPHRD_ETHER /* Ethernet 10/100Mbps. */ +- { "ETHER", "Ethernet", ARPHRD_ETHER, print_hwaddr_ether}, ++ { "ETHER", "Ethernet", ARPHRD_ETHER & _ARP_MASK, print_hwaddr_ether}, + #endif + #ifdef ARPHRD_LOOPBACK /* Loopback device. */ +- { "LOOPBACK", "Local Loopback", ARPHRD_LOOPBACK, NULL}, ++ { "LOOPBACK", "Local Loopback", ARPHRD_LOOPBACK & _ARP_MASK, NULL}, + #endif +- /* XXX: The image debian-hurd-20150424 returns the value 4 +- instead of expected ARPHRD_LOOPBACK. This has been +- discussed in the list debian-hurd, where I was asked +- to resist the temptation of a work around! +- */ + { NULL, NULL, 0, NULL} + }; + +-- +2.23.0.rc1.170.gbd704faa3e + +From d379784b4461d17b2536effd1b52bae21cd28a32 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Fri, 16 Aug 2019 00:34:03 +0200 +Subject: [PATCH 35/35] telnet: Several ioctls have been disabled in the Hurd's + glibc + +But not the related option macros. inetutils uses those macros to decide +whether the ioctls are available, so it is FTBFS now. The Hurd's glibc +is being fixed, but we'll use this for now to get the builds going. +--- + telnet/sys_bsd.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c +index 662536ab..5eb35cb5 100644 +--- a/telnet/sys_bsd.c ++++ b/telnet/sys_bsd.c +@@ -63,6 +63,7 @@ + #include + #include + #include ++#include + #include + + #include "ring.h" +@@ -157,7 +158,7 @@ TerminalRead (char *buf, int n) + int + TerminalAutoFlush (void) + { +-#if defined LNOFLSH ++#if defined TIOCLGET && defined LNOFLSH + int flush; + + ioctl (0, TIOCLGET, (char *) &flush); +@@ -260,7 +261,9 @@ TerminalSaveState (void) + ioctl (0, TIOCGETP, (char *) &ottyb); + ioctl (0, TIOCGETC, (char *) &otc); + ioctl (0, TIOCGLTC, (char *) &oltc); ++#ifdef TIOCLGET + ioctl (0, TIOCLGET, (char *) &olmode); ++#endif + + ntc = otc; + nltc = oltc; +@@ -755,7 +758,9 @@ TerminalNewMode (register int f) + #endif + } + #ifndef USE_TERMIO ++#ifdef TIOCLSET + ioctl (tin, TIOCLSET, (char *) &lmode); ++#endif + ioctl (tin, TIOCSLTC, (char *) <c); + ioctl (tin, TIOCSETC, (char *) &tc); + ioctl (tin, TIOCSETN, (char *) &sb); +-- +2.23.0.rc1.170.gbd704faa3e + -- cgit v1.2.3 From 3da54cc3180ce175b1820dd4e366abdbbffcb45d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 11:30:44 -0500 Subject: gnu: screen: Build fix for the Hurd. * gnu/packages/patches/screen-hurd-path-max.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/screen.scm (screen): Use it. --- gnu/local.mk | 1 + gnu/packages/patches/screen-hurd-path-max.patch | 42 +++++++++++++++++++++++++ gnu/packages/screen.scm | 2 ++ 3 files changed, 45 insertions(+) create mode 100644 gnu/packages/patches/screen-hurd-path-max.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9e4ce6ce92..6c9cea2c9b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1424,6 +1424,7 @@ dist_patch_DATA = \ %D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scotch-build-parallelism.patch \ %D%/packages/patches/scotch-integer-declarations.patch \ + %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/sdl2-mesa-compat.patch \ %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \ diff --git a/gnu/packages/patches/screen-hurd-path-max.patch b/gnu/packages/patches/screen-hurd-path-max.patch new file mode 100644 index 0000000000..e906f154f3 --- /dev/null +++ b/gnu/packages/patches/screen-hurd-path-max.patch @@ -0,0 +1,42 @@ +Workaround for PATH_MAX usage on the Hurd. + +Taken from https://salsa.debian.org/debian/screen/-/blob/master/debian/patches/61-default-PATH_MAX-if-undefined-for-hurd.patch + +Description: Set PATH_MAX to 4096 if undefined + Fixes FTBFS since 4.4.0 on GNU/Hurd. Updated to add one more occurrence for 4.5.0. +Author: Axel Beckert +Bug: https://savannah.gnu.org/bugs/?50089 +Last-Updated: 2017-01-18 + +--- a/tty.sh ++++ b/tty.sh +@@ -1478,6 +1478,13 @@ + return 0; + } + ++/* ++ * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd ++ */ ++ ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif + + int CheckTtyname (char *tty) + { +--- a/screen.h ++++ b/screen.h +@@ -109,6 +109,13 @@ + # define DEFAULT_BUFFERFILE "/tmp/screen-exchange" + #endif + ++/* ++ * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd ++ */ ++ ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif + + #if defined(hpux) && !(defined(VSUSP) && defined(VDSUSP) && defined(VWERASE) && defined(VLNEXT)) + # define HPUX_LTCHARS_HACK diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index 51168903a9..c03e2e5e5e 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -29,6 +29,7 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages hurd) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -43,6 +44,7 @@ (method url-fetch) (uri (string-append "mirror://gnu/screen/screen-" version ".tar.gz")) + (patches (search-patches "screen-hurd-path-max.patch")) (sha256 (base32 "18ascpjzsy70h6hk7wpg8zmzjwgdyrdr7c6z4pg5z4l9hhyv24bf")))) (build-system gnu-build-system) -- cgit v1.2.3 From 7f31bd25ad734c483d450eefccdfb26874d2326d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 16:38:31 -0500 Subject: gnu: shadow: Build fix for the Hurd. * gnu/packages/patches/shadow-hurd-pctrl.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (shadow): Use it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 1 + gnu/packages/patches/shadow-hurd-pctrl.patch | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 gnu/packages/patches/shadow-hurd-pctrl.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6c9cea2c9b..fba481cfd0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1430,6 +1430,7 @@ dist_patch_DATA = \ %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ + %D%/packages/patches/shadow-hurd-pctrl.patch \ %D%/packages/patches/shepherd-hurd.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ %D%/packages/patches/slim-session.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9662468b55..d35c455275 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -488,6 +488,7 @@ hostname.") (uri (string-append "https://github.com/shadow-maint/shadow/releases/" "download/" version "/shadow-" version ".tar.xz")) + (patches (search-patches "shadow-hurd-pctrl.patch")) (sha256 (base32 "0qmfq50sdhz6xilgxvinblll8j2iqfl7hwk45bq744y4plq4dbd3")))) diff --git a/gnu/packages/patches/shadow-hurd-pctrl.patch b/gnu/packages/patches/shadow-hurd-pctrl.patch new file mode 100644 index 0000000000..2e376e19a9 --- /dev/null +++ b/gnu/packages/patches/shadow-hurd-pctrl.patch @@ -0,0 +1,16 @@ +Avoid including sys/prctl.h on the Hurd. + +Upstream status: Not submitted. + +--- shadow-4.8.1/libmisc/idmapping.c.orig 2020-03-07 16:32:05.000000000 -0500 ++++ shadow-4.8.1/libmisc/idmapping.c 2020-03-07 16:32:27.000000000 -0500 +@@ -36,8 +36,8 @@ + #include + #include "prototypes.h" + #include "idmapping.h" +-#include + #if HAVE_SYS_CAPABILITY_H ++#include + #include + #endif + -- cgit v1.2.3 From 770ea94c9cde701ae3b45f313799b9d95154c267 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 17:16:38 -0500 Subject: gnu: mit-krb5: Supprt for the Hurd. * gnu/packages/patches/mit-krb5-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/kerberos.scm (mit-krb5): Use it. --- gnu/local.mk | 1 + gnu/packages/kerberos.scm | 5 +- gnu/packages/patches/mit-krb5-hurd.patch | 165 +++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mit-krb5-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index fba481cfd0..ff92662cf4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1208,6 +1208,7 @@ dist_patch_DATA = \ %D%/packages/patches/mingw-w64-6.0.0-gcc.patch \ %D%/packages/patches/minisat-friend-declaration.patch \ %D%/packages/patches/minisat-install.patch \ + %D%/packages/patches/mit-krb5-hurd.patch \ %D%/packages/patches/mit-krb5-qualify-short-hostnames.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 0e290c0d46..896d15f485 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages libidn) + #:use-module (gnu packages hurd) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages compression) @@ -60,7 +62,8 @@ (string-append "https://kerberos.org/dist/krb5/" (version-major+minor version) "/krb5-" version ".tar.gz"))) - (patches (search-patches "mit-krb5-qualify-short-hostnames.patch")) + (patches (search-patches "mit-krb5-qualify-short-hostnames.patch" + "mit-krb5-hurd.patch")) (sha256 (base32 "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk")))) diff --git a/gnu/packages/patches/mit-krb5-hurd.patch b/gnu/packages/patches/mit-krb5-hurd.patch new file mode 100644 index 0000000000..d4962b1e60 --- /dev/null +++ b/gnu/packages/patches/mit-krb5-hurd.patch @@ -0,0 +1,165 @@ +Avoid using MAXPATHLEN and MAXHOSTLEN on the Hurd. + +Taken from https://salsa.debian.org/debian/krb5/-/blob/master/debian/patches/debian-local/0001-Debian-HURD-compatibility.patch + +From: Sam Hartman +Date: Mon, 26 Dec 2011 18:05:13 -0500 +Subject: Debian: HURD compatibility + +HURD has no MAXPATHLEN or MAXHOSTLEN. + +Patch-Category: debian-local +--- + src/clients/ksu/ksu.h | 4 ++++ + src/include/k5-int.h | 3 +++ + src/kadmin/ktutil/ktutil_funcs.c | 4 ++++ + src/kprop/kprop_util.c | 4 ++++ + src/lib/gssapi/spnego/spnego_mech.c | 3 +++ + src/lib/krb5/os/sn2princ.c | 4 ++++ + src/plugins/kdb/db2/libdb2/include/db-int.h | 4 ++++ + src/tests/resolve/resolve.c | 4 ++++ + 8 files changed, 30 insertions(+) + +$ diff -u krb5-1.18/src/util/ss/help.c.orig krb5-1.18/src/util/ss/help.c +--- krb5-1.18/src/util/ss/help.c.orig 2020-03-07 23:25:52.712418587 +0100 ++++ krb5-1.18/src/util/ss/help.c 2020-03-07 23:26:25.764941122 +0100 +@@ -6,6 +6,9 @@ + */ + + #include ++#ifndef MAXPATHLEN ++# define MAXPATHLEN 4096 ++#endif + #include + #include + #include +$ diff -u krb5-1.18/src/lib/krb5/os/hostrealm.c.orig krb5-1.18/src/lib/krb5/os/hostrealm.c +--- krb5-1.18/src/lib/krb5/os/hostrealm.c.orig 2020-03-07 23:33:19.931420994 +0100 ++++ krb5-1.18/src/lib/krb5/os/hostrealm.c 2020-03-07 23:33:58.628026424 +0100 +@@ -42,6 +42,10 @@ + #endif + #endif + ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 256 ++#endif ++ + struct hostrealm_module_handle { + struct krb5_hostrealm_vtable_st vt; + krb5_hostrealm_moddata data; +diff --git a/src/clients/ksu/ksu.h b/src/clients/ksu/ksu.h +index 3bf0bd4..f680b33 100644 +--- a/src/clients/ksu/ksu.h ++++ b/src/clients/ksu/ksu.h +@@ -56,6 +56,10 @@ + #define MAX_CMD 2048 /* this is temp, should use realloc instead, + as done in most of the code */ + ++#ifndef MAXPATHLEN ++# define MAXPATHLEN 4096 ++#endif ++ + + extern int optind; + extern char * optarg; +diff --git a/src/include/k5-int.h b/src/include/k5-int.h +index 6522422..e4f1678 100644 +--- a/src/include/k5-int.h ++++ b/src/include/k5-int.h +@@ -589,6 +589,9 @@ extern char *strdup (const char *); + #ifdef HAVE_SYS_PARAM_H + #include /* MAXPATHLEN */ + #endif ++#ifndef MAXPATHLEN ++# define MAXPATHLEN 4096 ++#endif + + #ifdef HAVE_SYS_FILE_H + #include /* prototypes for file-related +diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c +index 6d119a2..fb7fa22 100644 +--- a/src/kadmin/ktutil/ktutil_funcs.c ++++ b/src/kadmin/ktutil/ktutil_funcs.c +@@ -34,6 +34,10 @@ + #include + #include + ++#ifndef MAXPATHLEN ++# define MAXPATHLEN 4096 ++#endif ++ + /* + * Free a kt_list + */ +diff --git a/src/kprop/kprop_util.c b/src/kprop/kprop_util.c +index c32d174..d72ab18 100644 +--- a/src/kprop/kprop_util.c ++++ b/src/kprop/kprop_util.c +@@ -32,6 +32,10 @@ + #include + #include + ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 256 ++#endif ++ + /* + * Convert an IPv4 or IPv6 socket address to a newly allocated krb5_address. + * There is similar code elsewhere in the tree, so this should possibly become +diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c +index 9d6027c..585d8a6 100644 +--- a/src/lib/gssapi/spnego/spnego_mech.c ++++ b/src/lib/gssapi/spnego/spnego_mech.c +@@ -65,6 +65,9 @@ + #include "gssapiP_spnego.h" + #include + ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 256 ++#endif + + #undef g_token_size + #undef g_verify_token_header +diff --git a/src/lib/krb5/os/sn2princ.c b/src/lib/krb5/os/sn2princ.c +index 5932fd9..187daa8 100644 +--- a/src/lib/krb5/os/sn2princ.c ++++ b/src/lib/krb5/os/sn2princ.c +@@ -126,6 +126,10 @@ find_trailer(const char *hostname) + return p; + } + ++#ifndef MAXHOSTNAMELEN ++# define MAXHOSTNAMELEN 256 ++#endif ++ + krb5_error_code KRB5_CALLCONV + krb5_sname_to_principal(krb5_context context, const char *hostname, + const char *sname, krb5_int32 type, +diff --git a/src/plugins/kdb/db2/libdb2/include/db-int.h b/src/plugins/kdb/db2/libdb2/include/db-int.h +index 7e981d4..d83b3b6 100644 +--- a/src/plugins/kdb/db2/libdb2/include/db-int.h ++++ b/src/plugins/kdb/db2/libdb2/include/db-int.h +@@ -280,4 +280,8 @@ void __dbpanic __P((DB *dbp)); + #ifndef O_BINARY + #define O_BINARY 0 /* Needed for Win32 compiles */ + #endif ++ ++#ifndef MAXPATHLEN ++# define MAXPATHLEN 4096 ++#endif + #endif /* _DB_INT_H_ */ +diff --git a/src/tests/resolve/resolve.c b/src/tests/resolve/resolve.c +index 7339d21..38f7253 100644 +--- a/src/tests/resolve/resolve.c ++++ b/src/tests/resolve/resolve.c +@@ -73,6 +73,10 @@ char *strchr(); + #include + #include + ++#ifndef MAXHOSTNAMELEN ++# define MAXHOSTNAMELEN 256 ++#endif ++ + int + main(argc, argv) + int argc; -- cgit v1.2.3 From 3a1c3642d4d611c5516a8ba5b6bc7e39bdc1c9ae Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 22 Mar 2020 19:10:08 +0100 Subject: llvm: Add support for the Hurd. * gnu/packages/llvm.scm (system->llvm-target): Use X86 for i586 (i.e., the Hurd). --- gnu/packages/llvm.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index ef273e3ef6..e7346ac9ea 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -75,7 +75,8 @@ as \"x86_64-linux\"." ("powerpc" => "PowerPC") ("riscv" => "RISCV") ("x86_64" => "X86") - ("i686" => "X86")))) + ("i686" => "X86") + ("i586" => "X86")))) (define (llvm-download-uri component version) (if (version>=? version "9.0.1") -- cgit v1.2.3 From ad8254c23a86c3ca4ca32bc68fc8d76954aa80fd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 21:37:02 +0100 Subject: gnu: OpenSSL: Remove replacement package. * gnu/packages/tls.scm (openssl): Update to 1.1.1e. [replacement]: Remove. (openssl-1.1.1e): Remove variable. --- gnu/packages/tls.scm | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 45ee67fa9c..f6310222b9 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -280,8 +280,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.1.1d") - (replacement openssl-1.1.1e) + (version "1.1.1e") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -293,7 +292,7 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy")) + "1gnwlri1dphr5wdzmg9vlhkh6aq2yqgpfkpmffzwjlfb26n62kv9")) (patches (search-patches "openssl-1.1-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" @@ -403,24 +402,6 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define openssl-1.1.1e - (package - (inherit openssl) - (version "1.1.1e") - (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openssl.org/source/openssl-" - version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/" - "openssl-" version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/old/" - (string-trim-right version char-set:letter) - "/openssl-" version ".tar.gz"))) - (patches (search-patches "openssl-1.1-c-rehash-in.patch")) - (sha256 - (base32 - "1gnwlri1dphr5wdzmg9vlhkh6aq2yqgpfkpmffzwjlfb26n62kv9")))))) - (define-public openssl-1.0 (package (inherit openssl) -- cgit v1.2.3 From 159b62df5f1bff841e9a498af60e8fbc68003ee7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Mar 2020 20:19:43 +0100 Subject: gnu: ghostscript: Update to 9.52. * gnu/packages/ghostscript.scm (ghostscript): Update to 9.52. [arguments]: Remove obsolete phases. --- gnu/packages/ghostscript.scm | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index ae689925e1..4d56f05cf2 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -159,7 +159,7 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (version "9.51") + (version "9.52") (source (origin (method url-fetch) @@ -169,7 +169,7 @@ printing, and psresize, for adjusting page sizes.") "/ghostscript-" version ".tar.xz")) (sha256 (base32 - "0wdpcq9lq19v8an8xs28cgg7vfzb23f1j12m9p2wdnwa1vwk64by")) + "0z1w42y2jmcpl2m1l3z0sfii6zmvzcwcgzn6bydklia6ig7jli2p")) (patches (search-patches "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) @@ -240,31 +240,7 @@ printing, and psresize, for adjusting page sizes.") (("/bin/sh") (which "sh"))) #t)) ,@(if (%current-target-system) - `((add-after 'unpack 'define-ARCH_MAX_SIZE_T - (lambda _ - ;; XXX: arch_autoconf.h is missing the recent addition of - ;; ARCH_MAX_SIZE_T. Just add it here based on the definition - ;; in "base/genarch.c". This can likely be removed for - ;; Ghostscript > 9.51. - (substitute* "arch/arch_autoconf.h.in" - (("#define ARCH_MAX_ULONG.*" all) - (string-append all "\n" - "#define ARCH_MAX_SIZE_T " - "((size_t)~0L + (size_t)0)\n"))) - #t)) - (add-before 'configure 'do-not-fail-without-native-freetype - (lambda _ - ;; The configure script recurses to build the native tools. - ;; They are built with --disable-freetype, which was made a - ;; hard error in 9.51, causing a build failure because a - ;; native freetype is not detected. Just ignore the check - ;; because it's not needed for these auxiliary tools. - (substitute* "configure" - (("as_fn_error \\$\\? \"(No usable Freetype.*found)\".*" all msg) - (string-append "$as_echo \"$as_me:${as_lineno-$LINENO}: " - "WARNING: " msg "\"\n"))) - #t)) - (add-after 'configure 'add-native-lz + `((add-after 'configure 'add-native-lz (lambda _ ;; Add missing '-lz' for native tools such as 'mkromfs'. (substitute* "Makefile" -- cgit v1.2.3 From 235a4d61d08a200fe688ad5feea8f196902aa73d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Mar 2020 21:09:48 +0100 Subject: gnu: GLib: Update to 2.62.6. * gnu/packages/glib.scm (glib): Update to 2.62.6. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 0e05987bd8..ba69f89e75 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -165,7 +165,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.62.5") + (version "2.62.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -173,7 +173,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq")) + "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) (patches (search-patches "glib-tests-timer.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From daf87c72da94f218740c3822444bb1f96cb74650 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Mar 2020 22:00:58 +0100 Subject: gnu: perl: Update to 5.30.2. * gnu/packages/perl.scm (perl): Update to 5.30.2. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 211e7f51ad..b990aba3fb 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -71,14 +71,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.30.1") + (version "5.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "0r7r8a7pkgxp3w5lza559ahxczw6hzpwvhkpc4c99vpi3xbjagdz")) + "128nfdxcvxfn5kq55qcfrx2851ys8hv794dcdxbyny8rm7w7vnv6")) (patches (search-patches "perl-no-sys-dirs.patch" "perl-autosplit-default-time.patch" -- cgit v1.2.3 From 8595c7b0bc84b354321ec8f6ccca54322f277eb6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Mar 2020 22:02:53 +0100 Subject: gnu: bison: Update to 3.5.3. * gnu/packages/bison.scm (bison): Update to 3.5.3. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 862c2a0528..ae8d1a141b 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -31,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.5.2") + (version "3.5.3") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "1pah9q53aqgr0as3s5la4vbcp9940x6jhj06dyxqpnmnkvdp7qi4")))) + "1i57hbczvr8674z73775jxdd3y59qggs5lmfd60gmwm5i1gmpy1b")))) (build-system gnu-build-system) (arguments '(;; Building in parallel on many-core systems may cause an error such as -- cgit v1.2.3 From 736d772b82bfd693cd9412e2857e029fa6309269 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 14:24:43 +0100 Subject: gnu: gd: Update to 2.3.0. * gnu/packages/patches/gd-fix-tests-on-i686.patch: Adjust context. * gnu/packages/patches/gd-CVE-2018-1000222.patch, gnu/packages/patches/gd-CVE-2018-5711.patch, gnu/packages/patches/gd-CVE-2019-6977.patch, gnu/packages/patches/gd-CVE-2019-6978.patch, gnu/packages/patches/gd-freetype-test-failure.patch: Delete files. * gnu/packages/patches/gd-brect-bounds.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly * gnu/packages/gd.scm (gd): Update to 2.3.0. [source](patches): Remove obsolete. * gnu/packages/gd.scm (gd): [propagated-inputs]: Move LIBJPEG-TURBO and FONTCONFIG ... [inputs]: ... here. --- gnu/local.mk | 6 +- gnu/packages/gd.scm | 20 +- gnu/packages/patches/gd-CVE-2018-1000222.patch | 87 ------ gnu/packages/patches/gd-CVE-2018-5711.patch | 61 ----- gnu/packages/patches/gd-CVE-2019-6977.patch | 36 --- gnu/packages/patches/gd-CVE-2019-6978.patch | 301 --------------------- gnu/packages/patches/gd-brect-bounds.patch | 63 +++++ gnu/packages/patches/gd-fix-tests-on-i686.patch | 2 +- .../patches/gd-freetype-test-failure.patch | 59 ---- 9 files changed, 72 insertions(+), 563 deletions(-) delete mode 100644 gnu/packages/patches/gd-CVE-2018-1000222.patch delete mode 100644 gnu/packages/patches/gd-CVE-2018-5711.patch delete mode 100644 gnu/packages/patches/gd-CVE-2019-6977.patch delete mode 100644 gnu/packages/patches/gd-CVE-2019-6978.patch create mode 100644 gnu/packages/patches/gd-brect-bounds.patch delete mode 100644 gnu/packages/patches/gd-freetype-test-failure.patch diff --git a/gnu/local.mk b/gnu/local.mk index ff92662cf4..6d689f6dc2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -925,12 +925,8 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-8-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-asan-fix-limits-include.patch \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \ - %D%/packages/patches/gd-CVE-2018-5711.patch \ - %D%/packages/patches/gd-CVE-2018-1000222.patch \ - %D%/packages/patches/gd-CVE-2019-6977.patch \ - %D%/packages/patches/gd-CVE-2019-6978.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ - %D%/packages/patches/gd-freetype-test-failure.patch \ + %D%/packages/patches/gd-brect-bounds.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 444c76956a..3c818872c1 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -42,7 +42,7 @@ ;; Note: With libgd.org now pointing to github.com, genuine old ;; tarballs are no longer available. Notably, versions 2.0.x are ;; missing. - (version "2.2.5") + (version "2.3.0") (source (origin (method url-fetch) (uri (string-append @@ -50,14 +50,9 @@ version "/libgd-" version ".tar.xz")) (sha256 (base32 - "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c")) - - (patches (search-patches "gd-CVE-2018-5711.patch" - "gd-CVE-2018-1000222.patch" - "gd-CVE-2019-6977.patch" - "gd-CVE-2019-6978.patch" - "gd-fix-tests-on-i686.patch" - "gd-freetype-test-failure.patch")))) + "0n5czhxzinvjvmhkf5l9fwjdx5ip69k5k7pj6zwb6zs1k9dibngc")) + (patches (search-patches "gd-fix-tests-on-i686.patch" + "gd-brect-bounds.patch")))) (build-system gnu-build-system) (arguments ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding @@ -78,12 +73,11 @@ (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("freetype" ,freetype) + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("zlib" ,zlib))) - (propagated-inputs - `(("fontconfig" ,fontconfig) - ("libjpeg" ,libjpeg-turbo))) (home-page "https://www.libgd.org/") (synopsis "Library for the dynamic creation of images by programmers") (description diff --git a/gnu/packages/patches/gd-CVE-2018-1000222.patch b/gnu/packages/patches/gd-CVE-2018-1000222.patch deleted file mode 100644 index 7e94295bb6..0000000000 --- a/gnu/packages/patches/gd-CVE-2018-1000222.patch +++ /dev/null @@ -1,87 +0,0 @@ -Fix CVE-2018-1000222: - -https://github.com/libgd/libgd/issues/447 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000222 - -Patch copied from upstream source repository: - -https://github.com/libgd/libgd/commit/4b1e18a00ce7c4b7e6919c3b3109a034393b805a - -From 4b1e18a00ce7c4b7e6919c3b3109a034393b805a Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 14 Jul 2018 13:54:08 -0400 -Subject: [PATCH] bmp: check return value in gdImageBmpPtr - -Closes #447. - -(cherry picked from commit ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5) ---- - src/gd_bmp.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/src/gd_bmp.c b/src/gd_bmp.c -index ccafdcd..d625da1 100644 ---- a/src/gd_bmp.c -+++ b/src/gd_bmp.c -@@ -48,6 +48,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp - static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); - static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); - -+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); -+ - #define BMP_DEBUG(s) - - static int gdBMPPutWord(gdIOCtx *out, int w) -@@ -88,8 +90,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageBmpCtx(im, out, compression); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageBmpCtx(im, out, compression)) -+ rv = gdDPExtractData(out, size); -+ else -+ rv = NULL; - out->gd_free(out); - return rv; - } -@@ -142,6 +146,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) - compression - whether to apply RLE or not. - */ - BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) -+{ -+ _gdImageBmpCtx(im, out, compression); -+} -+ -+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) - { - int bitmap_size = 0, info_size, total_size, padding; - int i, row, xpos, pixel; -@@ -149,6 +158,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) - unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; - FILE *tmpfile_for_compression = NULL; - gdIOCtxPtr out_original = NULL; -+ int ret = 1; - - /* No compression if its true colour or we don't support seek */ - if (im->trueColor) { -@@ -326,6 +336,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) - out_original = NULL; - } - -+ ret = 0; - cleanup: - if (tmpfile_for_compression) { - #ifdef _WIN32 -@@ -339,7 +350,7 @@ cleanup: - if (out_original) { - out_original->gd_free(out_original); - } -- return; -+ return ret; - } - - static int compress_row(unsigned char *row, int length) --- -2.18.0 - diff --git a/gnu/packages/patches/gd-CVE-2018-5711.patch b/gnu/packages/patches/gd-CVE-2018-5711.patch deleted file mode 100644 index 83b12cde63..0000000000 --- a/gnu/packages/patches/gd-CVE-2018-5711.patch +++ /dev/null @@ -1,61 +0,0 @@ -This patch is adapted from commit a11f47475e6443b7f32d21f2271f28f417e2ac04 and -fixes CVE-2018-5711. - -From a11f47475e6443b7f32d21f2271f28f417e2ac04 Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" -Date: Wed, 29 Nov 2017 19:37:38 +0100 -Subject: [PATCH] Fix #420: Potential infinite loop in gdImageCreateFromGifCtx - -Due to a signedness confusion in `GetCode_` a corrupt GIF file can -trigger an infinite loop. Furthermore we make sure that a GIF without -any palette entries is treated as invalid *after* open palette entries -have been removed. - -CVE-2018-5711 - -See also https://bugs.php.net/bug.php?id=75571. ---- - src/gd_gif_in.c | 12 ++++++------ - 1 file changed, 38 insertions(+), 6 deletions(-) - -diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c -index daf26e7..0a8bd71 100644 ---- a/src/gd_gif_in.c -+++ b/src/gd_gif_in.c -@@ -335,11 +335,6 @@ terminated: - return 0; - } - -- if(!im->colorsTotal) { -- gdImageDestroy(im); -- return 0; -- } -- - /* Check for open colors at the end, so - * we can reduce colorsTotal and ultimately - * BitsPerPixel */ -@@ -351,6 +346,11 @@ terminated: - } - } - -+ if(!im->colorsTotal) { -+ gdImageDestroy(im); -+ return 0; -+ } -+ - return im; - } - -@@ -447,7 +447,7 @@ static int - GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP) - { - int i, j, ret; -- unsigned char count; -+ int count; - - if(flag) { - scd->curbit = 0; - --- -2.13.6 - diff --git a/gnu/packages/patches/gd-CVE-2019-6977.patch b/gnu/packages/patches/gd-CVE-2019-6977.patch deleted file mode 100644 index b21a8ac619..0000000000 --- a/gnu/packages/patches/gd-CVE-2019-6977.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix CVE-2019-6977: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6977 - -Patch copied from Debian: - -https://salsa.debian.org/debian/libgd2/commit/2d7d3b68bb79843e5271a05543e996fd5a3a8cd1 - -Description: Heap-based buffer overflow in gdImageColorMatch -Origin: other, https://gist.github.com/cmb69/1f36d285eb297ed326f5c821d7aafced -Bug-PHP: https://bugs.php.net/bug.php?id=77270 -Bug-Debian: https://bugs.debian.org/920645 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-6977 -Forwarded: no -Author: "Christoph M. Becker" -Last-Update: 2019-02-01 - -At least some of the image reading functions may return images which -use color indexes greater than or equal to im->colorsTotal. We cater -to this by always using a buffer size which is sufficient for -`gdMaxColors` in `gdImageColorMatch()`. ---- - ---- a/src/gd_color_match.c -+++ b/src/gd_color_match.c -@@ -31,8 +31,8 @@ BGD_DECLARE(int) gdImageColorMatch (gdIm - return -4; /* At least 1 color must be allocated */ - } - -- buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal); -- memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal ); -+ buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors); -+ memset (buf, 0, sizeof(unsigned long) * 5 * gdMaxColors ); - - for (x=0; x < im1->sx; x++) { - for( y=0; ysy; y++ ) { diff --git a/gnu/packages/patches/gd-CVE-2019-6978.patch b/gnu/packages/patches/gd-CVE-2019-6978.patch deleted file mode 100644 index 69fc5056fc..0000000000 --- a/gnu/packages/patches/gd-CVE-2019-6978.patch +++ /dev/null @@ -1,301 +0,0 @@ -Fix CVE-2019-6978: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6978 - -Patch copied from upstream source repository: - -https://github.com/libgd/libgd/commit/553702980ae89c83f2d6e254d62cf82e204956d0 - -From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" -Date: Thu, 17 Jan 2019 11:54:55 +0100 -Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr() - -Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we -must not call `gdDPExtractData()`; otherwise a double-free would -happen. Since `gdImage*Ctx()` are void functions, and we can't change -that for BC reasons, we're introducing static helpers which are used -internally. - -We're adding a regression test for `gdImageJpegPtr()`, but not for -`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to -trigger failure of the respective `gdImage*Ctx()` calls. - -This potential security issue has been reported by Solmaz Salimi (aka. -Rooney). ---- - src/gd_gif_out.c | 18 +++++++++++++++--- - src/gd_jpeg.c | 20 ++++++++++++++++---- - src/gd_wbmp.c | 21 ++++++++++++++++++--- - tests/jpeg/.gitignore | 1 + - tests/jpeg/CMakeLists.txt | 1 + - tests/jpeg/Makemodule.am | 3 ++- - tests/jpeg/jpeg_ptr_double_free.c | 31 +++++++++++++++++++++++++++++++ - 7 files changed, 84 insertions(+), 11 deletions(-) - create mode 100644 tests/jpeg/jpeg_ptr_double_free.c - -diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c -index 298a581..d5a9534 100644 ---- a/src/gd_gif_out.c -+++ b/src/gd_gif_out.c -@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx); - static void char_out(int c, GifCtx *ctx); - static void flush_char(GifCtx *ctx); - -+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out); - - - -@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageGifCtx(im, out); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageGifCtx(im, out)) { -+ rv = gdDPExtractData(out, size); -+ } else { -+ rv = NULL; -+ } - out->gd_free(out); - return rv; - } -@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile) - - */ - BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) -+{ -+ _gdImageGifCtx(im, out); -+} -+ -+/* returns 0 on success, 1 on failure */ -+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) - { - gdImagePtr pim = 0, tim = im; - int interlace, BitsPerPixel; -@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) - based temporary image. */ - pim = gdImageCreatePaletteFromTrueColor(im, 1, 256); - if(!pim) { -- return; -+ return 1; - } - tim = pim; - } -@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) - /* Destroy palette based temporary image. */ - gdImageDestroy( pim); - } -+ -+ return 0; - } - - -diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c -index fc05842..96ef430 100644 ---- a/src/gd_jpeg.c -+++ b/src/gd_jpeg.c -@@ -117,6 +117,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo) - exit(99); - } - -+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality); -+ - /* - * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality - * QUALITY. If QUALITY is in the range 0-100, increasing values -@@ -231,8 +233,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageJpegCtx(im, out, quality); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageJpegCtx(im, out, quality)) { -+ rv = gdDPExtractData(out, size); -+ } else { -+ rv = NULL; -+ } - out->gd_free(out); - return rv; - } -@@ -253,6 +258,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile); - - */ - BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) -+{ -+ _gdImageJpegCtx(im, outfile, quality); -+} -+ -+/* returns 0 on success, 1 on failure */ -+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - { - struct jpeg_compress_struct cinfo; - struct jpeg_error_mgr jerr; -@@ -287,7 +298,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - if(row) { - gdFree(row); - } -- return; -+ return 1; - } - - cinfo.err->emit_message = jpeg_emit_message; -@@ -328,7 +339,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - if(row == 0) { - gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n"); - jpeg_destroy_compress(&cinfo); -- return; -+ return 1; - } - - rowptr[0] = row; -@@ -405,6 +416,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - jpeg_finish_compress(&cinfo); - jpeg_destroy_compress(&cinfo); - gdFree(row); -+ return 0; - } - - -diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c -index f19a1c9..a49bdbe 100644 ---- a/src/gd_wbmp.c -+++ b/src/gd_wbmp.c -@@ -88,6 +88,8 @@ int gd_getin(void *in) - return (gdGetC((gdIOCtx *)in)); - } - -+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out); -+ - /* - Function: gdImageWBMPCtx - -@@ -100,6 +102,12 @@ int gd_getin(void *in) - out - the stream where to write - */ - BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) -+{ -+ _gdImageWBMPCtx(image, fg, out); -+} -+ -+/* returns 0 on success, 1 on failure */ -+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) - { - int x, y, pos; - Wbmp *wbmp; -@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) - /* create the WBMP */ - if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) { - gd_error("Could not create WBMP\n"); -- return; -+ return 1; - } - - /* fill up the WBMP structure */ -@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) - - /* write the WBMP to a gd file descriptor */ - if(writewbmp(wbmp, &gd_putout, out)) { -+ freewbmp(wbmp); - gd_error("Could not save WBMP\n"); -+ return 1; - } - - /* des submitted this bugfix: gdFree the memory. */ - freewbmp(wbmp); -+ -+ return 0; - } - - /* -@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageWBMPCtx(im, fg, out); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageWBMPCtx(im, fg, out)) { -+ rv = gdDPExtractData(out, size); -+ } else { -+ rv = NULL; -+ } - out->gd_free(out); - return rv; - } -#diff --git a/tests/jpeg/.gitignore b/tests/jpeg/.gitignore -#index c28aa87..13bcf04 100644 -#--- a/tests/jpeg/.gitignore -#+++ b/tests/jpeg/.gitignore -#@@ -3,5 +3,6 @@ -# /jpeg_empty_file -# /jpeg_im2im -# /jpeg_null -#+/jpeg_ptr_double_free -# /jpeg_read -# /jpeg_resolution -diff --git a/tests/jpeg/CMakeLists.txt b/tests/jpeg/CMakeLists.txt -index 19964b0..a8d8162 100644 ---- a/tests/jpeg/CMakeLists.txt -+++ b/tests/jpeg/CMakeLists.txt -@@ -2,6 +2,7 @@ IF(JPEG_FOUND) - LIST(APPEND TESTS_FILES - jpeg_empty_file - jpeg_im2im -+ jpeg_ptr_double_free - jpeg_null - ) - -diff --git a/tests/jpeg/Makemodule.am b/tests/jpeg/Makemodule.am -index 7e5d317..b89e169 100644 ---- a/tests/jpeg/Makemodule.am -+++ b/tests/jpeg/Makemodule.am -@@ -2,7 +2,8 @@ if HAVE_LIBJPEG - libgd_test_programs += \ - jpeg/jpeg_empty_file \ - jpeg/jpeg_im2im \ -- jpeg/jpeg_null -+ jpeg/jpeg_null \ -+ jpeg/jpeg_ptr_double_free - - if HAVE_LIBPNG - libgd_test_programs += \ -diff --git a/tests/jpeg/jpeg_ptr_double_free.c b/tests/jpeg/jpeg_ptr_double_free.c -new file mode 100644 -index 0000000..df5a510 ---- /dev/null -+++ b/tests/jpeg/jpeg_ptr_double_free.c -@@ -0,0 +1,31 @@ -+/** -+ * Test that failure to convert to JPEG returns NULL -+ * -+ * We are creating an image, set its width to zero, and pass this image to -+ * `gdImageJpegPtr()` which is supposed to fail, and as such should return NULL. -+ * -+ * See also -+ */ -+ -+ -+#include "gd.h" -+#include "gdtest.h" -+ -+ -+int main() -+{ -+ gdImagePtr src, dst; -+ int size; -+ -+ src = gdImageCreateTrueColor(1, 10); -+ gdTestAssert(src != NULL); -+ -+ src->sx = 0; /* this hack forces gdImageJpegPtr() to fail */ -+ -+ dst = gdImageJpegPtr(src, &size, 0); -+ gdTestAssert(dst == NULL); -+ -+ gdImageDestroy(src); -+ -+ return gdNumFailures(); -+} --- -2.20.1 - diff --git a/gnu/packages/patches/gd-brect-bounds.patch b/gnu/packages/patches/gd-brect-bounds.patch new file mode 100644 index 0000000000..575e4dc2ad --- /dev/null +++ b/gnu/packages/patches/gd-brect-bounds.patch @@ -0,0 +1,63 @@ +Revert upstream commit 04bb9a08b3c25f8e3c0c235f9cefc0f94df59a5a because it +causes a test failure on i686 and possibly other architectures. + +See . + +diff --git a/src/gdft.c b/src/gdft.c +--- a/src/gdft.c ++++ b/src/gdft.c +@@ -1579,6 +1579,12 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c + double scalex = (double)hdpi / (64 * METRIC_RES); + double scaley = (double)vdpi / (64 * METRIC_RES); + ++ /* increase by 1 pixel to allow for rounding */ ++ total_min.x -= METRIC_RES; ++ total_min.y -= METRIC_RES; ++ total_max.x += METRIC_RES; ++ total_max.y += METRIC_RES; ++ + /* rotate bounding rectangle, scale and round to int pixels, and translate */ + brect[0] = x + (total_min.x * cos_a + total_max.y * sin_a)*scalex; + brect[1] = y - (total_min.x * sin_a - total_max.y * cos_a)*scaley; +diff --git a/tests/gdimagestringft/gdimagestringft_bbox.c b/tests/gdimagestringft/gdimagestringft_bbox.c +--- a/tests/gdimagestringft/gdimagestringft_bbox.c ++++ b/tests/gdimagestringft/gdimagestringft_bbox.c +@@ -8,22 +8,22 @@ + #define DELTA (PI/8) + + static int EXPECT[16][8] = { +- {500, 400, 628, 400, 628, 376, 500, 376}, +- {492, 362, 611, 312, 601, 290, 483, 339}, +- {470, 330, 561, 239, 544, 221, 453, 312}, +- {437, 308, 486, 189, 464, 180, 414, 299}, +- {400, 301, 400, 173, 376, 173, 376, 301}, +- {363, 309, 313, 190, 291, 200, 340, 318}, +- {332, 331, 241, 240, 223, 257, 314, 348}, +- {311, 363, 192, 314, 183, 336, 302, 386}, +- {304, 399, 176, 399, 176, 423, 304, 423}, +- {312, 435, 193, 485, 203, 507, 321, 458}, +- {333, 465, 242, 556, 259, 574, 350, 483}, +- {364, 486, 315, 605, 337, 614, 387, 495}, +- {399, 492, 399, 620, 423, 620, 423, 492}, +- {434, 484, 484, 603, 506, 593, 457, 475}, +- {463, 464, 554, 555, 572, 538, 481, 447}, +- {483, 434, 602, 483, 611, 461, 492, 411}, ++ {498, 401, 630, 401, 630, 374, 498, 374}, ++ {491, 364, 613, 313, 602, 288, 481, 338}, ++ {470, 332, 563, 239, 544, 219, 451, 312}, ++ {438, 310, 488, 189, 463, 178, 412, 300}, ++ {401, 303, 401, 171, 374, 171, 374, 303}, ++ {365, 310, 314, 188, 289, 199, 339, 320}, ++ {334, 331, 241, 238, 221, 257, 314, 350}, ++ {313, 362, 192, 312, 181, 337, 303, 388}, ++ {306, 398, 174, 398, 174, 425, 306, 425}, ++ {313, 433, 191, 484, 202, 509, 323, 459}, ++ {333, 463, 240, 556, 259, 576, 352, 483}, ++ {363, 484, 313, 605, 338, 616, 389, 494}, ++ {398, 490, 398, 622, 425, 622, 425, 490}, ++ {432, 483, 483, 605, 508, 594, 458, 473}, ++ {461, 464, 554, 557, 574, 538, 481, 445}, ++ {481, 435, 602, 485, 613, 460, 491, 409}, + }; + + int main() diff --git a/gnu/packages/patches/gd-fix-tests-on-i686.patch b/gnu/packages/patches/gd-fix-tests-on-i686.patch index 280893c1d4..7ec8e7fee9 100644 --- a/gnu/packages/patches/gd-fix-tests-on-i686.patch +++ b/gnu/packages/patches/gd-fix-tests-on-i686.patch @@ -38,7 +38,7 @@ diff -ru libgd-2.2.3.orig/tests/gdimagecopyresampled/bug00201.c libgd-2.2.3/test @@ -65,7 +66,8 @@ gdImageDestroy(background); gdImageDestroy(scaled_logo); - + - gdAssertImageEqualsToFile("gdimagecopyresampled/bug00201_exp.png", img); + if (FLT_EVAL_METHOD != 2) + gdAssertImageEqualsToFile("gdimagecopyresampled/bug00201_exp.png", img); diff --git a/gnu/packages/patches/gd-freetype-test-failure.patch b/gnu/packages/patches/gd-freetype-test-failure.patch deleted file mode 100644 index 49c16ca089..0000000000 --- a/gnu/packages/patches/gd-freetype-test-failure.patch +++ /dev/null @@ -1,59 +0,0 @@ -Fix a test failure with freetype 2.7: - -https://github.com/libgd/libgd/commit/a5570d3ed30ff76c2a8bdd54f4ab1825acca0143 - -Patch copied from upstream source repository: - -https://github.com/libgd/libgd/commit/a5570d3ed30ff76c2a8bdd54f4ab1825acca0143 - -From a5570d3ed30ff76c2a8bdd54f4ab1825acca0143 Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" -Date: Sun, 29 Jan 2017 17:07:50 +0100 -Subject: [PATCH] Fix #302: Test suite fails with freetype 2.7 - -Actually, the test failures are not necessarily related to freetype -2.7, but rather are caused by subpixel hinting which is enabled by -default in freetype 2.7. Subpixel hinting is, however, already -available in freetype 2.5 and in versions having the "Infinality" -patch. - -To get the expected results in all environments, we have to disable -subpixel hinting, what is easily done by setting a respective -environment variable. - -See also: -* https://www.freetype.org/freetype2/docs/subpixel-hinting.html -* https://www.freetype.org/freetype2/docs/reference/ft2-tt_driver.html ---- - tests/freetype/bug00132.c | 3 +++ - tests/gdimagestringft/gdimagestringft_bbox.c | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/tests/freetype/bug00132.c b/tests/freetype/bug00132.c -index 713dd2d..42ed5b1 100644 ---- a/tests/freetype/bug00132.c -+++ b/tests/freetype/bug00132.c -@@ -11,6 +11,9 @@ int main() - char *path; - char *ret = NULL; - -+ /* disable subpixel hinting */ -+ putenv("FREETYPE_PROPERTIES=truetype:interpreter-version=35"); -+ - im = gdImageCreateTrueColor(50, 30); - - if (!im) { -diff --git a/tests/gdimagestringft/gdimagestringft_bbox.c b/tests/gdimagestringft/gdimagestringft_bbox.c -index 0161ec8..1596a9e 100644 ---- a/tests/gdimagestringft/gdimagestringft_bbox.c -+++ b/tests/gdimagestringft/gdimagestringft_bbox.c -@@ -38,6 +38,9 @@ int main() - int error = 0; - FILE *fp; - -+ /* disable subpixel hinting */ -+ putenv("FREETYPE_PROPERTIES=truetype:interpreter-version=35"); -+ - path = gdTestFilePath("freetype/DejaVuSans.ttf"); - im = gdImageCreate(800, 800); - gdImageColorAllocate(im, 0xFF, 0xFF, 0xFF); /* allocate white for background color */ -- cgit v1.2.3 From 814ad500ffbbaeedf81b223db9aac5dc4d6f0f9b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 15:22:40 +0100 Subject: gnu: xcb-proto: Update to 1.14. * gnu/packages/xorg.scm (xcb-proto): Update to 1.14. [source](uri): Change to .xz tarball. --- gnu/packages/xorg.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4353a095e8..a608672fb1 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2130,17 +2130,16 @@ emulate a TI-30 or an HP-10C.") (define-public xcb-proto (package (name "xcb-proto") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "https://xcb.freedesktop.org/dist/xcb-proto-" - version - ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v")))) + "01d62r286yfc3rpz714nqdgkl0wk9j0wqkd4ylas1d7r4vmkqshq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-minimal-wrapper))) -- cgit v1.2.3 From eac7966f0d90fdd5c2ccd488bd08175f968faf2d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 15:23:22 +0100 Subject: gnu: libxcb: Update to 1.14. * gnu/packages/xorg.scm (libxcb): Update to 1.14. [source](uri): Change to .xz tarball. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a608672fb1..c1ff664a67 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5201,15 +5201,15 @@ protocol.") (define-public libxcb (package (name "libxcb") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "https://xcb.freedesktop.org/dist/" - "libxcb-" version ".tar.bz2")) + "libxcb-" version ".tar.xz")) (sha256 (base32 - "1ahxhmdqp4bhb90zmc275rmf5wixqra4bnw9pqnzyl1w3598g30q")))) + "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5")))) (build-system gnu-build-system) (propagated-inputs `(("libpthread-stubs" ,libpthread-stubs) -- cgit v1.2.3 From 447f9acf12bdee3fc817fcbb13fc20180b4ebef9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 15:48:09 +0100 Subject: gnu: python-xmlschema: Update to 1.1.2. * gnu/packages/xml.scm (python-xmlschema): Update to 1.1.2. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 5d8d2a30f5..042679e122 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2099,7 +2099,7 @@ libxml2 and libxslt.") (define-public python-xmlschema (package (name "python-xmlschema") - (version "1.1.1") + (version "1.1.2") (source (origin ;; Unit tests are not distributed with the PyPI archive. (method git-fetch) @@ -2109,7 +2109,7 @@ libxml2 and libxslt.") (file-name (git-file-name name version)) (sha256 (base32 - "0nqhqbvp0kpd1bz11b6gpkc0mkg068mqs56ww4k5ang1cl9d8gd6")))) + "03bz5mp45y4shmlc1gxq1h69vjx60z1acg9cy4kq7fczgx8qg9jw")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From bf115891dc120429ade6be0e1ea410489da9ccdf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 16:00:07 +0100 Subject: gnu: python-fonttools: Update to 4.6.0. * gnu/packages/python-xyz.scm (python-fonttools): Update to 4.6.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1180485e2e..7b4db5fb60 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7338,13 +7338,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "4.2.4") + (version "4.6.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "0rz2fn707x8ri507bb5k5y3di851dwchn0886f77g5bgiflmnpwm")))) + "1mq9kdzhcsp96bhv7smnrpdg1s4z5wh70bsl99c0jmcrahqdisqq")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.2.3 From d9ff6ad88cac8dff1d7ad3027d3fa5977c4d4857 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 16:04:33 +0100 Subject: gnu: potrace: Update to 1.16. * gnu/packages/patches/potrace-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/fontutils.scm (potrace): Update to 1.16. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/fontutils.scm | 5 ++-- gnu/packages/patches/potrace-tests.patch | 50 -------------------------------- 3 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 gnu/packages/patches/potrace-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6d689f6dc2..c1ee251e90 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1319,7 +1319,6 @@ dist_patch_DATA = \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/postgresql-disable-resolve_symlinks.patch \ - %D%/packages/patches/potrace-tests.patch \ %D%/packages/patches/procmail-ambiguous-getline-debian.patch \ %D%/packages/patches/procmail-CVE-2014-3618.patch \ %D%/packages/patches/procmail-CVE-2017-16844.patch \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index ba0d075900..a77cf9ebf0 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -468,7 +468,7 @@ and returns a sequence of positioned glyphids from the font.") (define-public potrace (package (name "potrace") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) @@ -476,8 +476,7 @@ and returns a sequence of positioned glyphids from the font.") "/potrace-" version ".tar.gz")) (sha256 (base32 - "17ajildjp14shsy339xarh1lw1p0k60la08ahl638a73mh23kcx9")) - (patches (search-patches "potrace-tests.patch")))) + "1k3sxgjqq0jnpk9xxys05q32sl5hbf1lbk1gmfxcrmpdgnhli0my")))) (build-system gnu-build-system) (native-inputs `(("ghostscript" ,ghostscript))) ;for tests (inputs `(("zlib" ,zlib))) diff --git a/gnu/packages/patches/potrace-tests.patch b/gnu/packages/patches/potrace-tests.patch deleted file mode 100644 index 407be98dab..0000000000 --- a/gnu/packages/patches/potrace-tests.patch +++ /dev/null @@ -1,50 +0,0 @@ -This relaxes the comparison threshold between the reference data -and the bitmaps produced by Ghostscript interpreting the vectorized -image. Apparently the threshold has become too low with the switch -to from Ghostscript 2.21 to 2.22. - ---- potrace-1.15/check/postscript-check.sh 2018-01-06 19:47:26.194900686 +0100 -+++ potrace-1.15/check/postscript-check.sh 2018-01-06 19:51:35.937503739 +0100 -@@ -70,15 +70,15 @@ if test $? -ne 0; then - echo "Something is wrong with $GS; skipping this test" >& 2 - exit 77 - fi --actiondiff "$TMP2" "$REFDATA" 1000 -+actiondiff "$TMP2" "$REFDATA" 1500 - - action $POTRACE -r50 -p -L 0 -B 0 --opaque -o "$TMP1" "$DATA" - action "$GS" -q -dNOPAUSE -sDEVICE=pbmraw -g460x394 -r100x100 -sOutputFile="$TMP2" -- "$TMP1" --actiondiff "$TMP2" "$REFDATA" 1200 -+actiondiff "$TMP2" "$REFDATA" 1500 - - action $POTRACE -r50 -p -L 0 -B 0 -A 160 -o "$TMP1" "$DATA" - action "$GS" -q -dNOPAUSE -sDEVICE=pbmraw -g568x528 -r100x100 -sOutputFile="$TMP2" -- "$TMP1" --actiondiff "$TMP2" "$REFDATAROT" 1200 -+actiondiff "$TMP2" "$REFDATAROT" 1500 - - action rm -f "$TMP1" - action rm -f "$TMP2" - ---- potrace-1.15/check/pdf-check.sh 2018-01-06 19:47:28.698886663 +0100 -+++ potrace-1.15/check/pdf-check.sh 2018-01-06 20:54:14.895460329 +0100 -@@ -72,15 +72,15 @@ if test $? -ne 0 -o ! -f "$TMP2"; then - echo "GS does not understand PDF; skipping this test" >& 2 - exit 77 - fi --actiondiff "$TMP2" "$REFDATA" 1000 -+actiondiff "$TMP2" "$REFDATA" 1500 - - action $POTRACE -r50 -p -L 0 -B 0 --opaque -b pdf -o "$TMP1" "$DATA" - action "$GS" -q -dNOPAUSE -sDEVICE=pbmraw -g460x394 -r100x100 -sOutputFile="$TMP2" -- "$TMP1" --actiondiff "$TMP2" "$REFDATA" 1200 -+actiondiff "$TMP2" "$REFDATA" 1500 - - action $POTRACE -r50 -p -L 0 -B 0 -A 160 -b pdf -o "$TMP1" "$DATA" - action "$GS" -q -dNOPAUSE -sDEVICE=pbmraw -g568x528 -r100x100 -sOutputFile="$TMP2" -- "$TMP1" --actiondiff "$TMP2" "$REFDATAROT" 1200 -+actiondiff "$TMP2" "$REFDATAROT" 1500 - - action rm -f "$TMP1" - action rm -f "$TMP2" - -Diff finished. Sat Jan 6 20:54:50 2018 -- cgit v1.2.3 From 2b9b854cd18edb0dc13bdcfd9d290530974d71c9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 16:13:53 +0100 Subject: gnu: libgsf: Update to 1.14.47. * gnu/packages/gnome.scm (libgsf): Update to 1.14.47. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ef65c5bcca..77964f5c9c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2059,7 +2059,7 @@ XML/CSS rendering engine.") (define-public libgsf (package (name "libgsf") - (version "1.14.46") + (version "1.14.47") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2067,7 +2067,7 @@ XML/CSS rendering engine.") name "-" version ".tar.xz")) (sha256 (base32 - "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa")))) + "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 0eb56ccbd6ebe1b441cb2a0200f19dff0df72f0e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 16:16:30 +0100 Subject: gnu: libsigc++: Update to 2.10.3. * gnu/packages/glib.scm (libsigc++): Update to 2.10.3. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ba69f89e75..92c693544d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -583,7 +583,7 @@ by GDBus included in Glib.") (define libsigc++ (package (name "libsigc++") - (version "2.10.2") + (version "2.10.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsigc++/" @@ -591,7 +591,7 @@ by GDBus included in Glib.") name "-" version ".tar.xz")) (sha256 (base32 - "163s14d1rqp82gc1vsm3q0wzsbdicb9q6307kz0zk5lm6x9h5jmi")))) + "11j7j1jv4z58d9s7jvl42fnqa1dzl4idgil9r45cjv1w673dys0b")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("m4" ,m4))) -- cgit v1.2.3 From 2c5bc95a19d6a36e6e3568ccb59f10d7f232364f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Mar 2020 18:21:20 +0100 Subject: gnu: ImageMagick: Build reproducibly. Fixes . * gnu/packages/imagemagick.scm (imagemagick)[arguments]: In #:configure-flags, add "--enable-reproducible-build". (cherry picked from commit 87bc9f022cdd3487e85cf83cf82222315246abf9) --- gnu/packages/imagemagick.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 0adb3fb79a..6fc7e6d201 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -58,7 +58,11 @@ "0fcbcad95wn0q0pdfl0qgycm30f3a7xhskc0r5icldq6v6l4b3is")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") + `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" + + ;; Do not embed the build date in binaries. + "--enable-reproducible-build") + ;; FIXME: The test suite succeeded before version 6.9.6-2. ;; Try enabling it again with newer releases. #:tests? #f -- cgit v1.2.3 From b12acffbd03c025b1e849f7a93d5edd47682a8ce Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 24 Mar 2020 03:13:33 +0100 Subject: gnu: xkbcomp: Update to 1.4.3. * gnu/packages/xorg.scm (xkbcomp): update to 1.4.3. Signed-off-by: Marius Bakke --- gnu/packages/xorg.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c1ff664a67..47db1f507f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Leo Prikler ;;; Copyright © 2020 Florian Pelz +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -3845,7 +3846,7 @@ alternative implementations like XRandR or TwinView.") (define xkbcomp-intermediate ; used as input for xkeyboard-config (package (name "xkbcomp-intermediate") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) @@ -3855,7 +3856,7 @@ alternative implementations like XRandR or TwinView.") ".tar.bz2")) (sha256 (base32 - "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d")))) + "0dflr250nlj6rrnv658f6dm8qx37sj0xfimc3ihay761kwb2q906")))) (build-system gnu-build-system) (inputs `(("xorgproto" ,xorgproto) -- cgit v1.2.3 From 0ab8ad46322bea331ed5f5592843ba35e7f38b37 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 23:09:15 +0100 Subject: gnu: OpenSSL: Add upstream patch to preserve compatibility in EOF handling. This is a follow-up to ad8254c23a86c3ca4ca32bc68fc8d76954aa80fd, which unexpectedly caused a test failure in the Python test suite. * gnu/packages/patches/openssl-1.1.1e-revert-detect-eof.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/tls.scm (openssl)[source](patches): Add it. --- gnu/local.mk | 1 + .../patches/openssl-1.1.1e-revert-detect-eof.patch | 80 ++++++++++++++++++++++ gnu/packages/tls.scm | 3 +- 3 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openssl-1.1.1e-revert-detect-eof.patch diff --git a/gnu/local.mk b/gnu/local.mk index c1ee251e90..d687c53a8a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1267,6 +1267,7 @@ dist_patch_DATA = \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ + %D%/packages/patches/openssl-1.1.1e-revert-detect-eof.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/openssl-CVE-2019-1559.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ diff --git a/gnu/packages/patches/openssl-1.1.1e-revert-detect-eof.patch b/gnu/packages/patches/openssl-1.1.1e-revert-detect-eof.patch new file mode 100644 index 0000000000..973559440f --- /dev/null +++ b/gnu/packages/patches/openssl-1.1.1e-revert-detect-eof.patch @@ -0,0 +1,80 @@ +This patch reverts a change in 1.1.1e that can break applications that do +not expect EOF to be reported via SSL_ERROR_SSL. + +https://bugs.python.org/issue40018 +https://github.com/openssl/openssl/pull/11400 +https://github.com/openssl/openssl/commit/0cd2ee64bffcdece599c3e4b5fac3830a55dc0fa + +Taken from upstream: +https://github.com/openssl/openssl/commit/30d190caf311d534867df97e26b552e628cb7d85 + +diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt +index f5324c6819d8..35512f9caf96 100644 +--- a/crypto/err/openssl.txt ++++ b/crypto/err/openssl.txt +@@ -2852,7 +2852,6 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines + SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES:243:unable to load ssl3 sha1 routines + SSL_R_UNEXPECTED_CCS_MESSAGE:262:unexpected ccs message + SSL_R_UNEXPECTED_END_OF_EARLY_DATA:178:unexpected end of early data +-SSL_R_UNEXPECTED_EOF_WHILE_READING:294:unexpected eof while reading + SSL_R_UNEXPECTED_MESSAGE:244:unexpected message + SSL_R_UNEXPECTED_RECORD:245:unexpected record + SSL_R_UNINITIALIZED:276:uninitialized +diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h +index 0ef684f3c131..ba4c4ae5fbd3 100644 +--- a/include/openssl/sslerr.h ++++ b/include/openssl/sslerr.h +@@ -1,6 +1,6 @@ + /* + * Generated by util/mkerr.pl DO NOT EDIT +- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. ++ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy +@@ -734,7 +734,6 @@ int ERR_load_SSL_strings(void); + # define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES 243 + # define SSL_R_UNEXPECTED_CCS_MESSAGE 262 + # define SSL_R_UNEXPECTED_END_OF_EARLY_DATA 178 +-# define SSL_R_UNEXPECTED_EOF_WHILE_READING 294 + # define SSL_R_UNEXPECTED_MESSAGE 244 + # define SSL_R_UNEXPECTED_RECORD 245 + # define SSL_R_UNINITIALIZED 276 +diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c +index 1c885a664f35..b2a7a47eb075 100644 +--- a/ssl/record/rec_layer_s3.c ++++ b/ssl/record/rec_layer_s3.c +@@ -296,12 +296,6 @@ int ssl3_read_n(SSL *s, size_t n, size_t max, int extend, int clearold, + ret = BIO_read(s->rbio, pkt + len + left, max - left); + if (ret >= 0) + bioread = ret; +- if (ret <= 0 +- && !BIO_should_retry(s->rbio) +- && BIO_eof(s->rbio)) { +- SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_SSL3_READ_N, +- SSL_R_UNEXPECTED_EOF_WHILE_READING); +- } + } else { + SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_READ_N, + SSL_R_READ_BIO_NOT_SET); +diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c +index a0c7b79659d4..4b12ed1485d9 100644 +--- a/ssl/ssl_err.c ++++ b/ssl/ssl_err.c +@@ -1,6 +1,6 @@ + /* + * Generated by util/mkerr.pl DO NOT EDIT +- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. ++ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy +@@ -1205,8 +1205,6 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { + "unexpected ccs message"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_END_OF_EARLY_DATA), + "unexpected end of early data"}, +- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_EOF_WHILE_READING), +- "unexpected eof while reading"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_MESSAGE), "unexpected message"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_RECORD), "unexpected record"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNINITIALIZED), "uninitialized"}, diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f6310222b9..a057432f4b 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -293,7 +293,8 @@ required structures.") (sha256 (base32 "1gnwlri1dphr5wdzmg9vlhkh6aq2yqgpfkpmffzwjlfb26n62kv9")) - (patches (search-patches "openssl-1.1-c-rehash-in.patch")))) + (patches (search-patches "openssl-1.1-c-rehash-in.patch" + "openssl-1.1.1e-revert-detect-eof.patch")))) (build-system gnu-build-system) (outputs '("out" "doc" ;6.8 MiB of man3 pages and full HTML documentation -- cgit v1.2.3 From 20586ffdc746b17f8208e77852752e99bf5bee55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Mar 2020 00:21:10 +0100 Subject: gnu: Automake: Remove version 1.16.1. * gnu/packages/autotools.scm (automake): Update to 1.16.2. [arguments]: Add phase "skip-test". (automake-1.16.2): Remove variable. --- gnu/packages/autotools.scm | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index faf26079b5..99ca52730e 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -250,14 +250,14 @@ output is indexed in many ways to simplify browsing.") (define-public automake (package (name "automake") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/automake/automake-" version ".tar.xz")) (sha256 (base32 - "08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax")) + "1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c")) (patches (search-patches "automake-skip-amhello-tests.patch")))) (build-system gnu-build-system) @@ -289,6 +289,15 @@ output is indexed in many ways to simplify browsing.") (setenv "CONFIG_SHELL" sh) #t))) + (add-before 'check 'skip-test + (lambda _ + ;; This test requires 'etags' and fails if it's missing. + ;; Skip it. + (substitute* "t/tags-lisp-space.sh" + (("^required.*" all) + (string-append "exit 77\n" all "\n"))) + #t)) + ;; Files like `install-sh', `mdate.sh', etc. must use ;; #!/bin/sh, otherwise users could leak erroneous shebangs ;; in the wild. See for an @@ -325,32 +334,6 @@ intuitive format and then Automake works with Autoconf to produce a robust Makefile, simplifying the entire process for the developer.") (license gpl2+))) ; some files are under GPLv3+ -(define-public automake-1.16.2 - (package - (inherit automake) - (version "1.16.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/automake/automake-" - version ".tar.xz")) - (sha256 - (base32 - "1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c")) - (patches - (search-patches "automake-skip-amhello-tests.patch")))) - (arguments - (substitute-keyword-arguments (package-arguments automake) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-before 'check 'skip-test - (lambda _ - ;; This test requires 'etags' and fails if it's missing. - ;; Skip it. - (substitute* "t/tags-lisp-space.sh" - (("^required.*" all) - (string-append "exit 77\n" all "\n"))) - #t)))))))) - (define-public libtool (package (name "libtool") -- cgit v1.2.3 From f605eef2d4716023ccd127ca4910e5ccbd7cdfb0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Mar 2020 00:21:35 +0100 Subject: gnu: help2man: Remove version 1.47.12. * gnu/packages/man.scm (help2man): Update to 1.47.13. (help2man/latest): Remove variable. --- gnu/packages/man.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 0f25e71671..e0019d4c6e 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -198,7 +198,7 @@ Linux kernel and C library interfaces employed by user-space programs.") (define-public help2man (package (name "help2man") - (version "1.47.12") + (version "1.47.13") (source (origin (method url-fetch) @@ -206,7 +206,7 @@ Linux kernel and C library interfaces employed by user-space programs.") version ".tar.xz")) (sha256 (base32 - "0q5ixbxz1v7wqnpg4bq7k7nbv9ssnmcvdbqsq5ycjvniz56ac2vx")))) + "08q5arxz4j4pyx5q4712c2rn7p7dw7as9xg38yvmsh1c3ynvpy5p")))) (build-system gnu-build-system) (arguments `(;; There's no `check' target. #:tests? #f)) @@ -226,18 +226,6 @@ Linux kernel and C library interfaces employed by user-space programs.") automatically.") (license gpl3+))) -(define-public help2man/latest - (package - (inherit help2man) - (version "1.47.13") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/help2man/help2man-" - version ".tar.xz")) - (sha256 - (base32 - "08q5arxz4j4pyx5q4712c2rn7p7dw7as9xg38yvmsh1c3ynvpy5p")))))) - (define-public scdoc (package (name "scdoc") -- cgit v1.2.3 From 63bd6643c80f3af8180392eb1bf531bedb8e2201 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Mar 2020 00:46:38 +0100 Subject: gnu: icu4c: Incorporate grafted changes. * gnu/packages/icu4c.scm (icu4c)[replacement]: Remove. [source](patches, patch-flags): New fields. (icu4c/fixed): Remove variable. --- gnu/packages/icu4c.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 88f97efeb6..046e35e414 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -36,7 +36,6 @@ (define-public icu4c (package (name "icu4c") - (replacement icu4c/fixed) (version "66.1") (source (origin (method url-fetch) @@ -46,6 +45,8 @@ "/icu4c-" (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) + (patch-flags '("-p2")) + (patches (search-patches "icu4c-CVE-2020-10531.patch")) (sha256 (base32 "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj")))) (build-system gnu-build-system) @@ -113,17 +114,6 @@ C/C++ part.") #t))))))) (native-inputs '()))) -(define icu4c/fixed - (package - (inherit icu4c) - (source (origin - (inherit (package-source icu4c)) - (patch-flags '("-p2")) - (patches (append - (origin-patches (package-source icu4c)) - (search-patches - "icu4c-CVE-2020-10531.patch"))))))) - (define-public java-icu4j (package (name "java-icu4j") -- cgit v1.2.3 From cfa6666921e8077884ffb3707ce8323b01f5d345 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Mar 2020 15:16:22 +0100 Subject: gnu: mscgen: Fix build with gd >= 2.3.0. 'gd' no longer provides 'libgd-config', so use 'pkg-config' instead. * gnu/packages/graph.scm (mscgen)[native-inputs]: Add PKG-CONFIG. --- gnu/packages/graph.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index aa6ea16ab3..9b391451fe 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -532,6 +532,8 @@ of graphs.") (base32 "08yw3maxhn5fl1lff81gmcrpa4j9aas4mmby1g9w5qcr0np82d1w")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("gd" ,gd))) (home-page "http://www.mcternan.me.uk/mscgen/") -- cgit v1.2.3 From a3efa4f9eb11b8dc08ab154931ef2a2ef14c0ab7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Mar 2020 15:24:02 +0100 Subject: gnu: emacs: Fix format strings for compatibility with Guile 3. * gnu/packages/emacs.scm (emacs)[arguments]: In the 'patch-program-file-names' and 'install-site-start' phases, specify port in the calls to FORMAT. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fa420cacf7..0938dabf1e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -139,7 +139,7 @@ "lisp/textmodes/artist.el" "lisp/progmodes/sh-script.el") (("\"/bin/sh\"") - (format "~s" (which "sh")))) + (format #f "~s" (which "sh")))) #t)) (add-before 'configure 'fix-/bin/pwd (lambda _ @@ -163,7 +163,7 @@ (byte-recompile-directory (file-name-as-directory ,dir) 0 1)))) (invoke emacs "--quick" "--batch" - (format "--eval=~s" expr)))) + (format #f "--eval=~s" expr)))) (copy-file (assoc-ref inputs "guix-emacs.el") (string-append lisp-dir "/guix-emacs.el")) -- cgit v1.2.3 From 5d446d6b6a196a7838b9102172cffcc3ebd18487 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Mar 2020 19:01:41 +0100 Subject: gnu: ovmf: Adapt to CPLUS_INCLUDE_PATH changes. * gnu/packages/firmware.scm (ovmf)[native-inputs]: Distinguish GCC-5. [arguments]: Add phase to hide the default GCC from CPLUS_INCLUDE_PATH. --- gnu/packages/firmware.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 93f01b9719..2dff39f786 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -320,7 +320,7 @@ coreboot.") (build-system gnu-build-system) (native-inputs `(("acpica" ,acpica) - ("gcc" ,gcc-5) + ("gcc@5" ,gcc-5) ("nasm" ,nasm) ("python-2" ,python-2) ("util-linux" ,util-linux "lib"))) @@ -328,6 +328,18 @@ coreboot.") `(#:tests? #f ; No check target. #:phases (modify-phases %standard-phases + ;; Hide the default GCC from CPLUS_INCLUDE_PATH to prevent it from + ;; shadowing the version of GCC provided in native-inputs. + (add-after 'set-paths 'hide-gcc7 + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:)) + ":")) + #t))) (replace 'configure (lambda _ (let* ((cwd (getcwd)) -- cgit v1.2.3 From 7f1aa73b8c69432e6f15463e3b0bea6dc40f4e2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Mar 2020 19:21:49 +0100 Subject: gnu: guile: Update to 3.0.2. * gnu/packages/guile.scm (guile-3.0): Update to 3.0.2. [source](patches): Remove. * gnu/packages/patches/guile-3.0-crash.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/guile.scm | 7 ++----- gnu/packages/patches/guile-3.0-crash.patch | 17 ----------------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 gnu/packages/patches/guile-3.0-crash.patch diff --git a/gnu/local.mk b/gnu/local.mk index fa578749cf..b0b72e6349 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1002,7 +1002,6 @@ dist_patch_DATA = \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ - %D%/packages/patches/guile-3.0-crash.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c87728f432..0efee2d86a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -269,17 +269,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile") - (version "3.0.1") + (version "3.0.2") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "1jakps3127h8g69ixgb4zwc8v2g29dmwql1vi3pwg30kzp8fm5nn")) - (patches - (append (search-patches "guile-3.0-crash.patch") - (origin-patches (package-source guile-2.2)))))) + "12lziar4j27j9whqp2n18427q45y9ghq7gdd8lqhmj1k0lr7vi2k")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") diff --git a/gnu/packages/patches/guile-3.0-crash.patch b/gnu/packages/patches/guile-3.0-crash.patch deleted file mode 100644 index 510834ab57..0000000000 --- a/gnu/packages/patches/guile-3.0-crash.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix crash due to: . - -diff --git a/libguile/struct.c b/libguile/struct.c -index 3dbcc71d4..ddcbe46d2 100644 ---- a/libguile/struct.c -+++ b/libguile/struct.c -@@ -139,7 +139,9 @@ set_vtable_access_fields (SCM vtable) - nfields = len / 2; - - bitmask_size = (nfields + 31U) / 32U; -- unboxed_fields = scm_gc_malloc_pointerless (bitmask_size, "unboxed fields"); -+ unboxed_fields = -+ scm_gc_malloc_pointerless (bitmask_size * sizeof (*unboxed_fields), -+ "unboxed fields"); - memset (unboxed_fields, 0, bitmask_size * sizeof(*unboxed_fields)); - - /* Update FLAGS according to LAYOUT. */ -- cgit v1.2.3 From 2bd9410e171c5359bad24f187e74b23d4174b39e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Mar 2020 19:35:54 +0100 Subject: gnu: libgc: Promote libgc@8 to the default libgc. * gnu/packages/bdw-gc.scm (libgc): Update to 8.0.4. [arguments]: Remove #:phases. [inputs]: Remove LIBATOMIC-OPS. (libgc-8.0): Remove variable. (libgc-7): New variable. --- gnu/packages/bdw-gc.scm | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 73b0c073d9..5023c3b6e8 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016, 2018 Leo Famulari ;;; Copyright © 2017 Rene Saavedra -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,14 +31,14 @@ (define-public libgc (package (name "libgc") - (version "7.6.12") + (version "8.0.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/ivmai/bdwgc/releases" "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 - "10jhhi79d5brwlsyhwgpnrmc8nhlf7aan2lk9xhgihk5jc6srbvc")))) + "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -54,21 +54,8 @@ ,@(if (hurd-triplet? (or (%current-system) (%current-target-system))) '("--disable-gcj-support") - '())) - #:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-pc-file - (lambda* (#:key inputs #:allow-other-keys) - (let ((libatomic-ops (assoc-ref inputs "libatomic-ops"))) - ;; GC 7.6.10 and later includes -latomic_ops in the - ;; pkg-config file. To avoid propagation, insert an - ;; absolute reference so dependent programs can find it. - (substitute* "bdw-gc.pc.in" - (("@ATOMIC_OPS_LIBS@" match) - (string-append "-L" libatomic-ops "/lib " - match))) - #t)))))) + '())))) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("libatomic-ops" ,libatomic-ops))) (outputs '("out" "debug")) (synopsis "The Boehm-Demers-Weiser conservative garbage collector for C and C++") @@ -91,17 +78,18 @@ C or C++ programs, though that is not its primary goal.") (license (x11-style (string-append home-page "license.txt"))))) -(define-public libgc-8.0 +(define-public libgc-7 (package (inherit libgc) - (version "8.0.4") + (version "7.6.12") (source (origin (method url-fetch) (uri (string-append "https://github.com/ivmai/bdwgc/releases" "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 - "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3")))))) + "10jhhi79d5brwlsyhwgpnrmc8nhlf7aan2lk9xhgihk5jc6srbvc")))) + (propagated-inputs `(("libatomic-ops" ,libatomic-ops))))) (define-public libgc/back-pointers (package/inherit -- cgit v1.2.3 From 18c3980fb13c87964a57b48b0ae4c4c3914ffafa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 00:08:10 +0100 Subject: gnu: mercurial: Fix test failures with Python 3.8.2. * gnu/packages/version-control.scm (mercurial-patch, %mercurial-patches): New variables. (mercurial)[source](patches): Add %MERCURIAL-PATCHES. --- gnu/packages/version-control.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b6ba524766..d626f173f9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1411,6 +1411,28 @@ also walk each side of a merge and test those changes individually.") control to Git repositories.") (license license:gpl2))) +(define (mercurial-patch name revision hash) + (origin + (method url-fetch) + (uri (string-append "https://www.mercurial-scm.org/repo/hg/raw-rev/" revision)) + (file-name (string-append "mercurial-" name ".patch")) + (sha256 (base32 hash)))) + +(define %mercurial-patches + (list + ;; These three patches fixes compatibility with the updated gzip module + ;; in Python 3.8.2: . + (mercurial-patch "python-mtime" "6c36a521572edf3a79ee567b118469b3192037cc" + "0bmm7y40r8s081ws2sjvn1v8kvyfan4a97jl0fhdh7yc2pzxlzqq") + (mercurial-patch "indent-gzip" "a23b859ad17dd0a5b9bb37846b69b5e30f99c44c" + "1spscv9dgqv38m7h1liki93ax6w97gxayg17fr7wr6acjdfccpr9") + (mercurial-patch "python-gzip" "b7ca03dff14c63d64ad7bfa36a2d0a36a6b62253" + "0p88ffhx0kk21ssrsb156ffhpcb7g8mkwwkmq49qpmbm5ag2paf0") + ;; This fixes an incompatibility with os.isfile in Python 3.8: + ;; . + (mercurial-patch "os-isfile" "6a8738dc4a019da4c9df5c26961aa09d45ce1c68" + "0lr069m12kzrkmr1pmhaxg5lxmdwxabsza61qp1i1q70g7sy8lvy"))) + (define-public mercurial (package (name "mercurial") @@ -1419,6 +1441,7 @@ control to Git repositories.") (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" "release/mercurial-" version ".tar.gz")) + (patches %mercurial-patches) (sha256 (base32 "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp")))) -- cgit v1.2.3 From a5cfb444d1c8f3ab88fb7f1f824d2d37f5099996 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 08:57:29 +0100 Subject: gnu: bdw-gc: Fix cross-compilation. * gnu/packages/bdw-gc.scm (libgc)[propagated-inputs]: When cross-compiling, add LIBATOMIC-OPS. --- gnu/packages/bdw-gc.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 5023c3b6e8..ca2da249fe 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -56,6 +56,12 @@ '("--disable-gcj-support") '())))) (native-inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + (if (%current-target-system) + ;; The build system refuses to check for compiler intrinsics when + ;; cross-compiling, and demands using libatomic-ops instead. + `(("libatomic-ops" ,libatomic-ops)) + '())) (outputs '("out" "debug")) (synopsis "The Boehm-Demers-Weiser conservative garbage collector for C and C++") -- cgit v1.2.3 From aebcbb27bc2f192cc06163251bab66a4ceb7b7d6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 08:59:35 +0100 Subject: gnu: guile-static: Provide a libgc variant with statically built libraries. * gnu/packages/bdw-gc.scm (libgc/static-libs): New public variable. * gnu/packages/make-bootstrap.scm (%guile-static)[propagated-inputs]: Change from LIBGC to LIBGC/STATIC-LIBS. --- gnu/packages/bdw-gc.scm | 9 +++++++++ gnu/packages/make-bootstrap.scm | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index ca2da249fe..112a161f94 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -24,6 +24,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages pkg-config) #:use-module (gnu packages hurd)) @@ -84,6 +85,14 @@ C or C++ programs, though that is not its primary goal.") (license (x11-style (string-append home-page "license.txt"))))) +;; TODO: Add a static output in libgc in the next rebuild cycle. +(define-public libgc/static-libs + (package/inherit + libgc + (arguments (substitute-keyword-arguments (package-arguments libgc) + ((#:configure-flags flags ''()) + `(cons "--enable-static" ,flags)))))) + (define-public libgc-7 (package (inherit libgc) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index b3610afc8e..7d80e4280b 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -699,7 +699,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ,@(package-inputs guile-2.2))) (propagated-inputs - `(("bdw-gc" ,libgc) + `(("bdw-gc" ,libgc/static-libs) ,@(alist-delete "bdw-gc" (package-propagated-inputs guile-2.0)))) (arguments -- cgit v1.2.3 From 313bf502b52cf16e8934493e41e547c7dbdd31e0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 20:55:03 +0100 Subject: gnu: gcc-static: Make sure #:modules is not overridden by the inherited GCC. This fixes a regression introduced by 56c833ea287f8f6d3c72f8bddc314960c0164d64 and 25bc0f34c6c059394f546f29a203c2cb9b7cdcf6 where #:modules became ineffective. * gnu/packages/make-bootstrap.scm (%gcc-static)[arguments]: Prepend the required modules to those inherited from GCC-5. While at it, do not splice in the inherited arguments. --- gnu/packages/make-bootstrap.scm | 96 ++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 7d80e4280b..5716ed3886 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -464,54 +464,54 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (name "gcc-static") (outputs '("out")) ; all in one (arguments - `(#:modules ((guix build utils) - (guix build gnu-build-system) - (srfi srfi-1) - (srfi srfi-26) - (ice-9 regex)) - ,@(substitute-keyword-arguments (package-arguments gcc-5) - ((#:guile _) #f) - ((#:implicit-inputs? _) #t) - ((#:configure-flags flags) - `(append (list - ;; We don't need a full bootstrap here. - "--disable-bootstrap" - - ;; Make sure '-static' is passed where it matters. - "--with-stage1-ldflags=-static" - - ;; GCC 4.8+ requires a C++ compiler and library. - "--enable-languages=c,c++" - - ;; Make sure gcc-nm doesn't require liblto_plugin.so. - "--disable-lto" - - "--disable-shared" - "--disable-plugin" - "--disable-libmudflap" - "--disable-libatomic" - "--disable-libsanitizer" - "--disable-libitm" - "--disable-libgomp" - "--disable-libcilkrts" - "--disable-libvtv" - "--disable-libssp" - "--disable-libquadmath") - (remove (cut string-match "--(.*plugin|enable-languages)" <>) - ,flags))) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'pre-configure 'remove-lgcc_s - (lambda _ - ;; Remove the '-lgcc_s' added to GNU_USER_TARGET_LIB_SPEC in - ;; the 'pre-configure phase of our main gcc package, because - ;; that shared library is not present in this static gcc. See - ;; . - (substitute* (cons "gcc/config/rs6000/sysv4.h" - (find-files "gcc/config" - "^gnu-user.*\\.h$")) - ((" -lgcc_s}}") "}}")) - #t))))))) + (substitute-keyword-arguments (package-arguments gcc-5) + ((#:modules modules %gnu-build-system-modules) + `((srfi srfi-1) + (srfi srfi-26) + (ice-9 regex) + ,@modules)) + ((#:guile _) #f) + ((#:implicit-inputs? _) #t) + ((#:configure-flags flags) + `(append (list + ;; We don't need a full bootstrap here. + "--disable-bootstrap" + + ;; Make sure '-static' is passed where it matters. + "--with-stage1-ldflags=-static" + + ;; GCC 4.8+ requires a C++ compiler and library. + "--enable-languages=c,c++" + + ;; Make sure gcc-nm doesn't require liblto_plugin.so. + "--disable-lto" + + "--disable-shared" + "--disable-plugin" + "--disable-libmudflap" + "--disable-libatomic" + "--disable-libsanitizer" + "--disable-libitm" + "--disable-libgomp" + "--disable-libcilkrts" + "--disable-libvtv" + "--disable-libssp" + "--disable-libquadmath") + (remove (cut string-match "--(.*plugin|enable-languages)" <>) + ,flags))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'pre-configure 'remove-lgcc_s + (lambda _ + ;; Remove the '-lgcc_s' added to GNU_USER_TARGET_LIB_SPEC in + ;; the 'pre-configure phase of our main gcc package, because + ;; that shared library is not present in this static gcc. See + ;; . + (substitute* (cons "gcc/config/rs6000/sysv4.h" + (find-files "gcc/config" + "^gnu-user.*\\.h$")) + ((" -lgcc_s}}") "}}")) + #t)))))) (inputs `(("zlib:static" ,zlib "static") ("isl:static" ,isl-0.18 "static") -- cgit v1.2.3 From 5fd0c288cf238e4369cc6bd0bfbee068a362a9f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 20:57:27 +0100 Subject: gnu: OpenJDK: Build with GNU Make 4.2. * gnu/packages/base.scm (gnu-make-4.2): New public variable. * gnu/packages/java.scm (openjdk9, openjdk10, openjdk11, openjdk12)[native-inputs]: Add it. --- gnu/packages/base.scm | 25 +++++++++++++++++++++++++ gnu/packages/java.scm | 6 ++++++ 2 files changed, 31 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index aa5200294f..da18a9d60b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -395,6 +395,31 @@ change. GNU make offers many powerful extensions over the standard utility.") (license gpl3+) (home-page "https://www.gnu.org/software/make/"))) +(define-public gnu-make-4.2 + (package + (inherit gnu-make) + (version "4.2.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/make/make-" version + ".tar.bz2")) + (sha256 + (base32 + "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn")))) + (arguments + `(#:configure-flags '("CFLAGS=-D__alloca=alloca") + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-default-shell + (lambda* (#:key inputs #:allow-other-keys) + ;; Change the default shell from /bin/sh. + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "job.c" + (("default_shell =.*$") + (format #f "default_shell = \"~a/bin/sh\";\n" + bash))) + #t)))))))) + (define-public binutils (package (name "binutils") diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index edf8d3ce8e..c68b0d3fd2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1880,6 +1880,9 @@ new Date();")) (native-inputs `(("icedtea-8" ,icedtea-8) ("icedtea-8:jdk" ,icedtea-8 "jdk") + ;; XXX: The build system is not particularly parallel safe and + ;; fails with newer versions of GNU Make. + ("make@4.2" ,gnu-make-4.2) ("unzip" ,unzip) ("which" ,which) ("zip" ,zip))) @@ -1936,6 +1939,7 @@ new Date();")) (native-inputs `(("openjdk9" ,openjdk9) ("openjdk9:jdk" ,openjdk9 "jdk") + ("make@4.2" ,gnu-make-4.2) ("unzip" ,unzip) ("which" ,which) ("zip" ,zip))))) @@ -2156,6 +2160,7 @@ new Date();")) `(("autoconf" ,autoconf) ("openjdk10" ,openjdk10) ("openjdk10:jdk" ,openjdk10 "jdk") + ("make" ,gnu-make-4.2) ("pkg-config" ,pkg-config) ("unzip" ,unzip) ("which" ,which) @@ -2204,6 +2209,7 @@ new Date();")) `(("autoconf" ,autoconf) ("openjdk11" ,openjdk11) ("openjdk11:jdk" ,openjdk11 "jdk") + ("make@4.2" ,gnu-make-4.2) ("pkg-config" ,pkg-config) ("unzip" ,unzip) ("which" ,which) -- cgit v1.2.3 From 3299d8ef7c7454a8568965da1b34f602a5221c65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 21:57:52 +0100 Subject: gnu: Export the deprecated 'libjpeg' variable. * gnu/packages/image.scm (libjpeg): Export. --- gnu/packages/image.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 1b8fd32c80..f0c66dd215 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1571,6 +1571,7 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") license:zlib)))) ;the libjpeg-turbo SIMD extensions (define-deprecated libjpeg libjpeg-turbo) +(export libjpeg) (define-public niftilib (package -- cgit v1.2.3 From e8bc2a01e9ae69c72367a3d59a6ee29145ca1052 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 22:06:35 +0100 Subject: gnu: Adjust 'package-for-guile-2.0' for the Guile 3 switch. * gnu/packages/guile.scm (package-for-guile-2.0): Rewrite GUILE-3.0 instead of GUILE-2.2. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 0efee2d86a..5e333c9586 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -371,8 +371,8 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its (define package-for-guile-2.0 ;; A procedure that rewrites the dependency tree of the given package to use - ;; GUILE-2.0 instead of GUILE-2.2. - (package-input-rewriting `((,guile-2.2 . ,guile-2.0)) + ;; GUILE-2.0 instead of GUILE-3.0. + (package-input-rewriting `((,guile-3.0 . ,guile-2.0)) (guile-variant-package-name "guile2.0"))) (define package-for-guile-2.2 -- cgit v1.2.3 From 58f705c18ebfafc4e291ba3be2ceeeead9e2a289 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 22:17:08 +0100 Subject: gnu: coreutils-mesboot: Make variable private. This fixes a test failure in tests/graph.scm because the package does not use glibc, yet is part of the public packages. * gnu/packages/commencement.scm (coreutils-mesboot): Use DEFINE instead of DEFINE-PUBLIC. --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 09758d1c3f..4c51fa0cf1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2466,7 +2466,7 @@ exec " gcc "/bin/" program ("gcc" ,gcc-mesboot) ,@(fold alist-delete (%boot-mesboot4-inputs) '("gcc" "gcc-wrapper")))) -(define-public coreutils-mesboot +(define coreutils-mesboot (package (inherit coreutils) (name "coreutils-mesboot") -- cgit v1.2.3 From 26e92a3025513ec8e2b243cf819a7526a5d8d7c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Mar 2020 11:35:04 +0200 Subject: gnu: qtbase: Patch the 'moc' executable to cope with GCCs C++ headers. * gnu/packages/patches/qtbase-moc-ignore-gcc-macro.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/qt.scm (qtbase)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/patches/qtbase-moc-ignore-gcc-macro.patch | 17 +++++++++++++++++ gnu/packages/qt.scm | 1 + 3 files changed, 19 insertions(+) create mode 100644 gnu/packages/patches/qtbase-moc-ignore-gcc-macro.patch diff --git a/gnu/local.mk b/gnu/local.mk index b0b72e6349..46e2936567 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1385,6 +1385,7 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-fix-documentation-build-failure.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ + %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtbase-QTBUG-81715.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/patches/qtbase-moc-ignore-gcc-macro.patch b/gnu/packages/patches/qtbase-moc-ignore-gcc-macro.patch new file mode 100644 index 0000000000..b296cf0b72 --- /dev/null +++ b/gnu/packages/patches/qtbase-moc-ignore-gcc-macro.patch @@ -0,0 +1,17 @@ +The moc executable loops through headers on CPLUS_INCLUDE_PATH and stumbles +on the GCC internal _GLIBCXX_VISIBILITY macro. Tell it to ignore it as it is +not supposed to be looking there to begin with. + +Upstream report: https://bugreports.qt.io/browse/QTBUG-83160 + +diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp +--- a/src/tools/moc/main.cpp ++++ b/src/tools/moc/main.cpp +@@ -188,6 +188,7 @@ int runMoc(int argc, char **argv) + dummyVariadicFunctionMacro.arguments += Symbol(0, PP_IDENTIFIER, "__VA_ARGS__"); + pp.macros["__attribute__"] = dummyVariadicFunctionMacro; + pp.macros["__declspec"] = dummyVariadicFunctionMacro; ++ pp.macros["_GLIBCXX_VISIBILITY"] = dummyVariadicFunctionMacro; + + QString filename; + QString output; diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 81989f68c3..368cfb7e15 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -352,6 +352,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch" + "qtbase-moc-ignore-gcc-macro.patch" "qtbase-QTBUG-81715.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From ba2f61bb0528d9529a675ae3815977df8aaaae28 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 12 Mar 2020 16:59:25 +0100 Subject: gnu: guile: Disable failing tests on the Hurd. * gnu/packages/guile.scm (guile-2.0)[arguments]: Remove failing/hanging tests on the Hurd. --- gnu/packages/guile.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 5e333c9586..d957b3ee7b 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -180,6 +180,20 @@ without requiring the source code to be rewritten.") `(#:configure-flags '("--disable-static") ; saves 3 MiB #:phases (modify-phases %standard-phases + ,@(if (hurd-system?) + '((add-after 'unpack 'disable-tests + (lambda _ + ;; Hangs at: "Running 00-repl-server.test" + (rename-file "test-suite/tests/00-repl-server.test" "00-repl-server.test") + ;; Sometimes Hangs at: "Running 00-socket.test" + (rename-file "test-suite/tests/00-socket.test" "00-socket.test") + ;; FAIL: srfi-18.test: thread-sleep!: thread sleeps fractions of a second + (rename-file "test-suite/tests/srfi-18.test" "srfi-18.test") + ;; failed to remove 't-guild-compile-7215.go.tdL7yC + (substitute* "test-suite/standalone/Makefile.in" + (("test-guild-compile ") "")) + #t))) + '()) (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) ;; Tell (ice-9 popen) the file name of Bash. -- cgit v1.2.3 From 2c7ea1892520396c5ced4904b943ae142948aec9 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 5 Mar 2020 14:25:08 -0500 Subject: gnu: coreutils: Handle failing tests on Hurd. * gnu/base/coreutils.scm (coreutils)[arguments]: Use make-flags to mark some tests XFAIL_TESTS on the Hurd. --- gnu/packages/base.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index da18a9d60b..43dc8c492e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -322,6 +322,20 @@ used to apply commands with arbitrarily long arguments.") (outputs '("out" "debug")) (arguments `(#:parallel-build? #f ; help2man may be called too early + ,@(if (hurd-target?) + '(#:make-flags ; these tests fail deterministically + (list (string-append "XFAIL_TESTS=tests/misc/env-S.pl" + " tests/misc/kill.sh" + " tests/misc/nice.sh" + " tests/split/fail.sh" + " test-fdutimensat" + " test-futimens" + " test-linkat" + " test-renameat" + " test-renameatu" + " test-tls" + " test-utimensat"))) + '()) #:phases (modify-phases %standard-phases (add-before 'build 'patch-shell-references (lambda _ -- cgit v1.2.3 From 9ec263b415f0fccce47fa3cc35a1651017a265ea Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 11:51:39 -0500 Subject: gnu: isc-dhcp: Support for the Hurd. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Remove net-tools, iproute on the Hurd. --- gnu/packages/admin.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d35c455275..ae1ed94b1b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -910,8 +910,9 @@ connection alive.") ("file" ,file))) (inputs `(("inetutils" ,inetutils) - ("net-tools" ,net-tools) - ("iproute" ,iproute) + ,@(if (hurd-target?) '() + `(("net-tools" ,net-tools) + ("iproute" ,iproute))) ;; isc-dhcp bundles a copy of BIND, which has proved vulnerable ;; in the past. Use a BIND-VERSION of our choosing instead. -- cgit v1.2.3 From a9bcc6474667d6699500f03d69f9c8212a50d711 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 17:53:32 -0500 Subject: gnu: gnutls: Remove net-tools for the Hurd. * gnu/packages/tls.scm (gnutls)[inputs]: Remove net-tools for the Hurd. --- gnu/packages/tls.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a057432f4b..eab832ce41 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +51,7 @@ #:use-module (gnu packages dns) #:use-module (gnu packages gawk) #:use-module (gnu packages guile) + #:use-module (gnu packages hurd) #:use-module (gnu packages libbsd) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) @@ -223,7 +225,8 @@ living in the same process.") "debug" "doc")) ;4.1 MiB of man pages (native-inputs - `(("net-tools" ,net-tools) + `(,@(if (hurd-target?) '() + `(("net-tools" ,net-tools))) ("pkg-config" ,pkg-config) ("which" ,which) ("datefudge" ,datefudge) ;tests rely on 'datefudge' -- cgit v1.2.3 From 111110038d3ff78a354f13130994081db82ee0d4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 03:36:51 -0500 Subject: gnu: nghttp2: Remove jemalloc dependency for the Hurd. * gnu/packages/web.scm (nghttp2)[inputs]: Remove jemalloc for the Hurd. --- gnu/packages/web.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3f59bbdb73..781f76a132 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Pierre Neidhardt +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -108,6 +109,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages hurd) #:use-module (gnu packages java) #:use-module (gnu packages jemalloc) #:use-module (gnu packages image) @@ -7024,7 +7026,8 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") ;; Required to build the tools (i.e. without ‘--enable-lib-only’). `(("c-ares" ,c-ares) ("jansson" ,jansson) ; for HPACK tools - ("jemalloc" ,jemalloc) ; fight nghttpd{,x} heap fragmentation + ,@(if (hurd-target?) '() + `(("jemalloc" ,jemalloc))) ; fight nghttpd{,x} heap fragmentation ("libev" ,libev) ("libxml2" ,libxml2) ; for ‘nghttp -a’ ("openssl" ,openssl))) -- cgit v1.2.3 From 0c962369e9a43dfca43f50a4f921bfcce1c7609a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 8 Mar 2020 21:17:03 +0100 Subject: gnu: Add grub-minimal. * gnu/packages/bootloaders.scm (grub-minimal): New variable. --- gnu/packages/bootloaders.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index afbd1909bf..e988a47f09 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 nee ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Björn Höfling +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -226,6 +227,33 @@ menu to select one of the installed operating systems.") (license license:gpl3+) (properties '((cpe-name . "grub2"))))) +(define-public grub-minimal + (package + (inherit grub) + (name "grub-minimal") + (inputs + (fold alist-delete (package-inputs grub) + '("lvm2" "mdadm" "fuse" "console-setup"))) + (native-inputs + (fold alist-delete (package-native-inputs grub) + '("help2man" "texinfo" "parted" "qemu" "xorriso"))) + (arguments + `(#:configure-flags (list "PYTHON=true") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-stuff + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "grub-core/Makefile.in" + (("/bin/sh") (which "sh"))) + + ;; Make the font visible. + (copy-file (assoc-ref (or native-inputs inputs) + "unifont") + "unifont.bdf.gz") + (system* "gunzip" "unifont.bdf.gz") + + #t))) + #:tests? #f)))) + (define-public grub-efi (package (inherit grub) -- cgit v1.2.3 From 6a790fe349fa4320337d1773bc7b064adbbac40e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 8 Mar 2020 21:17:27 +0100 Subject: gnu: bootloader: Add grub-minimal-bootloader. * gnu/bootloader/grub.scm (grub-minimal-bootloader): New variable. --- gnu/bootloader/grub.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 28e6cb1f5f..0b723e824f 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -54,6 +54,7 @@ grub-bootloader grub-efi-bootloader grub-mkrescue-bootloader + grub-minimal-bootloader grub-configuration)) @@ -453,6 +454,14 @@ fi~%")))) (configuration-file "/boot/grub/grub.cfg") (configuration-file-generator grub-configuration-file))) +(define grub-minimal-bootloader + (bootloader + (name 'grub) + (package grub-minimal) + (installer install-grub) + (configuration-file "/boot/grub/grub.cfg") + (configuration-file-generator grub-configuration-file))) + (define* grub-efi-bootloader (bootloader (inherit grub-bootloader) -- cgit v1.2.3 From ee401ed9249fbe284ef1b9b437d39207ca88131b Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 22 Mar 2020 16:32:33 +0000 Subject: gnu: mesa: Enable rockchip support on aarch64/armhf. * gnu/packages/gl (mesa): Enable kmsro, lima and panfrost gallium drivers. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 01241cd88e..710c602a96 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -293,7 +293,7 @@ also known as DXTn or DXTC) for Mesa.") '(,@(match (%current-system) ((or "armhf-linux" "aarch64-linux") ;; TODO: Fix svga driver for aarch64 and armhf. - '("-Dgallium-drivers=etnaviv,freedreno,nouveau,r300,r600,swrast,tegra,v3d,vc4,virgl")) + '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl")) (_ '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) ;; Enable various optional features. TODO: opencl requires libclc, -- cgit v1.2.3 From 1808e64de095c8b0960bc8ac8df0ef48a5f95109 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 30 Mar 2020 13:03:11 +0200 Subject: gnu: coreutils: Typo: Use libcap only when supported. * gnu/packages/base.scm (coreutils)[inputs]: Typo: Use libcap only when supported. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 43dc8c492e..80a158a685 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -307,8 +307,8 @@ used to apply commands with arbitrarily long arguments.") ;; Do not use libcap when cross-compiling since it's not quite ;; cross-compilable; and use it only for supported systems. ,@(if (and (not (%current-target-system)) - (not (member (%current-system) - (package-supported-systems libcap)))) + (member (%current-system) + (package-supported-systems libcap))) `(("libcap" ,libcap)) ;capability support in 'ls', etc. '()))) (native-inputs -- cgit v1.2.3 From 47cd0febe957b698cc2ae28978bdc3bc89e787f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Mar 2020 15:07:49 +0200 Subject: gnu: rust: Build with Make 4.2. Fixes . * gnu/packages/rust.scm (rust-1.20)[native-inputs]: Add GNU-MAKE-4.2. --- gnu/packages/rust.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 6774603db6..5e5748f199 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -469,6 +469,10 @@ safety and thread safety guarantees.") (delete-file-recursively "src/llvm") #t)) (patches '()))) + (native-inputs + `(;; The tests fail with newer versions of GNU Make. + ("make" ,gnu-make-4.2) + ,@(package-native-inputs base-rust))) (outputs '("out" "doc" "cargo")) ;; Since rust-1.19 is local, it's quite probable that Hydra ;; will build rust-1.19 only as a dependency of rust-1.20. -- cgit v1.2.3 From 95ac5cd66854566feeb87174edadf60fccd44c31 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 31 Mar 2020 15:15:19 +0200 Subject: gnu: OpenSSL: Update to 1.1.1f. * gnu/packages/patches/openssl-1.1.1e-revert-detect-eof.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/tls.scm (openssl): Update to 1.1.1f. [source](patches): Remove obsolete patch. --- gnu/local.mk | 1 - .../patches/openssl-1.1.1e-revert-detect-eof.patch | 80 ---------------------- gnu/packages/tls.scm | 7 +- 3 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 gnu/packages/patches/openssl-1.1.1e-revert-detect-eof.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9d62bec720..208e25572f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1271,7 +1271,6 @@ dist_patch_DATA = \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ - %D%/packages/patches/openssl-1.1.1e-revert-detect-eof.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/openssl-CVE-2019-1559.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ diff --git a/gnu/packages/patches/openssl-1.1.1e-revert-detect-eof.patch b/gnu/packages/patches/openssl-1.1.1e-revert-detect-eof.patch deleted file mode 100644 index 973559440f..0000000000 --- a/gnu/packages/patches/openssl-1.1.1e-revert-detect-eof.patch +++ /dev/null @@ -1,80 +0,0 @@ -This patch reverts a change in 1.1.1e that can break applications that do -not expect EOF to be reported via SSL_ERROR_SSL. - -https://bugs.python.org/issue40018 -https://github.com/openssl/openssl/pull/11400 -https://github.com/openssl/openssl/commit/0cd2ee64bffcdece599c3e4b5fac3830a55dc0fa - -Taken from upstream: -https://github.com/openssl/openssl/commit/30d190caf311d534867df97e26b552e628cb7d85 - -diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt -index f5324c6819d8..35512f9caf96 100644 ---- a/crypto/err/openssl.txt -+++ b/crypto/err/openssl.txt -@@ -2852,7 +2852,6 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines - SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES:243:unable to load ssl3 sha1 routines - SSL_R_UNEXPECTED_CCS_MESSAGE:262:unexpected ccs message - SSL_R_UNEXPECTED_END_OF_EARLY_DATA:178:unexpected end of early data --SSL_R_UNEXPECTED_EOF_WHILE_READING:294:unexpected eof while reading - SSL_R_UNEXPECTED_MESSAGE:244:unexpected message - SSL_R_UNEXPECTED_RECORD:245:unexpected record - SSL_R_UNINITIALIZED:276:uninitialized -diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h -index 0ef684f3c131..ba4c4ae5fbd3 100644 ---- a/include/openssl/sslerr.h -+++ b/include/openssl/sslerr.h -@@ -1,6 +1,6 @@ - /* - * Generated by util/mkerr.pl DO NOT EDIT -- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. -+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy -@@ -734,7 +734,6 @@ int ERR_load_SSL_strings(void); - # define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES 243 - # define SSL_R_UNEXPECTED_CCS_MESSAGE 262 - # define SSL_R_UNEXPECTED_END_OF_EARLY_DATA 178 --# define SSL_R_UNEXPECTED_EOF_WHILE_READING 294 - # define SSL_R_UNEXPECTED_MESSAGE 244 - # define SSL_R_UNEXPECTED_RECORD 245 - # define SSL_R_UNINITIALIZED 276 -diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c -index 1c885a664f35..b2a7a47eb075 100644 ---- a/ssl/record/rec_layer_s3.c -+++ b/ssl/record/rec_layer_s3.c -@@ -296,12 +296,6 @@ int ssl3_read_n(SSL *s, size_t n, size_t max, int extend, int clearold, - ret = BIO_read(s->rbio, pkt + len + left, max - left); - if (ret >= 0) - bioread = ret; -- if (ret <= 0 -- && !BIO_should_retry(s->rbio) -- && BIO_eof(s->rbio)) { -- SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_SSL3_READ_N, -- SSL_R_UNEXPECTED_EOF_WHILE_READING); -- } - } else { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_READ_N, - SSL_R_READ_BIO_NOT_SET); -diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c -index a0c7b79659d4..4b12ed1485d9 100644 ---- a/ssl/ssl_err.c -+++ b/ssl/ssl_err.c -@@ -1,6 +1,6 @@ - /* - * Generated by util/mkerr.pl DO NOT EDIT -- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. -+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy -@@ -1205,8 +1205,6 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { - "unexpected ccs message"}, - {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_END_OF_EARLY_DATA), - "unexpected end of early data"}, -- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_EOF_WHILE_READING), -- "unexpected eof while reading"}, - {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_MESSAGE), "unexpected message"}, - {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_RECORD), "unexpected record"}, - {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNINITIALIZED), "uninitialized"}, diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index eab832ce41..812057c6ed 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -283,7 +283,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.1.1e") + (version "1.1.1f") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -295,9 +295,8 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "1gnwlri1dphr5wdzmg9vlhkh6aq2yqgpfkpmffzwjlfb26n62kv9")) - (patches (search-patches "openssl-1.1-c-rehash-in.patch" - "openssl-1.1.1e-revert-detect-eof.patch")))) + "0d9zv9srjqivs8nn099fpbjv1wyhfcb8lzy491dpmfngdvz6nv0q")) + (patches (search-patches "openssl-1.1-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" "doc" ;6.8 MiB of man3 pages and full HTML documentation -- cgit v1.2.3 From 3e902bbb56e34669bc3de8a3768104aa118a0881 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 31 Mar 2020 18:16:05 +0200 Subject: gnu: util-linux: Skip setarch tests when building on armhf-linux. * gnu/packages/linux.scm (util-linux)[arguments]: When building on armhf-linux, disable the setarch tests. --- gnu/packages/linux.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b56803066b..faedce7250 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1216,6 +1216,21 @@ providing the system administrator with some help in common tasks.") (substitute* "tests/ts/column/invalid-multibyte" (("C\\.UTF-8") "en_US.utf8")) #t))) + ;; TODO: Remove the conditional on the next rebuild cycle. + ,@(if (string-prefix? "arm" (%current-system)) + '((add-before 'check 'disable-setarch-test + (lambda _ + ;; The setarch tests are unreliable in QEMU's + ;; user-mode emulation, which is our primary + ;; method of building ARMv7 packages. + ;; + (substitute* "tests/ts/misc/setarch" + (("ts_init_subtest.*" all) + (string-append + all "\n" + "ts_skip \"setarch tests are unreliable under QEMU\""))) + #t))) + '()) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) (let ((lib (assoc-ref outputs "lib")) -- cgit v1.2.3 From 67ca82e6ddc9f1c87fa8c033729a1f53b7c2b3ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Apr 2020 12:58:32 +0200 Subject: gnu: Python: Fix test failure on ARMv7. * gnu/packages/patches/python-3-arm-alignment.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python.scm (python-3.8)[source](patches): Add it when the current system is ARM. --- gnu/local.mk | 1 + gnu/packages/patches/python-3-arm-alignment.patch | 21 ++++++++++++++++++ gnu/packages/python.scm | 27 +++++++++++++++++------ 3 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/python-3-arm-alignment.patch diff --git a/gnu/local.mk b/gnu/local.mk index 208e25572f..1599b0933a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1344,6 +1344,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-2.7-search-paths.patch \ %D%/packages/patches/python-2.7-site-prefixes.patch \ %D%/packages/patches/python-2.7-source-date-epoch.patch \ + %D%/packages/patches/python-3-arm-alignment.patch \ %D%/packages/patches/python-3-deterministic-build-info.patch \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ diff --git a/gnu/packages/patches/python-3-arm-alignment.patch b/gnu/packages/patches/python-3-arm-alignment.patch new file mode 100644 index 0000000000..065c1a7bb2 --- /dev/null +++ b/gnu/packages/patches/python-3-arm-alignment.patch @@ -0,0 +1,21 @@ +Ensure memory accesses in the sha3 module are aligned on ARM as it causes +problems when running 32-bit code on a 64-bit kernel. + +Patch taken from upstream bug report: +https://bugs.python.org/issue36515 + +--- a/Modules/_sha3/sha3module.c ++++ b/Modules/_sha3/sha3module.c +@@ -64,6 +64,12 @@ + #define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN + #endif + ++/* Bus error on 32-bit ARM due to un-aligned memory accesses; 64-bit ARM ++ * doesn't complain but un-aligned memory accesses are sub-optimal */ ++#if defined(__arm__) || defined(__aarch64__) ++#define NO_MISALIGNED_ACCESSES ++#endif ++ + /* mangle names */ + #define KeccakF1600_FastLoop_Absorb _PySHA3_KeccakF1600_FastLoop_Absorb + #define Keccak_HashFinal _PySHA3_Keccak_HashFinal diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8e28265fbe..e9a20dc418 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong @@ -92,7 +92,9 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial)) + #:use-module (guix build-system trivial) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) (define-public python-2.7 (package @@ -352,11 +354,22 @@ data types.") (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) - (patches (search-patches - "python-3-fix-tests.patch" - "python-3.8-fix-tests.patch" - "python-3-deterministic-build-info.patch" - "python-3-search-paths.patch")) + (patches (append + ;; Disable unaligned accesses in the sha3 module on ARM as + ;; it causes a test failure when building 32-bit Python on a + ;; 64-bit kernel. See . + ;; TODO: Remove the conditional on the next rebuild cycle. + (let ((system (or (%current-target-system) + (%current-system)))) + (if (any (cute string-prefix? <> system) + '("arm" "aarch64")) + (list (search-patch "python-3-arm-alignment.patch")) + '())) + (search-patches + "python-3-fix-tests.patch" + "python-3.8-fix-tests.patch" + "python-3-deterministic-build-info.patch" + "python-3-search-paths.patch"))) (sha256 (base32 "1ps5v323cp5czfshqjmbsqw7nvrdpcbk06f62jbzaqik4gfffii6")) -- cgit v1.2.3 From 3cff86db8a510bc2731b9899a6035ebda5225adc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Apr 2020 17:11:17 +0200 Subject: gnu: Python: Move arm-alignment.patch to a native-input + phase. This follows up 67ca82e6ddc9f1c87fa8c033729a1f53b7c2b3ba which was ineffective when running 'guix build --system=armhf-linux python' on e.g. x86_64-linux because the conditional would always return the native system. * gnu/packages/python.scm (python-3.8)[native-inputs]: Add "arm-alignment.patch". [arguments]: Add phase to apply it. [source](patches): Remove it. * gnu/packages/commencement.scm (python-boot0): Prevent inheriting the phase. --- gnu/packages/commencement.scm | 12 ++++++++++- gnu/packages/python.scm | 48 ++++++++++++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4c51fa0cf1..7e969faafe 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3182,7 +3182,17 @@ the bootstrap environment." ;; Python package won't interfere with this one. ((#:make-flags _ ''()) ''()) ((#:phases phases) - `(modify-phases ,phases + ;; Remove the 'apply-alignment-patch' phase if present to avoid + ;; rebuilding this package. TODO: for the next rebuild cycle, + ;; consider inlining all the arguments instead of inheriting to + ;; make it easier to patch Python without risking a full rebuild. + ;; Or better yet, change to 'python-on-guile'. + `(modify-phases ,@(list (match phases + (('modify-phases original-phases + changes ... + ('add-after unpack apply-alignment-patch _)) + `(modify-phases ,original-phases ,@changes)) + (_ phases))) (add-before 'configure 'disable-modules (lambda _ (substitute* "setup.py" diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e9a20dc418..f0a6193a92 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -354,22 +354,11 @@ data types.") (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) - (patches (append - ;; Disable unaligned accesses in the sha3 module on ARM as - ;; it causes a test failure when building 32-bit Python on a - ;; 64-bit kernel. See . - ;; TODO: Remove the conditional on the next rebuild cycle. - (let ((system (or (%current-target-system) - (%current-system)))) - (if (any (cute string-prefix? <> system) - '("arm" "aarch64")) - (list (search-patch "python-3-arm-alignment.patch")) - '())) - (search-patches - "python-3-fix-tests.patch" - "python-3.8-fix-tests.patch" - "python-3-deterministic-build-info.patch" - "python-3-search-paths.patch"))) + (patches (search-patches + "python-3-fix-tests.patch" + "python-3.8-fix-tests.patch" + "python-3-deterministic-build-info.patch" + "python-3-search-paths.patch")) (sha256 (base32 "1ps5v323cp5czfshqjmbsqw7nvrdpcbk06f62jbzaqik4gfffii6")) @@ -394,6 +383,7 @@ data types.") " test_socket"))) ((#:phases phases) `(modify-phases ,phases + (add-before 'check 'set-TZDIR (lambda* (#:key inputs native-inputs #:allow-other-keys) ;; test_email requires the Olson time zone database. @@ -432,9 +422,33 @@ data types.") ,file))) (find-files out "\\.py$"))) (list '() '("-O") '("-OO"))) - #t))))))) + #t))) + ;; XXX: Apply patch on ARM platforms only to avoid a full rebuild. + ;; Remove this phase in the next rebuild cycle. + ,@(let ((system (or (%current-target-system) + (%current-system)))) + (if (any (cute string-prefix? <> system) + '("arm" "aarch64")) + '((add-after 'unpack 'apply-alignment-patch + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (invoke "patch" "-p1" "--force" "--input" + (assoc-ref (or native-inputs inputs) + "arm-alignment.patch"))))) + '())))))) (native-inputs `(("tzdata" ,tzdata-for-tests) + + ;; Disable unaligned accesses in the sha3 module on ARM as + ;; it causes a test failure when building 32-bit Python on a + ;; 64-bit kernel. See . + ;; TODO: make this a regular patch in the next rebuild cycle. + ,@(let ((system (or (%current-target-system) + (%current-system)))) + (if (any (cute string-prefix? <> system) + '("arm" "aarch64")) + `(("arm-alignment.patch" ,(search-patch "python-3-arm-alignment.patch"))) + '())) + ,@(if (%current-target-system) `(("python3" ,this-package)) '()) -- cgit v1.2.3 From c745b6f62c9c70f0ac286c1540cbee240ebac59f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 15:53:10 +0200 Subject: gnu: GSL: Disable failing tests on i686-linux and aarch64-linux. This follows up commit 7ad3c81240b366b99f29c4ac5f7c42173c91f38a, which enabled tests that were previously disabled on i686, and takes into account new tests with similar issues. While at it, selectively disable tests on aarch64 instead of disabling all tests. * gnu/packages/maths.scm (gsl)[arguments]: On i686 and aarch64, add #:phases. --- gnu/packages/maths.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4ff2189fb9..05cea4713c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Nadya Voronova ;;; Copyright © 2018 Adam Massmann -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2018 Eric Brown ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018 Amin Bandali @@ -388,12 +388,35 @@ semiconductors.") "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp")))) (build-system gnu-build-system) (arguments - `(;; Currently there are numerous tests that fail on "exotic" - ;; architectures such as aarch64 and ppc64le. - ,@(if (string-prefix? "aarch64-linux" - (or (%current-target-system) (%current-system))) - '(#:tests? #f) - '()))) + (let ((system (%current-system))) + (cond + ((string-prefix? "aarch64" system) + ;; Some sparse matrix tests are failing on AArch64: + ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00001.html + '(#:phases (modify-phases %standard-phases + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "spmatrix/test.c" + ((".*test_complex.*") "\n")) + #t))))) + ((string-prefix? "i686" (%current-system)) + ;; There are rounding issues with these tests on i686: + ;; https://lists.gnu.org/archive/html/bug-gsl/2016-10/msg00000.html + ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00000.html + '(#:phases (modify-phases %standard-phases + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "linalg/test.c" + ((".*gsl_test\\(test_LU_decomp.*") "\n") + ((".*gsl_test\\(test_LUc_decomp.*") "\n") + ((".*gsl_test\\(test_cholesky_decomp.*") "\n") + ((".*gsl_test\\(test_COD_lssolve2.*") "\n")) + (substitute* "spmatrix/test.c" + ((".*test_all.*") "\n") + ((".*test_float.*") "\n") + ((".*test_complex.*") "\n")) + #t))))) + (else '())))) (home-page "https://www.gnu.org/software/gsl/") (synopsis "Numerical library for C and C++") (description -- cgit v1.2.3 From 976ae7eab6d14a8a82bf185e39f58abac0c4b915 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 15:58:22 +0200 Subject: gnu: libreoffice: Fix build with Poppler 0.86. * gnu/packages/patches/libreoffice-poppler-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/libreoffice.scm (libreoffice)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/libreoffice.scm | 1 + gnu/packages/patches/libreoffice-poppler-compat.patch | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/libreoffice-poppler-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1599b0933a..f5ca0e3d8d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1143,6 +1143,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ + %D%/packages/patches/libreoffice-poppler-compat.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 225bf78706..a3a6ea5d1a 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1006,6 +1006,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (string-append "https://download.documentfoundation.org/libreoffice/src/" (version-prefix version 3) "/libreoffice-" version ".tar.xz")) + (patches (search-patches "libreoffice-poppler-compat.patch")) (sha256 (base32 "06acm41q9nda8r30b13cn9zafsw1gszjdphh6lx90s09d2sf7f23")))) diff --git a/gnu/packages/patches/libreoffice-poppler-compat.patch b/gnu/packages/patches/libreoffice-poppler-compat.patch new file mode 100644 index 0000000000..8dc0b60a12 --- /dev/null +++ b/gnu/packages/patches/libreoffice-poppler-compat.patch @@ -0,0 +1,19 @@ +Fix type mismatch with Poppler 0.86. + +Taken from Arch Linux: +https://git.archlinux.org/svntogit/packages.git/tree/trunk/libreoffice-poppler-0.86.patch?h=packages/libreoffice-fresh + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*) + if (!(pAction && pAction->getKind() == actionURI)) + return; + +-#if POPPLER_CHECK_VERSION(0, 72, 0) ++#if POPPLER_CHECK_VERSION(0, 86, 0) ++ const char* pURI = static_cast(pAction)->getURI().c_str(); ++#elif POPPLER_CHECK_VERSION(0, 72, 0) + const char* pURI = static_cast(pAction)->getURI()->c_str(); + #else + const char* pURI = static_cast(pAction)->getURI()->getCString(); -- cgit v1.2.3 From d05e3b08ea0ca6dde6b2a27de5c1bba9cd60e132 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 16:00:43 +0200 Subject: gnu: python-apsw: Update to 3.31.1-r1. * gnu/packages/databases.scm (python-apsw): Update to 3.31.1-r1. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2a026b1589..4ed181021f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2674,7 +2674,7 @@ PickleShare.") (define-public python-apsw (package (name "python-apsw") - (version "3.28.0-r1") + (version "3.31.1-r1") (source (origin (method url-fetch) @@ -2682,7 +2682,7 @@ PickleShare.") "/download/" version "/apsw-" version ".zip")) (sha256 (base32 - "0x62534l5hcgwrc4k2gxpdzc1sxlhm6m4nwlay74rnmr77qh8wly")))) + "1gap5lr6c7bp134nzvfwr693i6d0fqyaysg3ms2cayjldv616yfx")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit v1.2.3 From 8ecdef3cbbf10ce93634eed3f759891afa7e7b6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 16:04:40 +0200 Subject: gnu: IceCat: Remove obsolete phase. * gnu/packages/gnuzilla.scm (icecat)[arguments]: Remove phase 'augment-CPLUS_INCLUDE_PATH'. --- gnu/packages/gnuzilla.scm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 23f15906c5..2db4697a6d 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1016,20 +1016,6 @@ from forcing GEXP-PROMISE." (string-append name "\"" null-hash "\""))) (generate-all-checksums "third_party/rust")) #t)) - (add-before 'configure 'augment-CPLUS_INCLUDE_PATH - (lambda* (#:key build inputs #:allow-other-keys) - ;; Here, we add additional entries to CPLUS_INCLUDE_PATH, to work - ;; around a problem that otherwise occurs when attempting to - ;; build Stylo, which requires Rust and Clang. Without these - ;; additional entries, errors occur during the build indicating - ;; that the and "c++config.h" headers cannot be found. - ;; Note that the 'build' keyword argument contains the GNU - ;; triplet, e.g. "x86_64-unknown-linux-gnu". - (let ((gcc (assoc-ref inputs "gcc"))) - (setenv "CPLUS_INCLUDE_PATH" - (string-append gcc "/include/c++" ":" - gcc "/include/c++/" build))) - #t)) (replace 'configure ;; configure does not work followed by both "SHELL=..." and ;; "CONFIG_SHELL=..."; set environment variables instead -- cgit v1.2.3 From d27748674a49bc2251fce1d027378dc0ce24dc5c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 17:39:22 +0200 Subject: gnu: hcxtools: Fix build failure. * gnu/packages/networking.scm (hcxtools)[arguments]: Do not override C_INCLUDE_PATH. --- gnu/packages/networking.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c492a7f2ad..13ece07740 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2442,15 +2442,7 @@ Ethernet and TAP interfaces is supported. Packet capture is also supported.") #:tests? #f ; no test suite #:phases (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "C_INCLUDE_PATH" - (string-append (assoc-ref inputs "curl") "/include:" - (assoc-ref inputs "libpcap") "/include:" - (assoc-ref inputs "openssl") "/include:" - (assoc-ref inputs "zlib") "/include")) - #t))))) + (delete 'configure)))) (home-page "https://github.com/ZerBea/hcxtools") (synopsis "Capture wlan traffic to hashcat and John the Ripper") (description -- cgit v1.2.3 From 68858013ad34e96aead4c22c241c0b1308e5e6a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 17:40:48 +0200 Subject: gnu: zyre: Remove obsolete workaround. * gnu/packages/networking.scm (zyre)[arguments]: Remove. --- gnu/packages/networking.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 13ece07740..7561103888 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2172,12 +2172,6 @@ remotely.") (base32 "0qz2730bng1gs9xbqxhkw88qbsmszgmmrl2g9k6xrg6r3bqvsdc7")))) (build-system gnu-build-system) - (arguments - `(;; Ensure the kernel headers are treated as system headers to suppress - ;; harmless -Werror=pedantic warnings. - #:make-flags (list (string-append "C_INCLUDE_PATH=" - (assoc-ref %build-inputs "kernel-headers") - "/include")))) (inputs `(("zeromq" ,zeromq) ("czmq" ,czmq) ("libsodium" ,libsodium))) -- cgit v1.2.3 From cf6f475b747e7fb4ad40d1f1a6bff554744e06d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 17:42:07 +0200 Subject: gnu: multipath-tools: Remove obsolete workaround. * gnu/packages/linux.scm (multipath-tools)[arguments]: Do not override C_INCLUDE_PATH in #:configure-flags. --- gnu/packages/linux.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index faedce7250..6c7eb5be12 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4017,12 +4017,6 @@ arrays when needed.") (string-append "DESTDIR=" (assoc-ref %outputs "out")) "SYSTEMDPATH=lib" - ;; Add the libaio headers to GCCs system header - ;; search path to suppress -Werror=cast-qual on - ;; the included headers. - (string-append "C_INCLUDE_PATH=" - (assoc-ref %build-inputs "libaio") - "/include") (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.2.3 From 57f24c200fbb1abbf2186bbe439a92200378d8ff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 17:42:56 +0200 Subject: gnu: lxc: Remove obsolete workaround. * gnu/packages/virtualization.scm (lxc)[arguments]: Remove #:make-flags. --- gnu/packages/virtualization.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index fbafed9ed4..9f80e333be 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -399,12 +399,6 @@ all common programming languages. Vala bindings are also provided.") "/share/doc/" ,name "-" ,version) "--sysconfdir=/etc" "--localstatedir=/var") - #:make-flags - ;; Treat the kernel headers as system headers to silence - ;; compiler warnings from those. - (list (string-append "C_INCLUDE_PATH=" - (assoc-ref %build-inputs "kernel-headers") - "/include")) #:phases (modify-phases %standard-phases (replace 'install -- cgit v1.2.3 From ba66eec741a9fbddd74eb7fc54d2c53888ace5b7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 18:04:38 +0200 Subject: gnu: synergy: Fix build failure. * gnu/packages/synergy.scm (synergy)[arguments]: Prepend to CPLUS_INCLUDE_PATH instead of overriding it. --- gnu/packages/synergy.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index 367bb323b3..739ea3bd75 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -63,7 +63,8 @@ (lambda* (#:key inputs #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "avahi") - "/include/avahi-compat-libdns_sd")) + "/include/avahi-compat-libdns_sd:" + (or (getenv "CPLUS_INCLUDE_PATH") ""))) #t))))) (inputs `(("avahi" ,avahi) -- cgit v1.2.3 From 18caa6f528b09d63ac26ba53f78e4c35fed5b317 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 18:18:54 +0200 Subject: gnu: hyperrogue: Fix build failure. * gnu/packages/games.scm (hyperrogue)[arguments]: Do not assume CPATH is set. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7555a0d800..f0f1886952 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4226,7 +4226,7 @@ throwing people around in pseudo-randomly generated buildings.") (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (getenv "CPATH") ":" + (string-append (or (getenv "CPATH") "") ":" (assoc-ref inputs "sdl-union") "/include/SDL")))) (replace 'configure -- cgit v1.2.3 From f27b1cf091e31840af9a8251d5035fcb4b26a528 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 18:26:47 +0200 Subject: gnu: ToME4: Fix build failure. * gnu/packages/games.scm (tome4)[arguments]: Do not assume CPATH is set. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f0f1886952..06d1b3c11c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5413,7 +5413,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") "/include/SDL2:" - (getenv "CPATH"))) + (or (getenv "CPATH") ""))) #t)) (delete 'check) ;; premake doesn't provide install target -- cgit v1.2.3 From 0ad05c15e3c198e96f2ded17d22897fb0891f67d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 18:32:56 +0200 Subject: gnu: GSL: Remove unnecessary (%current-system) call. * gnu/packages/maths.scm (gsl)[arguments]: Use the let-bound SYSTEM variable instead of %CURRENT-SYSTEM. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 05cea4713c..6d7625cfc1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -399,7 +399,7 @@ semiconductors.") (substitute* "spmatrix/test.c" ((".*test_complex.*") "\n")) #t))))) - ((string-prefix? "i686" (%current-system)) + ((string-prefix? "i686" system) ;; There are rounding issues with these tests on i686: ;; https://lists.gnu.org/archive/html/bug-gsl/2016-10/msg00000.html ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00000.html -- cgit v1.2.3 From 76f5cef359d52f1efdf067081af2911249248800 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 19:07:22 +0200 Subject: gnu: libfive: Fix build failure. * gnu/packages/engineering.scm (libfive)[arguments]: Prepend to CPLUS_INCLUDE_PATH instead of overriding it. --- gnu/packages/engineering.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 55af90bc82..5854249bb1 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -769,7 +769,8 @@ fonts to gEDA.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "catch") - "/include/catch")) + "/include/catch:" + (or (getenv "CPLUS_INCLUDE_PATH") ""))) #t))))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From f12f7a046461e9b3e228e1db6f568b7d5ceebceb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Apr 2020 19:11:05 +0200 Subject: gnu: sailfish: Fix build failure. * gnu/packages/bioinformatics.scm (sailfish)[arguments]: Prepend to CPLUS_INCLUDE_PATH instead of overriding it. --- gnu/packages/bioinformatics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 40dd51a3df..11d123b605 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11882,7 +11882,8 @@ dependency like SeqAn.") ;; Ensure that Eigen headers can be found (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "eigen") - "/include/eigen3")) + "/include/eigen3:" + (or (getenv "CPLUS_INCLUDE_PATH") ""))) #t))))) (inputs `(("boost" ,boost) -- cgit v1.2.3 From 41cb710f4a400e67914a2b51bd204184f2889308 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 5 Apr 2020 16:33:19 +0200 Subject: gnu: criu: Remove obsolete workaround. * gnu/packages/virtualization.scm (criu)[arguments]: In the configure phase, do not add kernel headers on C_INLUDE_PATH. --- gnu/packages/virtualization.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9f80e333be..4368949743 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -730,13 +730,7 @@ domains, their live performance and resource utilization statistics.") (setenv "C_INCLUDE_PATH" (string-append (assoc-ref inputs "libnl") "/include/libnl3:" - ;; Also add the kernel headers here so that GCC - ;; treats them as "system headers". Otherwise - ;; the build fails with -Werror because parasite.c - ;; includes both and , - ;; which define some of the same constants. - (assoc-ref inputs "kernel-headers") - "/include")) + (or (getenv "C_INCLUDE_PATH") ""))) #t)) (add-after 'configure 'fix-documentation (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From a533c5a1835cbeafaf595c4474e2ce6adde7de8d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 5 Apr 2020 22:45:15 +0200 Subject: gnu: octave-cli: Fix build. * gnu/packages/maths.scm (octave-cli)[inputs]: Add LIBJPEG-TURBO. [arguments]: Add "--enable-link-all-dependencies" in #:configure-flags. --- gnu/packages/maths.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6d7625cfc1..07a19d4927 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1586,6 +1586,12 @@ can solve two kinds of problems: ("glpk" ,glpk) ("glu" ,glu) ("graphicsmagick" ,graphicsmagick) + + ;; TODO: libjpeg-turbo is indirectly required through libtiff. In + ;; the next rebuild cycle, add an absolute reference for -ljpeg in + ;; libtiff.la instead of having to provide it here. + ("libjpeg" ,libjpeg-turbo) + ("hdf5" ,hdf5) ("lapack" ,lapack) ("libsndfile" ,libsndfile) @@ -1624,7 +1630,12 @@ can solve two kinds of problems: `(#:configure-flags (list (string-append "--with-shell=" (assoc-ref %build-inputs "bash") - "/bin/sh")) + "/bin/sh") + + ;; XXX: Without this flag, linking octave-cli fails with + ;; undefined references to 'logf@GLIBCXX_3.4' et.al. due to + ;; not pulling in liboctinterp.la for -lstdc++. + "--enable-link-all-dependencies") #:phases (modify-phases %standard-phases (add-after 'configure 'configure-makeinfo -- cgit v1.2.3 From be1e842ad78ac6c52fc7790f4a3ffd716673c111 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 4 Apr 2020 22:50:55 +0200 Subject: gnu: cross-base: Remove unneeded 'let'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a followup to 102d307520dee27a40feb1ca5a699763a2f3aefe. * gnu/packages/cross-base.scm (cross-libc): Remove (let ((libc libc)) …). (cherry picked from commit 524a4e357cd71566841aaf405e8548fa3600b11b) --- gnu/packages/cross-base.scm | 126 ++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 538f406043..6c971d0eb1 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -479,69 +479,69 @@ and the cross tool chain." (native-libc target libc #:xgcc xgcc #:xbinutils xbinutils) - (let ((libc libc)) - (package (inherit libc) - (name (string-append "glibc-cross-" target)) - (arguments - (substitute-keyword-arguments - `(;; Disable stripping (see above.) - #:strip-binaries? #f - - ;; This package is used as a target input, but it should not have - ;; the usual cross-compilation inputs since that would include - ;; itself. - #:implicit-cross-inputs? #f - - ;; We need SRFI 26. - #:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-26)) - - ,@(package-arguments libc)) - ((#:configure-flags flags) - `(cons ,(string-append "--host=" target) - ,(if (hurd-triplet? target) - `(cons "--disable-werror" ,flags) - flags))) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'set-cross-kernel-headers-path - (lambda* (#:key inputs #:allow-other-keys) - (let* ((kernel (assoc-ref inputs "kernel-headers")) - (cpath (string-append kernel "/include"))) - (for-each (cut setenv <> cpath) - ',%gcc-cross-include-paths) - (setenv "CROSS_LIBRARY_PATH" - (string-append kernel "/lib")) ; for Hurd's libihash - #t))) - ,@(if (hurd-triplet? target) - '((add-after 'install 'augment-libc.so - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libc.so") - (("/[^ ]+/lib/libc.so.0.3") - (string-append out "/lib/libc.so.0.3" - " libmachuser.so libhurduser.so")))) - #t))) - '()))))) - - ;; Shadow the native "kernel-headers" because glibc's recipe expects the - ;; "kernel-headers" input to point to the right thing. - (propagated-inputs `(("kernel-headers" ,xheaders))) - - ;; FIXME: 'static-bash' should really be an input, not a native input, but - ;; to do that will require building an intermediate cross libc. - (inputs '()) - - (native-inputs `(("cross-gcc" ,xgcc) - ("cross-binutils" ,xbinutils) - ,@(if (hurd-triplet? target) - `(("cross-mig" - ,@(assoc-ref (package-native-inputs xheaders) - "cross-mig"))) - '()) - ,@(package-inputs libc) ;FIXME: static-bash - ,@(package-native-inputs libc))))))) + (package + (inherit libc) + (name (string-append "glibc-cross-" target)) + (arguments + (substitute-keyword-arguments + `( ;; Disable stripping (see above.) + #:strip-binaries? #f + + ;; This package is used as a target input, but it should not have + ;; the usual cross-compilation inputs since that would include + ;; itself. + #:implicit-cross-inputs? #f + + ;; We need SRFI 26. + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26)) + + ,@(package-arguments libc)) + ((#:configure-flags flags) + `(cons ,(string-append "--host=" target) + ,(if (hurd-triplet? target) + `(cons "--disable-werror" ,flags) + flags))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'set-cross-kernel-headers-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((kernel (assoc-ref inputs "kernel-headers")) + (cpath (string-append kernel "/include"))) + (for-each (cut setenv <> cpath) + ',%gcc-cross-include-paths) + (setenv "CROSS_LIBRARY_PATH" + (string-append kernel "/lib")) ; for Hurd's libihash + #t))) + ,@(if (hurd-triplet? target) + '((add-after 'install 'augment-libc.so + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/lib/libc.so") + (("/[^ ]+/lib/libc.so.0.3") + (string-append out "/lib/libc.so.0.3" + " libmachuser.so libhurduser.so")))) + #t))) + '()))))) + + ;; Shadow the native "kernel-headers" because glibc's recipe expects the + ;; "kernel-headers" input to point to the right thing. + (propagated-inputs `(("kernel-headers" ,xheaders))) + + ;; FIXME: 'static-bash' should really be an input, not a native input, but + ;; to do that will require building an intermediate cross libc. + (inputs '()) + + (native-inputs `(("cross-gcc" ,xgcc) + ("cross-binutils" ,xbinutils) + ,@(if (hurd-triplet? target) + `(("cross-mig" + ,@(assoc-ref (package-native-inputs xheaders) + "cross-mig"))) + '()) + ,@(package-inputs libc) ;FIXME: static-bash + ,@(package-native-inputs libc)))))) (define* (native-libc target #:optional -- cgit v1.2.3 From b1f56712c00a39c36ddd87fa42e3a19a28a75ffd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Apr 2020 13:05:34 +0200 Subject: maint: Adjust release manifest for Guile 3.0 switch. * etc/release-manifest.scm (%packages-to-cross-build): Refer to GUILE-3.0/FIXED instead of GUILE-2.2/FIXED. --- etc/release-manifest.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index 91471bd03b..0c864041bc 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -64,7 +64,7 @@ TARGET." ;; Packages that must be cross-buildable from x86_64-linux. ;; FIXME: Add (@ (gnu packages gcc) gcc) when ;; is fixed. - (append (list (@ (gnu packages guile) guile-2.2/fixed)) + (append (list (@ (gnu packages guile) guile-3.0/fixed)) (map specification->package '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" "gawk" "gettext" "gzip" "xz" -- cgit v1.2.3 From bcdd279a5fe561c0908f46d3ef4af5629bf60d47 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Apr 2020 13:21:24 +0200 Subject: gnu: ruby-sqlite3: Remove obsolete workaround. * gnu/packages/ruby.scm (ruby-sqlite3)[arguments]: Remove phase 'adjust-failing-test'. --- gnu/packages/ruby.scm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 87d98525fa..7e6df38ad1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6180,13 +6180,6 @@ neither too verbose nor too minimal.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'adjust-failing-test - (lambda _ - ;; XXX: This test fails with SQLite versions >= 3.21. - ;; See . - (substitute* "test/test_integration_resultset.rb" - (("\"integer\", \"text\"") "\"INTEGER\", \"text\"")) - #t)) (add-before 'check 'add-gemtest-file ;; This file exists in the repository but is not distributed. (lambda _ (invoke "touch" ".gemtest")))))) -- cgit v1.2.3 From 3a32940bfb2d7f4ce8f34cfeb1a3432d3d4ae241 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Apr 2020 13:53:35 +0200 Subject: gnu: ecl: Fix build with LibFFI >= 3.3. * gnu/packages/lisp.scm (ecl)[source](modules, snippet): New fields. --- gnu/packages/lisp.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 709ea88ae0..cc40f58e6e 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019, 2020 Katherine Cox-Buday ;;; Copyright © 2019 Jesse Gildersleve ;;; Copyright © 2019, 2020 Guillaume Le Vaillant +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -230,7 +231,16 @@ interface to the Tk widget system.") "https://common-lisp.net/project/ecl/static/files/release/" name "-" version ".tgz")) (sha256 - (base32 "0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn")))) + (base32 "0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Adjust for ABI change in LibFFI 3.3. See: + ;; https://gitlab.com/embeddable-common-lisp/ecl/-/issues/302 + ;; https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/171 + (substitute* "src/c/ffi.d" + (("FFI_SYSV") "FFI_UNIX64")) + #t)))) (build-system gnu-build-system) ;; src/configure uses 'which' to confirm the existence of 'gzip'. (native-inputs `(("cl-asdf" ,cl-asdf) -- cgit v1.2.3 From 76125bc061b199936c60c348290a593ac3450945 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Apr 2020 14:21:41 +0200 Subject: gnu: perl-gd: Do not rely on 'libgd-config'. * gnu/packages/gd.scm (perl-gd)[native-inputs]: Add PERL-EXTUTILS-PKGCONFIG. --- gnu/packages/gd.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 3c818872c1..c6a2e0117d 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -110,6 +110,8 @@ most common applications of GD involve website development.") ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) + (native-inputs + `(("perl-extutils-pkgconfig" ,perl-extutils-pkgconfig))) (arguments `(#:make-maker-flags (list (string-append "--lib_jpeg_path=" -- cgit v1.2.3 From 155aaca7febe58b59a55c5d4cd5bc5abcbe66d39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Apr 2020 14:33:43 +0200 Subject: gnu: python-pyjwt: Remove dependency on old version of 'pytest-runner'. * gnu/packages/python-xyz.scm (python-pyjwt)[arguments]: New field. [native-inputs]: Remove PYTHON-PYTEST-RUNNER. --- gnu/packages/python-xyz.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9703301da0..5e56a2b29c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2659,10 +2659,20 @@ memory usage and transliteration quality.") (find-files "." "\\.pyc$")) #t)))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; Mimic upstream commit 3a20892442b34c7 to get + ;; rid of dependency on pytest-runner < 5.0. + ;; Remove substitution for PyJWT > 1.7.1. + (substitute* "setup.py" + ((".*pytest-runner.*") + "")) + (invoke "pytest" "-vv")))))) (native-inputs `(("python-pytest" ,python-pytest) - ("python-pytest-cov" ,python-pytest-cov) - ("python-pytest-runner" ,python-pytest-runner))) + ("python-pytest-cov" ,python-pytest-cov))) (home-page "https://github.com/progrium/pyjwt") (synopsis "JSON Web Token implementation in Python") (description -- cgit v1.2.3 From c7eec67a93d58b2c0201f98071407f5a0cf549a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Apr 2020 21:45:23 +0200 Subject: gnu: qtwebengine: Fix build with Ninja >= 1.10. * gnu/packages/qt.scm (qtwebengine)[arguments]: Add phase 'patch-ninja-version-check'. --- gnu/packages/qt.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a5e2300f97..a3797bb5b0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1799,6 +1799,14 @@ message."))) (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'patch-ninja-version-check + (lambda _ + ;; The build system assumes the system Ninja is too old because + ;; it only checks for versions 1.7 through 1.9. We have 1.10. + (substitute* "configure.pri" + (("1\\.\\[7-9\\]\\.\\*") + "1.([7-9]|1[0-9]).*")) + #t)) (add-before 'configure 'substitute-source (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From d523eb5c9c2659cbbaf4eeef3691234ae527ee6a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 9 Apr 2020 00:53:28 +0200 Subject: gnu: python-cython: The i686 python2 workaround is needed for 32-bit ARM too. * gnu/packages/python-xyz.scm (python-cython)[arguments]: In the check phase, disable parallel test execution for all 32-bit systems. * gnu/packages/python-xyz.scm (python2-cython)[arguments]: Remove similar i686 workaround. --- gnu/packages/python-xyz.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5e56a2b29c..b26399c646 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3894,7 +3894,13 @@ provides additional functionality on the produced Mallard documents.") (setenv "CFLAGS" "-O0") (invoke "python" "runtests.py" "-vv" - "-j" (number->string (parallel-job-count)))))))) + "-j" (number->string (parallel-job-count)) + ;; XXX: On 32-bit architectures, running the parallel tests + ;; fails on many-core systems, see + ;; . + ,@(if (not (target-64bit?)) + '("-x" "run.parallel") + '()))))))) (home-page "https://cython.org/") (synopsis "C extensions for Python") (description "Cython is an optimising static compiler for both the Python @@ -3914,18 +3920,6 @@ writing C extensions for Python as easy as Python itself.") (substitute-keyword-arguments (package-arguments base) ((#:phases phases) `(modify-phases ,phases - ;; XXX: On i686-linux, running the parallel tests fails on many-core - ;; systems, see . - ;; TODO: Move this logic to the regular check phase in a future - ;; rebuild cycle. - ,@(if (string-prefix? "i686" (%current-system)) - '((replace 'check - (lambda _ - (setenv "CFLAGS" "-O0") - (invoke "python" "runtests.py" "-vv" - "-j" (number->string (parallel-job-count)) - "-x" "run.parallel")))) - '()) (add-before 'check 'adjust-test_embed (lambda _ (substitute* "runtests.py" -- cgit v1.2.3 From 29c6fb0d33b3bea8677093eed1cfbd6483c9fbe8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Apr 2020 15:53:19 +0200 Subject: gnu: spice-gtk: Add an absolute reference for libjpeg in the .la files. * gnu/packages/spice.scm (spice-gtk)[arguments]: Add phase 'patch-la-files. --- gnu/packages/spice.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 8b688ea9ef..b1b53962aa 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Rutger Helling -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -175,6 +175,16 @@ which allows users to view a desktop computing environment.") (substitute* "tests/Makefile" (("test-session\\$\\(EXEEXT\\) ") "")) #t)) + (add-after 'install 'patch-la-files + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (libjpeg (assoc-ref inputs "libjpeg"))) + ;; Add an absolute reference for libjpeg in the .la files + ;; so it does not have to be propagated. + (substitute* (find-files (string-append out "/lib") "\\.la$") + (("-ljpeg") + (string-append "-L" libjpeg "/lib -ljpeg"))) + #t))) (add-after 'install 'wrap-spicy (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From e43e980f847564e46f96e09bf77c648c3ef98b3c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Apr 2020 17:15:32 +0200 Subject: gnu: aegisub: Fix build with Make 4.3. * gnu/packages/patches/aegisub-make43.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/video.scm (aegisub)[source](patches): Add it. --- gnu/local.mk | 3 ++- gnu/packages/patches/aegisub-make43.patch | 20 ++++++++++++++++++++ gnu/packages/video.scm | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/aegisub-make43.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2197ae5775..b10c856721 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -722,7 +722,8 @@ dist_patch_DATA = \ %D%/packages/patches/aegis-test-fixup-1.patch \ %D%/packages/patches/aegis-test-fixup-2.patch \ %D%/packages/patches/aegisub-icu59-include-unistr.patch \ - %D%/packages/patches/aegisub-boost68.patch \ + %D%/packages/patches/aegisub-boost68.patch \ + %D%/packages/patches/aegisub-make43.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ %D%/packages/patches/akonadi-paths.patch \ %D%/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch \ diff --git a/gnu/packages/patches/aegisub-make43.patch b/gnu/packages/patches/aegisub-make43.patch new file mode 100644 index 0000000000..32f9d7749c --- /dev/null +++ b/gnu/packages/patches/aegisub-make43.patch @@ -0,0 +1,20 @@ +Fix build with GNU Make 4.3: + +https://github.com/Aegisub/Aegisub/issues/171 + +Patch taken from upstream: + +https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39 + +diff --git a/Makefile.target b/Makefile.target +--- a/Makefile.target ++++ b/Makefile.target +@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $< + # Libraries contain all object files they depend on (but they may depend on other files) + # Not using libtool on OS X because it has an unsilenceable warning about a + # compatibility issue with BSD 4.3 (wtf) +-lib%.a: $$($$*_OBJ) ++lib%.a: $$($$(*F)_OBJ) + @$(BIN_MKDIR_P) $(dir $@) + $(BIN_AR) cru $@ $(filter %.o,$^) + $(BIN_RANLIB) $@ diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cbdc5fb78a..16fd93415b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3249,6 +3249,7 @@ programmers to access a standard API to open and decompress media files.") (base32 "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5")) (patches (search-patches "aegisub-icu59-include-unistr.patch" + "aegisub-make43.patch" "aegisub-boost68.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From b859a1bf7953eb98668cb11b459cde48b0dce991 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Apr 2020 17:50:25 +0200 Subject: gnu: mariadb: Fix build on armhf-linux. * gnu/packages/databases.scm (mariadb)[arguments]: When building for armhf-linux, add phase 'hide-default-gcc'. [native-inputs]: Distinguish GCC-5. --- gnu/packages/databases.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b969b8f081..f6c5ec90d7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -774,6 +774,20 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases + ,@(if (string-prefix? "arm" (%current-system)) + ;; XXX: Because of the GCC 5 input, we need to hide GCC 7 from + ;; CPLUS_INCLUDE_PATH so that its headers do not shadow GCC 5. + '((add-after 'set-paths 'hide-default-gcc + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:)) + ":")) + #t)))) + '()) (add-after 'unpack 'fix-pcre-detection (lambda _ ;; The bundled PCRE in MariaDB has a patch that was upstreamed @@ -906,7 +920,7 @@ Language.") `(("bison" ,bison) ;; XXX: On armhf, use GCC 5 to work around . ,@(if (string-prefix? "armhf" (%current-system)) - `(("gcc", gcc-5)) + `(("gcc@5", gcc-5)) '()) ("perl" ,perl))) (inputs -- cgit v1.2.3 From e85d4cecbe253e59a8a2a42b6ce427d96ff10534 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 11 Apr 2020 00:12:09 +0200 Subject: gnu: commencement: Memoize packages as a function of the system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previous, things like 'ld-wrapper-boot0' would be memoized with (mlambda () …). However, the definition of 'ld-wrapper-boot0' depends on the result of (%boot0-inputs), which is itself a function of (%current-system). Thus, if one first calls: (parameterize ((%current-system "x86_64-linux")) (ld-wrapper-boot0)) then, in all subsequent calls to 'ld-wrapper-boot0', the value of (%current-system) would be ignored because the result is already memoized. Concretely, 'ld-wrapper-boot0' would always have the dependencies it has on x86_64-linux, even though they are different than those on armhf-linux, say ("bash-mesboot" vs. "bootstrap-binaries"). Fixes . Reported by Marius Bakke . * gnu/packages/commencement.scm (define/system-dependent): New macro. (linux-libre-headers-boot0, hurd-core-headers-boot0, ld-wrapper-boot0) (gcc-boot0-intermediate-wrapped, gcc-boot0-wrapped, ld-wrapper-boot3): Define using 'define/system-dependent' instead of 'define' + 'mlambda'. Adjust users so they no longer look like procedure calls. * tests/guix-build.sh: Add test. --- gnu/packages/commencement.scm | 156 +++++++++++++++++++++++------------------- tests/guix-build.sh | 6 ++ 2 files changed, 91 insertions(+), 71 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7e969faafe..41d7772eea 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2999,29 +2999,45 @@ exec " gcc "/bin/" program `(#:implicit-inputs? #f #:guile ,%bootstrap-guile)))) -(define linux-libre-headers-boot0 - (mlambda () - "Return Linux-Libre header files for the bootstrap environment." - ;; Note: this is wrapped in a thunk to nicely handle circular dependencies - ;; between (gnu packages linux) and this module. Additionally, memoize - ;; the result to play well with further memoization and code that relies - ;; on pointer identity; see . - (package - (inherit linux-libre-headers) - (arguments - `(#:guile ,%bootstrap-guile - #:implicit-inputs? #f - ,@(package-arguments linux-libre-headers))) - (native-inputs - `(("perl" ,perl-boot0) +(define-syntax define/system-dependent + (lambda (s) + "Bind IDENTIFIER to EXP, where the value of EXP is known to depend on +'%current-system'. The definition ensures that (1) EXP is \"thunked\" so that +it sees the right value of '%current-system', and (2) that its result is +memoized as a function of '%current-system'." + (syntax-case s () + ((_ identifier exp) + (with-syntax ((memoized (datum->syntax #'identifier + (symbol-append + (syntax->datum #'identifier) + '/memoized)))) + #'(begin + (define memoized + (mlambda (system) exp)) + (define-syntax identifier + (identifier-syntax (memoized (%current-system)))))))))) + +(define/system-dependent linux-libre-headers-boot0 + ;; Note: this is wrapped in a thunk to nicely handle circular dependencies + ;; between (gnu packages linux) and this module. Additionally, memoize + ;; the result to play well with further memoization and code that relies + ;; on pointer identity; see . + (package + (inherit linux-libre-headers) + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + ,@(package-arguments linux-libre-headers))) + (native-inputs + `(("perl" ,perl-boot0) - ;; Flex and Bison are required since version 4.16. - ("flex" ,flex-boot0) - ("bison" ,bison-boot0) + ;; Flex and Bison are required since version 4.16. + ("flex" ,flex-boot0) + ("bison" ,bison-boot0) - ;; Rsync is required since version 5.3. - ("rsync" ,rsync-boot0) - ,@(%boot0-inputs)))))) + ;; Rsync is required since version 5.3. + ("rsync" ,rsync-boot0) + ,@(%boot0-inputs))))) (define with-boot0 (package-with-explicit-inputs %boot0-inputs @@ -3083,23 +3099,22 @@ exec " gcc "/bin/" program (inputs '())))) (with-boot0 (package-with-bootstrap-guile hurd-minimal)))) -(define hurd-core-headers-boot0 - (mlambda () - "Return the Hurd and Mach headers as well as initial Hurd libraries for -the bootstrap environment." - (package (inherit (package-with-bootstrap-guile hurd-core-headers)) - (arguments `(#:guile ,%bootstrap-guile - ,@(package-arguments hurd-core-headers))) - (inputs - `(("gnumach-headers" ,gnumach-headers-boot0) - ("hurd-headers" ,hurd-headers-boot0) - ("hurd-minimal" ,hurd-minimal-boot0) - ,@(%boot0-inputs)))))) +(define/system-dependent hurd-core-headers-boot0 + ;; Return the Hurd and Mach headers as well as initial Hurd libraries for + ;; the bootstrap environment. + (package (inherit (package-with-bootstrap-guile hurd-core-headers)) + (arguments `(#:guile ,%bootstrap-guile + ,@(package-arguments hurd-core-headers))) + (inputs + `(("gnumach-headers" ,gnumach-headers-boot0) + ("hurd-headers" ,hurd-headers-boot0) + ("hurd-minimal" ,hurd-minimal-boot0) + ,@(%boot0-inputs))))) (define* (kernel-headers-boot0 #:optional (system (%current-system))) (match system - ("i586-gnu" (hurd-core-headers-boot0)) - (_ (linux-libre-headers-boot0)))) + ("i586-gnu" hurd-core-headers-boot0) + (_ linux-libre-headers-boot0))) (define texinfo-boot0 ;; Texinfo used to build libc's manual. @@ -3205,21 +3220,23 @@ the bootstrap environment." (delete 'set-TZDIR))) ((#:tests? _ #f) #f)))))) -(define ld-wrapper-boot0 - (mlambda () - ;; We need this so binaries on Hurd will have libmachuser and libhurduser - ;; in their RUNPATH, otherwise validate-runpath will fail. - (make-ld-wrapper "ld-wrapper-boot0" - #:target boot-triplet - #:binutils binutils-boot0 - #:guile %bootstrap-guile - #:bash (car (assoc-ref (%boot0-inputs) "bash")) - #:guile-for-build %bootstrap-guile))) +(define/system-dependent ld-wrapper-boot0 + ;; The first 'ld' wrapper, defined with 'define/system-dependent' because + ;; its calls '%boot0-inputs', whose result depends on (%current-system) + ;; + ;; We need this so binaries on Hurd will have libmachuser and libhurduser + ;; in their RUNPATH, otherwise validate-runpath will fail. + (make-ld-wrapper "ld-wrapper-boot0" + #:target boot-triplet + #:binutils binutils-boot0 + #:guile %bootstrap-guile + #:bash (car (assoc-ref (%boot0-inputs) "bash")) + #:guile-for-build %bootstrap-guile)) (define (%boot1-inputs) ;; 2nd stage inputs. `(("gcc" ,gcc-boot0) - ("ld-wrapper-cross" ,(ld-wrapper-boot0)) + ("ld-wrapper-cross" ,ld-wrapper-boot0) ("binutils-cross" ,binutils-boot0) ,@(alist-delete "binutils" (%boot0-inputs)))) @@ -3345,20 +3362,19 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("bash" ,bash))) (inputs '()))) -(define gcc-boot0-intermediate-wrapped - (mlambda () - ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the - ;; non-cross names. - (cross-gcc-wrapper gcc-boot0 binutils-boot0 - glibc-final-with-bootstrap-bash - (car (assoc-ref (%boot1-inputs) "bash"))))) +(define/system-dependent gcc-boot0-intermediate-wrapped + ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the + ;; non-cross names. + (cross-gcc-wrapper gcc-boot0 binutils-boot0 + glibc-final-with-bootstrap-bash + (car (assoc-ref (%boot1-inputs) "bash")))) (define static-bash-for-glibc ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. (package (inherit static-bash) (source (bootstrap-origin (package-source static-bash))) - (inputs `(("gcc" ,(gcc-boot0-intermediate-wrapped)) + (inputs `(("gcc" ,gcc-boot0-intermediate-wrapped) ("libc" ,glibc-final-with-bootstrap-bash) ("libc:static" ,glibc-final-with-bootstrap-bash "static") ,@(fold alist-delete (%boot1-inputs) @@ -3446,18 +3462,17 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-outputs glibc-final-with-bootstrap-bash)) ,@(package-arguments glibc-final-with-bootstrap-bash))))) -(define gcc-boot0-wrapped - (mlambda () - ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the - ;; non-cross names. - (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final - (car (assoc-ref (%boot1-inputs) "bash"))))) +(define/system-dependent gcc-boot0-wrapped + ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the + ;; non-cross names. + (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final + (car (assoc-ref (%boot1-inputs) "bash")))) (define (%boot2-inputs) ;; 3rd stage inputs. `(("libc" ,glibc-final) ("libc:static" ,glibc-final "static") - ("gcc" ,(gcc-boot0-wrapped)) + ("gcc" ,gcc-boot0-wrapped) ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc" "linux-libre-headers")))) (define binutils-final @@ -3511,14 +3526,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-arguments zlib))) (inputs (%boot2-inputs)))) -(define ld-wrapper-boot3 - (mlambda () - ;; A linker wrapper that uses the bootstrap Guile. - (make-ld-wrapper "ld-wrapper-boot3" - #:binutils binutils-final - #:guile %bootstrap-guile - #:bash (car (assoc-ref (%boot2-inputs) "bash")) - #:guile-for-build %bootstrap-guile))) +(define/system-dependent ld-wrapper-boot3 + ;; A linker wrapper that uses the bootstrap Guile. + (make-ld-wrapper "ld-wrapper-boot3" + #:binutils binutils-final + #:guile %bootstrap-guile + #:bash (car (assoc-ref (%boot2-inputs) "bash")) + #:guile-for-build %bootstrap-guile)) (define gcc-final ;; The final GCC. @@ -3594,7 +3608,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0))) ("mpfr-source" ,(package-source mpfr)) ("mpc-source" ,(package-source mpc)) - ("ld-wrapper" ,(ld-wrapper-boot3)) + ("ld-wrapper" ,ld-wrapper-boot3) ("binutils" ,binutils-final) ("libstdc++" ,libstdc++) ("zlib" ,zlib-final) @@ -3603,7 +3617,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define (%boot3-inputs) ;; 4th stage inputs. `(("gcc" ,gcc-final) - ("ld-wrapper" ,(ld-wrapper-boot3)) + ("ld-wrapper" ,ld-wrapper-boot3) ,@(alist-delete "gcc" (%boot2-inputs)))) (define bash-final diff --git a/tests/guix-build.sh b/tests/guix-build.sh index 1a997de487..6c08857358 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -65,6 +65,12 @@ test `guix build sed -s x86_64-linux -d | wc -l` = 1 all_systems="-s x86_64-linux -s i686-linux -s armhf-linux -s aarch64-linux" test `guix build sed $all_systems -d | sort -u | wc -l` = 4 +# Check there's no weird memoization effect leading to erroneous results. +# See . +drv1="`guix build sed -s x86_64-linux -s armhf-linux -d | sort`" +drv2="`guix build sed -s armhf-linux -s x86_64-linux -d | sort`" +test "$drv1" = "$drv2" + # Check --sources option with its arguments module_dir="t-guix-build-$$" mkdir "$module_dir" -- cgit v1.2.3 From a13b63453d315899d2f97a0a4bceae3ead0e99d1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 6 Apr 2020 00:02:20 -0400 Subject: gnu: liblinphone: Fix build failure. * gnu/packages/linphone.scm (liblinphone)[arguments]<#:configure-flags]: Add -DENABLE_STRICT=NO. Signed-off-by: Danny Milosavljevic --- gnu/packages/linphone.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 50d75a4a95..feb8e26eba 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -427,7 +427,8 @@ decoding, and rendering.") (string-append (assoc-ref %build-inputs "glib") "/lib/glib-2.0/include")) "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_GTK_UI=YES") ; For Legacy UI + "-DENABLE_STRICT=NO" + "-DENABLE_GTK_UI=YES") ; for legacy UI #:phases (modify-phases %standard-phases (add-after 'unpack 'patch -- cgit v1.2.3 From 3daf981942122f0d9b301b0c5f33551ffaaa130e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 11 Apr 2020 01:18:03 +0200 Subject: gnu: spandsp: Fix build failure. * gnu/packages/telephony.scm (spandsp)[native-inputs]: Add libjpeg-turbo. --- gnu/packages/telephony.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5e43061b3e..e7441d94e4 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -162,6 +162,7 @@ ("fftw" ,fftw) ("libpcap" ,libpcap) ("libsndfile" ,libsndfile) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("netpbm" ,netpbm) ("sox" ,sox) -- cgit v1.2.3 From c0cce2055757c18619ef1826c54ed3d5b9ec7eb0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 11 Apr 2020 01:21:03 +0200 Subject: gnu: Add linphoneqt. * gnu/packages/linphone.scm (linphoneqt): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/linphone.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index feb8e26eba..fb9a6fd421 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages java) #:use-module (gnu packages sqlite) #:use-module (gnu packages telephony) @@ -49,6 +50,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system cmake) + #:use-module (guix build-system qt) #:use-module (guix build-system gnu)) (define-public bcunit @@ -470,6 +472,50 @@ and video calls or instant messaging capabilities to an application.") (home-page "https://gitlab.linphone.org/BC/public/liblinphone") (license license:gpl2+))) +(define-public linphoneqt + (package + (name "linphoneqt") + (version "4.1.1") + (source + (origin + (method url-fetch) + (uri + (string-append "https://www.linphone.org/releases/sources/" name + "/" name "-" version ".tar.gz")) + (sha256 + (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; No test target + #:phases + ;; For replacing undeclared variable. + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/app/AppController.cpp" + (("LINPHONE_QT_GIT_VERSION") + "\"4.1.1\"")) + #t))))) + (native-inputs + `(("qttools" ,qttools))) + (inputs + `(("bctoolbox" ,bctoolbox) + ("belcard" ,belcard) + ("bellesip" ,belle-sip) + ("linphone" ,liblinphone) + ("mediastreamer2" ,mediastreamer2) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtquickcontrols2" ,qtquickcontrols2) + ("qtsvg" ,qtsvg))) + (synopsis "Belledonne Communications Softphone Application") + (description "Linphone is a softphone for voice and video over IP calling +and instant messaging. It is fully SIP-based, for all calling, presence +and IM features.") + (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop") + (license license:gpl2+))) + (define-public msopenh264 (package (name "msopenh264") -- cgit v1.2.3 From e66d5d6e29f09cd51ed6284e0f927c341f4b88c9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 15:33:32 +0200 Subject: gnu: spandsp: Add comment. * gnu/packages/telephony.scm (spandsp)[native-inputs]: Note that the LIBJPEG-TURBO dependency comes via LIBTIFF. --- gnu/packages/telephony.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index e7441d94e4..76e08528f4 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -162,7 +162,7 @@ ("fftw" ,fftw) ("libpcap" ,libpcap) ("libsndfile" ,libsndfile) - ("libjpeg" ,libjpeg-turbo) + ("libjpeg" ,libjpeg-turbo) ;XXX: should be propagated from libtiff ("libtiff" ,libtiff) ("netpbm" ,netpbm) ("sox" ,sox) -- cgit v1.2.3 From 72cf14948dd2f9ef049479bdb1321e2568e10ac5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 15:34:52 +0200 Subject: gnu: python-gevent: Update to 1.5.0. * gnu/packages/python-xyz.scm (python-gevent): Update to 1.5.0. [arguments]: Split the unbundling and include path adjustments intwo two phases. Enable previously failing test; disable two others. Use a format string instead of DISPLAY when writing skipped_tests.txt. --- gnu/packages/python-xyz.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e9284d9342..25b0ae39a2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11047,13 +11047,13 @@ graphviz.") (define-public python-gevent (package (name "python-gevent") - (version "1.4.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "gevent" version)) (sha256 (base32 - "1lchr4akw2jkm5v4kz7bdm4wv3knkfhbfn9vkkz4s5yrkcxzmdqy")) + "0aac3d4vhv5n4rsb6cqzq0d1xx9immqz4fmpddw35yxkwdc450dj")) (modules '((guix build utils))) (snippet '(begin @@ -11079,14 +11079,16 @@ graphviz.") (find-files "src/greentest" "\\.py$")) #t)) (add-before 'build 'do-not-use-bundled-sources - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ (setenv "GEVENTSETUP_EMBED" "0") ;; Prevent building bundled libev. (substitute* "setup.py" (("run_make=_BUILDING") "run_make=False")) - + #t)) + (add-before 'build 'add-greenlet-on-C_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) (let ((greenlet (string-append (assoc-ref inputs "python-greenlet") "/include"))) @@ -11137,9 +11139,6 @@ graphviz.") "test_thread.py" "test_threading.py" "test__threading_2.py" - ;; FIXME: test_patch_twice_warning_events fails for - ;; no apparent reason. Needs more investigation! - "test__monkey.py" ;; These tests rely on KeyboardInterrupts which do not ;; work inside the build container for some reason ;; (lack of controlling terminal?). @@ -11147,12 +11146,15 @@ graphviz.") "test__issues461_471.py" ;; TODO: Patch out the tests that use getprotobyname, etc ;; instead of disabling all the tests from these files. + "test__resolver_dnspython.py" + "test__doctests.py" "test__all__.py" "test___config.py" "test__execmodules.py"))) (call-with-output-file "skipped_tests.txt" (lambda (port) - (display (string-join disabled-tests "\n") port))) + (format port "~a~%" + (string-join disabled-tests "\n")))) #t))) (replace 'check (lambda _ -- cgit v1.2.3 From 8cc103cb01c1f13090ecfb34a6dcdd7d68710f31 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 15:41:45 +0200 Subject: gnu: gRPC@1.16: Fix build with glibc 2.30 and later. * gnu/packages/rpc.scm (grpc-1.16.1)[arguments]: Add phase to rename custom gettid() function. --- gnu/packages/rpc.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index e73695b613..28c61b54f9 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -23,6 +23,7 @@ #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (gnu packages adns) @@ -122,7 +123,23 @@ browsers to backend services.") (file-name (git-file-name "grpc" version)) (sha256 (base32 - "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))))) + "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))) + (arguments + (substitute-keyword-arguments (package-arguments grpc) + ((#:phases phases) + `(modify-phases ,phases + ;; Note: This would be nicer as a snippet, but that creates a tarball + ;; instead of a checkout and breaks assumptions made by the builder. + (add-after 'unpack 'rename-gettid + (lambda _ + ;; Rename custom gettid() syscall wrapper to avoid conflict + ;; with gettid() from glibc 2.30. + (substitute* '("src/core/lib/gpr/log_linux.cc" + "src/core/lib/gpr/log_posix.cc" + "src/core/lib/iomgr/ev_epollex_linux.cc") + (("gettid\\(") + "sys_gettid(")) + #t)))))))) (define-public python-grpcio (package -- cgit v1.2.3 From 2a2a9878682e4d959633ecab5275397809a1ce3f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 16:04:26 +0200 Subject: gnu: python-pycrypto: Fix build with Python 3.8. * gnu/packages/patches/python-pycrypto-time-clock.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-crypto.scm (python-pycrypto)[source](patches): Add it. --- gnu/local.mk | 1 + .../patches/python-pycrypto-time-clock.patch | 23 ++++++++++++++++++++++ gnu/packages/python-crypto.scm | 3 ++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-pycrypto-time-clock.patch diff --git a/gnu/local.mk b/gnu/local.mk index e7e5d00baf..3f48c466af 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1387,6 +1387,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-parameterized-docstring-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ + %D%/packages/patches/python-pycrypto-time-clock.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \ diff --git a/gnu/packages/patches/python-pycrypto-time-clock.patch b/gnu/packages/patches/python-pycrypto-time-clock.patch new file mode 100644 index 0000000000..9b7a8232a2 --- /dev/null +++ b/gnu/packages/patches/python-pycrypto-time-clock.patch @@ -0,0 +1,23 @@ +Drop use of the deprecated time.clock which was removed in Python 3.8. + +Adapted from upstream pull request: + +https://github.com/dlitz/pycrypto/pull/296 + +diff --git a/lib/Crypto/Random/_UserFriendlyRNG.py b/lib/Crypto/Random/_UserFriendlyRNG.py +--- a/lib/Crypto/Random/_UserFriendlyRNG.py ++++ b/lib/Crypto/Random/_UserFriendlyRNG.py +@@ -73,8 +73,11 @@ class _EntropyCollector(object): + t = time.time() + self._time_es.feed(struct.pack("@I", int(2**30 * (t - floor(t))))) + +- # Add the fractional part of time.clock() +- t = time.clock() ++ # Add the fractional part of time.process_time() ++ try: ++ t = time.process_time() ++ except AttributeError: ++ t = time.clock() + self._clock_es.feed(struct.pack("@I", int(2**30 * (t - floor(t))))) + + diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 80160301dd..eb57f2bbd9 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -280,7 +280,8 @@ making them easy to handle and incorporate into other protocols.") (origin (method url-fetch) (uri (pypi-uri "pycrypto" version)) - (patches (search-patches "python-pycrypto-CVE-2013-7459.patch")) + (patches (search-patches "python-pycrypto-CVE-2013-7459.patch" + "python-pycrypto-time-clock.patch")) (sha256 (base32 "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj")))) -- cgit v1.2.3 From 8c83069b99b55527eed78f7581d97ca0173373bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 17:03:58 +0200 Subject: gnu: sbcl-burgled-batteries3: Fix build with Python 3.8. * gnu/packages/lisp-xyz.scm (sbcl-burgled-batteries3)[arguments]: Remove "m" suffix from Python include directory. Add phase to remove deprecated Python API binding. --- gnu/packages/lisp-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 751da1b58c..4308add8f5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5105,11 +5105,17 @@ high-level way. This library provides such operators.") (let ((python (assoc-ref inputs "python"))) (setenv "BB_PYTHON3_INCLUDE_DIR" (string-append python "/include/python" - (python-version python) - "m")) + (python-version python))) (setenv "BB_PYTHON3_DYLIB" (string-append python "/lib/libpython3.so")) - #t)))))) + #t))) + (add-after 'unpack 'adjust-for-python-3.8 + (lambda _ + ;; This method is no longer part of the public API. + (substitute* "ffi-interface.lisp" + ((".*PyEval_ReInitThreads.*") + "")) + #t))))) (native-inputs `(("sbcl-cl-fad" ,sbcl-cl-fad) ("sbcl-lift" ,sbcl-lift) -- cgit v1.2.3 From 87241947aa2c0148a6f06989057a113c57ea9208 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Apr 2020 14:59:58 +0200 Subject: install: 'populate-root-file-system' can be passed extra directives. * gnu/build/install.scm (evaluate-populate-directive): Handle 'file' directives. (populate-root-file-system): Add #:extras parameter and honor it. --- gnu/build/install.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/build/install.scm b/gnu/build/install.scm index c0d4d44091..d46b588f53 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Chris Marusich ;;; ;;; This file is part of GNU Guix. @@ -67,6 +67,13 @@ directory TARGET." (('directory name uid gid mode) (loop `(directory ,name ,uid ,gid)) (chmod (string-append target name) mode)) + (('file name) + (call-with-output-file (string-append target name) + (const #t))) + (('file name (? string? content)) + (call-with-output-file (string-append target name) + (lambda (port) + (display content port)))) ((new '-> old) (let try () (catch 'system-error @@ -119,11 +126,14 @@ STORE." (directory "/home" 0 0))) -(define (populate-root-file-system system target) +(define* (populate-root-file-system system target + #:key (extras '())) "Make the essential non-store files and directories on TARGET. This -includes /etc, /var, /run, /bin/sh, etc., and all the symlinks to SYSTEM." +includes /etc, /var, /run, /bin/sh, etc., and all the symlinks to SYSTEM. +EXTRAS is a list of directives appended to the built-in directives to populate +TARGET." (for-each (cut evaluate-populate-directive <> target) - (directives (%store-directory))) + (append (directives (%store-directory)) extras)) ;; Add system generation 1. (let ((generation-1 (string-append target -- cgit v1.2.3 From 82782d8cecec974c03ec95824f62455f0a795815 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Apr 2020 15:03:10 +0200 Subject: vm: 'qemu-image' accepts a list of extra populate directives. * gnu/build/vm.scm (root-partition-initializer): Add #:extra-directives parameter and pass it to 'populate-root-file-system'. * gnu/system/vm.scm (qemu-image): Add #:extra-directives parameter and pass it to 'root-partition-initializer'. --- gnu/build/vm.scm | 11 ++++++++--- gnu/system/vm.scm | 7 ++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 9caa110463..dfb1465fd5 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -363,14 +363,18 @@ it, run its initializer, and unmount it." copy-closures? (register-closures? #t) system-directory - (deduplicate? #t)) + (deduplicate? #t) + (extra-directives '())) "Return a procedure to initialize a root partition. If REGISTER-CLOSURES? is true, register all of CLOSURES in the partition's store. If DEDUPLICATE? is true, then also deduplicate files common to CLOSURES and the rest of the store when registering the closures. If COPY-CLOSURES? is true, copy all of CLOSURES to the partition. -SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation." +SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation. + +EXTRA-DIRECTIVES is an optional list of directives to populate the root file +system that is passed to 'populate-root-file-system'." (lambda (target) (define target-store (string-append target (%store-directory))) @@ -403,7 +407,8 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation." ;; Add the non-store directories and files. (display "populating...\n") - (populate-root-file-system system-directory target) + (populate-root-file-system system-directory target + #:extras extra-directives) ;; 'register-closure' resets timestamps and everything, so no need to do it ;; once more in that case. diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 04d84b5220..8baed372cb 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -368,6 +368,7 @@ INPUTS is a list of inputs (as for packages)." (disk-image-size 'guess) (disk-image-format "qcow2") (file-system-type "ext4") + (extra-directives '()) file-system-label file-system-uuid os @@ -392,7 +393,10 @@ all of INPUTS into the image being built. When REGISTER-CLOSURES? is true, register INPUTS in the store database of the image so that Guix can be used in the image. By default, REGISTER-CLOSURES? is set to true only if a service of type GUIX-SERVICE-TYPE is present in the services definition of the operating -system." +system. + +EXTRA-DIRECTIVES is an optional list of directives to populate the root file +system that is passed to 'populate-root-file-system'." (define schema (and register-closures? (local-file (search-path %load-path @@ -441,6 +445,7 @@ system." (((names . _) ...) names))) (initialize (root-partition-initializer + #:extra-directives '#$extra-directives #:closures graphs #:copy-closures? #$copy-inputs? #:register-closures? #$register-closures? -- cgit v1.2.3 From 4d1ff68d731fdc47ca1220863fee07a685a26616 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Apr 2020 15:08:11 +0200 Subject: vm: 'qemu-image' can pass options to the 'mkfs' command. * gnu/build/vm.scm ()[file-system-options]: New field. (create-ext-file-system, create-fat-file-system) (format-partition): Add #:options and honor it. (initialize-partition): Pass #:options to 'format-partition'. * gnu/system/vm.scm (qemu-image): Add #:file-system-options and use it for the root partition. --- gnu/build/vm.scm | 24 +++++++++++++++--------- gnu/system/vm.scm | 5 ++++- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index dfb1465fd5..63140f1cee 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -234,6 +234,8 @@ deduplicates files common to CLOSURE and the rest of PREFIX." (device partition-device (default #f)) (size partition-size) (file-system partition-file-system (default "ext4")) + (file-system-options partition-file-system-options ;passed to 'mkfs.FS' + (default '())) (label partition-label (default #f)) (uuid partition-uuid (default #f)) (flags partition-flags (default '())) @@ -308,7 +310,7 @@ actual /dev name based on DEVICE." (define MS_BIND 4096) ; again! (define* (create-ext-file-system partition type - #:key label uuid) + #:key label uuid (options '())) "Create an ext-family file system of TYPE on PARTITION. If LABEL is true, use that as the volume name. If UUID is true, use it as the partition UUID." (format #t "creating ~a partition... ~@[label: ~s~] ~@[uuid: ~s~]\n" @@ -320,26 +322,29 @@ use that as the volume name. If UUID is true, use it as the partition UUID." '()) ,@(if uuid `("-U" ,(uuid->string uuid)) - '())))) + '()) + ,@options))) (define* (create-fat-file-system partition - #:key label uuid) + #:key label uuid (options '())) "Create a FAT file system on PARTITION. The number of File Allocation Tables will be determined based on file system size. If LABEL is true, use that as the volume name." ;; FIXME: UUID is ignored! (format #t "creating FAT partition...\n") (apply invoke "mkfs.fat" partition - (if label `("-n" ,label) '()))) + (append (if label `("-n" ,label) '()) options))) (define* (format-partition partition type - #:key label uuid) + #:key label uuid (options '())) "Create a file system TYPE on PARTITION. If LABEL is true, use that as the -volume name." +volume name. Options is a list of command-line options passed to 'mkfs.FS'." (cond ((string-prefix? "ext" type) - (create-ext-file-system partition type #:label label #:uuid uuid)) + (create-ext-file-system partition type #:label label #:uuid uuid + #:options options)) ((or (string-prefix? "fat" type) (string= "vfat" type)) - (create-fat-file-system partition #:label label #:uuid uuid)) + (create-fat-file-system partition #:label label #:uuid uuid + #:options options)) (else (error "Unsupported file system.")))) (define (initialize-partition partition) @@ -349,7 +354,8 @@ it, run its initializer, and unmount it." (format-partition (partition-device partition) (partition-file-system partition) #:label (partition-label partition) - #:uuid (partition-uuid partition)) + #:uuid (partition-uuid partition) + #:options (partition-file-system-options partition)) (mkdir-p target) (mount (partition-device partition) target (partition-file-system partition)) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 8baed372cb..65e96d42ee 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -368,6 +368,7 @@ INPUTS is a list of inputs (as for packages)." (disk-image-size 'guess) (disk-image-format "qcow2") (file-system-type "ext4") + (file-system-options '()) (extra-directives '()) file-system-label file-system-uuid @@ -382,7 +383,8 @@ INPUTS is a list of inputs (as for packages)." 'qcow2' or 'raw'), with a root partition of type FILE-SYSTEM-TYPE. Optionally, FILE-SYSTEM-LABEL can be specified as the volume name for the root partition; likewise FILE-SYSTEM-UUID, if true, specifies the UUID of the root -partition (a UUID object). +partition (a UUID object). FILE-SYSTEM-OPTIONS is an optional list of +command-line options passed to 'mkfs.ext4' (or similar). The returned image is a full disk image that runs OS-DERIVATION, with a GRUB installation that uses GRUB-CONFIGURATION as its configuration @@ -472,6 +474,7 @@ system that is passed to 'populate-root-file-system'." (uuid #$(and=> file-system-uuid uuid-bytevector)) (file-system #$file-system-type) + (file-system-options '#$file-system-options) (flags '(boot)) (initializer initialize))) ;; Append a small EFI System Partition for use with UEFI -- cgit v1.2.3 From 29814639c405d02735613bcbb1b5fd665cd8bd25 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Apr 2020 16:07:25 +0200 Subject: gnu: gnumach: Enable kernel debugger (kbd). * gnu/packages/hurd.scm (gnumach)[arguments]: Add "--enable-kdb". --- gnu/packages/hurd.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index f94d4fa5a7..7ea35bbf31 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -264,6 +264,8 @@ Hurd-minimal package which are needed for both glibc and GCC.") (name "gnumach") (arguments (substitute-keyword-arguments (package-arguments gnumach-headers) + ((#:configure-flags flags ''()) + `(cons "--enable-kdb" ,flags)) ;enable kernel debugger ((#:phases phases '%standard-phases) `(modify-phases %standard-phases (add-after 'install 'produce-image -- cgit v1.2.3 From f46cf8ef252fbfb8dce6f458bd099978883089d2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Apr 2020 16:14:40 +0200 Subject: gnu: hurd: Provide our own /libexec/rc script. * gnu/packages/hurd.scm (hurd-rc-script): New procedure. (hurd)[inputs]: Add (hurd-rc-script). --- gnu/packages/hurd.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 6 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 7ea35bbf31..ca7d7e97a3 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -25,6 +25,7 @@ #:use-module (guix download) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) @@ -286,6 +287,51 @@ Hurd-minimal package which are needed for both glibc and GCC.") (description "GNU Mach is the microkernel upon which a GNU Hurd system is based."))) +(define (hurd-rc-script) + "Return a script to be installed as /libexec/rc in the 'hurd' package. The +script takes care of installing the relevant passive translators on the first +boot, since this cannot be done from GNU/Linux." + (define translators + '(("/servers/crash-dump-core" ("/hurd/crash" "--dump-core")) + ("/servers/crash-kill" ("/hurd/crash" "--kill")) + ("/servers/crash-suspend" ("/hurd/crash" "--suspend")) + ("/servers/password" ("/hurd/password")) + ("/servers/socket/1" ("/hurd/pflocal")) + ("/servers/socket/2" ("/hurd/pfinet" "--interface" "eth0" + "--address" "10.0.2.77" + "--netmask" "255.255.255.0" + "--gateway" "10.0.2.2" + "--ipv6" "/servers/socket/16")))) + + (define rc + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils) + (ice-9 match)) + + ;; "@HURD@" is a placeholder. + (setenv "PATH" "@HURD@/bin") + + (define (translated? node) + ;; Return true if a translator is installed on NODE. + (with-output-to-port (%make-void-port "w") + (lambda () + (with-error-to-port (%make-void-port "w") + (lambda () + (zero? (system* "showtrans" "-s" node))))))) + + (for-each (match-lambda + ((node command) + (unless (translated? node) + (mkdir-p (dirname node)) + (apply invoke "settrans" "-c" node command)))) + '#$translators)))) + + ;; FIXME: We want the program to use the cross-compiled Guile when + ;; cross-compiling. But why do we need to be explicit here? + (with-parameters ((%current-target-system "i586-pc-gnu")) + (program-file "rc" rc))) + (define-public hurd (package (name "hurd") @@ -296,11 +342,21 @@ Hurd-minimal package which are needed for both glibc and GCC.") `(#:phases (modify-phases %standard-phases (add-before 'build 'pre-build - (lambda _ - ;; Don't change the ownership of any file at this time. - (substitute* '("daemons/Makefile" "utils/Makefile") - (("-o root -m 4755") "")) - #t))) + (lambda _ + ;; Don't change the ownership of any file at this time. + (substitute* '("daemons/Makefile" "utils/Makefile") + (("-o root -m 4755") "")) + #t)) + (add-after 'install 'install-rc-file + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (file (string-append out "/libexec/rc")) + (rc (assoc-ref inputs "hurd-rc"))) + (delete-file file) + (copy-file rc file) + (substitute* file + (("@HURD@") out)) + #t)))) #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") "--disable-ncursesw" @@ -308,7 +364,9 @@ Hurd-minimal package which are needed for both glibc and GCC.") "--without-libz" "--without-parted"))) (build-system gnu-build-system) - (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers))) + (inputs + `(("glibc-hurd-headers" ,glibc/hurd-headers) + ("hurd-rc" ,(hurd-rc-script)))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 7aad4609ae38790b7cc4e6a88b3e48ab43bc1f09 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Apr 2020 16:47:40 +0200 Subject: gnu: cross-libc: Add patch to add 'mach_print' symbol on GNU/Hurd. * gnu/packages/patches/glibc-hurd-mach-print.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/cross-base.scm (cross-libc): Add 'patch-libc/hurd' phase when 'hurd-target?' is true. --- gnu/local.mk | 1 + gnu/packages/cross-base.scm | 11 +++++++++-- gnu/packages/patches/glibc-hurd-mach-print.patch | 23 +++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glibc-hurd-mach-print.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7347222852..02e9d804e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -977,6 +977,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \ %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch \ %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \ + %D%/packages/patches/glibc-hurd-mach-print.patch \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index df4570dafc..c21390767f 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -521,7 +521,12 @@ and the cross tool chain." (("/[^ ]+/lib/libc.so.0.3") (string-append out "/lib/libc.so.0.3" " libmachuser.so libhurduser.so")))) - #t))) + #t)) + (add-after 'unpack 'patch-libc/hurd + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs + "hurd-mach-print.patch"))) + (invoke "patch" "-p1" "--force" "-i" patch))))) '()))))) ;; Shadow the native "kernel-headers" because glibc's recipe expects the @@ -537,7 +542,9 @@ and the cross tool chain." ,@(if (hurd-triplet? target) `(("cross-mig" ,@(assoc-ref (package-native-inputs xheaders) - "cross-mig"))) + "cross-mig")) + ("hurd-mach-print.patch" + ,@(search-patches "glibc-hurd-mach-print.patch"))) '()) ,@(package-inputs libc) ;FIXME: static-bash ,@(package-native-inputs libc)))))) diff --git a/gnu/packages/patches/glibc-hurd-mach-print.patch b/gnu/packages/patches/glibc-hurd-mach-print.patch new file mode 100644 index 0000000000..7fdf6733d0 --- /dev/null +++ b/gnu/packages/patches/glibc-hurd-mach-print.patch @@ -0,0 +1,23 @@ +Provide a 'mach_print' symbol in libc. + +--- a/sysdeps/mach/hurd/i386/libc.abilist 2020-04-01 19:22:44.710088821 +0200 ++++ b/sysdeps/mach/hurd/i386/libc.abilist 2020-04-01 19:22:52.062051161 +0200 +@@ -338,6 +338,7 @@ + GLIBC_2.2.6 __mach_port_allocate F + GLIBC_2.2.6 __mach_port_deallocate F + GLIBC_2.2.6 __mach_port_insert_right F ++GLIBC_2.21 __mach_print F + GLIBC_2.2.6 __mach_reply_port F + GLIBC_2.2.6 __mach_task_self_ D 0x4 + GLIBC_2.2.6 __mach_thread_self F + +--- a/mach/Versions ++++ b/mach/Versions +@@ -56,6 +56,7 @@ + } + GLIBC_2.21 { + __mach_host_self_; ++ mach_print; + } + + HURD_CTHREADS_0.3 { -- cgit v1.2.3 From 09ac892a951aeded1bc6d0487980041fb55a71b7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Apr 2020 22:20:46 +0200 Subject: gnu: hurd: Use a 32-bit MiG when cross-compiling. * gnu/packages/hurd.scm (hurd)[native-inputs]: When '%current-target-system' is true, pass #:system "i686-linux" to 'mig'. --- gnu/packages/hurd.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index ca7d7e97a3..6478eb4434 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -370,7 +370,13 @@ boot, since this cannot be done from GNU/Linux." (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("mig" ,mig) + ("mig" ,(if (%current-target-system) + ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG, + ;; hence this hack. + (package + (inherit mig) + (arguments `(#:system "i686-linux"))) + mig)) ("perl" ,perl) ("texinfo" ,texinfo-4))) (supported-systems %hurd-systems) -- cgit v1.2.3 From b7e23a92a57f50686a5334c4737ffe46b06bbf77 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Apr 2020 23:12:10 +0200 Subject: gnu: hurd: Record the right file name of 'login'. * gnu/packages/hurd.scm (hurd)[arguments]: Add 'set-file-names' phase. --- gnu/packages/hurd.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 6478eb4434..9f398e0d6c 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -347,6 +347,13 @@ boot, since this cannot be done from GNU/Linux." (substitute* '("daemons/Makefile" "utils/Makefile") (("-o root -m 4755") "")) #t)) + (add-before 'build 'set-file-names + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* '("daemons/runttys.c" "daemons/getty.c") + (("/bin/login") + (string-append out "/bin/login"))) + #t))) (add-after 'install 'install-rc-file (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 29505c7d1eb08afc14a881d84705cde54b12192f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 5 Apr 2020 01:49:37 +0200 Subject: gnu: hurd: Ensure startup scripts refer to the right programs. * gnu/packages/hurd.scm (hurd)[arguments]: In 'set-file-names' phase, patch startup.c, init.c, login.c, and daemons/runsystem/*. Add 'patch-libexec-shebangs' phase. Subtitute /libexec and /sbin, so that we may run RC. [inputs]: Add BASH-MINIMAL, COREUTILS, SED, GREP, and UTIL-LINUX. --- gnu/packages/hurd.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 9f398e0d6c..45e1b21a77 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -32,8 +32,10 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages flex) #:use-module (gnu packages bison) + #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages texinfo) #:use-module (guix git-download) #:export (hurd-system? @@ -349,10 +351,63 @@ boot, since this cannot be done from GNU/Linux." #t)) (add-before 'build 'set-file-names (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* '("daemons/runttys.c" "daemons/getty.c") + (let* ((out (assoc-ref outputs "out")) + (bash (assoc-ref inputs "bash-minimal")) + (coreutils (assoc-ref inputs "coreutils")) + (sed (assoc-ref inputs "sed")) + (grep (assoc-ref inputs "grep")) + (util-linux (assoc-ref inputs "util-linux"))) + (substitute* '("daemons/runttys.c" "daemons/getty.c" "utils/login.c") (("/bin/login") - (string-append out "/bin/login"))) + (string-append out "/bin/login")) + (("/bin/bash") (string-append bash "/bin/bash"))) + (substitute* '("startup/startup.c" "init/init.c" "config/ttys") + (("/libexec/") + (string-append out "/libexec/"))) + (substitute* "daemons/console-run.c" + (("/hurd/") + (string-append out "/hurd/"))) + + (substitute* '("daemons/runsystem.sh" + "daemons/runsystem.hurd.sh" + "sutils/MAKEDEV.sh") + (("^PATH=.*") + (string-append "PATH=" out "/bin:" out "/sbin:" + coreutils "/bin:" + sed "/bin:" grep "/bin:" + util-linux "/bin\n")) + (("^SHELL=.*") + (string-append "SHELL=" bash "/bin/bash\n")) + (("/sbin/") (string-append out "/sbin/")) + (("/libexec/") (string-append out "/libexec/")) + (("/hurd/") (string-append out "/hurd/"))) + + (substitute* "daemons/runsystem.sh" + (("export PATH") + (string-append "export PATH\n" + "\ +fsysopts / --writable + +# MAKEDEV relies on pipes so this needs to be set up. +settrans -c /servers/socket/1 /hurd/pflocal + +(cd /dev; MAKEDEV -D /dev std vcs tty{1,2,3,4,5,6})\n"))) + + (substitute* "daemons/runsystem.hurd.sh" + (("export PATH") + "export PATH +fsysopts / --writable\n")) + #t))) + (add-after 'patch-shebangs 'patch-libexec-shebangs + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; XXX: Since the 'patch-shebangs' phase doesn't traverse + ;; /libexec, do it here. + (let* ((out (assoc-ref outputs "out")) + (bash (assoc-ref inputs "bash-minimal")) + (path (list (string-append bash "/bin")))) + (for-each (lambda (file) + (patch-shebang file path)) + (find-files (string-append out "/libexec"))) #t))) (add-after 'install 'install-rc-file (lambda* (#:key inputs outputs #:allow-other-keys) @@ -373,7 +428,14 @@ boot, since this cannot be done from GNU/Linux." (build-system gnu-build-system) (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers) - ("hurd-rc" ,(hurd-rc-script)))) + ("hurd-rc" ,(hurd-rc-script)) + + ;; Tools for the /libexec/* scripts. + ("bash-minimal" ,bash-minimal) + ("coreutils" ,coreutils) + ("sed" ,sed) + ("grep" ,grep) + ("util-linux" ,util-linux))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 62a3bbfdfef42b8aa0b8a04bbf62c9f845903da9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Apr 2020 14:58:19 +0200 Subject: gnu: hurd: Install the UTF-8 motd. * gnu/packages/hurd.scm (hurd)[arguments]: Add 'install-goodies' phase. --- gnu/packages/hurd.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 45e1b21a77..e5ad8e4f73 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -409,6 +409,16 @@ fsysopts / --writable\n")) (patch-shebang file path)) (find-files (string-append out "/libexec"))) #t))) + (add-after 'install 'install-goodies + (lambda* (#:key outputs #:allow-other-keys) + ;; Install additional goodies. + ;; TODO: Build & install *.msgids for rpctrace. + (let ((out (assoc-ref outputs "out"))) + ;; Install the fancy UTF-8 motd. + (mkdir-p (string-append out "/etc")) + (copy-file "console/motd.UTF8" + (string-append out "/etc/motd")) + #t))) (add-after 'install 'install-rc-file (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 7e7033d16e96f4c3226fead4820a01b1b32da275 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 7 Apr 2020 07:41:08 +0200 Subject: gnu: libgcrypt: Fix cross-compilation. This works around /gnu/store/pwcp239kjf7lnj5i4lkdzcfcxwcfyk72-bash-minimal-5.0.16/bin/bash ../libtool --tag=CC --mode=link i586-pc-gnu-gcc -I/gnu/store/8x9dhckldm6iy1digklfanmvdaizq11f-libgpg-error-1.37/include -g -O2 -fvisibility=hidden -fno-delete-null-pointer-checks -Wall -o mpicalc mpicalc-mpicalc.o libgcrypt.la -L/gnu/store/8x9dhckldm6iy1digklfanmvdaizq11f-libgpg-error-1.37/lib -lgpg-error i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_lshift' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_add_n' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_addmul_1' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_submul_1' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_mul_1' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_sub_n' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_rshift' * gnu/packages/gnupg.scm (libgcrypt)[arguments]: Disable assembly when cross-compiling. --- gnu/packages/gnupg.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 498a6a1a9a..298f18a8cc 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -148,7 +148,10 @@ Daemon and possibly more in the future.") ;; the 'gpg-error-config' it runs is the native one---i.e., the wrong one. `(#:configure-flags (list (string-append "--with-gpg-error-prefix=" - (assoc-ref %build-inputs "libgpg-error-host"))))) + (assoc-ref %build-inputs "libgpg-error-host")) + ;; When cross-compiling, _gcry_mpih_lshift etc are undefined + ,@(if (%current-target-system) '("--disable-asm") + '())))) (outputs '("out" "debug")) (home-page "https://gnupg.org/") (synopsis "Cryptographic function library") -- cgit v1.2.3 From abbeaf5450826077d27292fbc230f5724f5ff9d0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Apr 2020 15:54:12 +0200 Subject: gnu: hurd: Add dependency on libgcrypt. * gnu/packages/hurd.scm (hurd)[inputs]: Add LIBGCRYPT. [native-inputs]: Likewise. --- gnu/packages/hurd.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index e5ad8e4f73..8d9ba1137d 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -31,6 +31,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages autotools) #:use-module (gnu packages flex) + #:use-module (gnu packages gnupg) #:use-module (gnu packages bison) #:use-module (gnu packages linux) #:use-module (gnu packages perl) @@ -440,6 +441,7 @@ fsysopts / --writable\n")) `(("glibc-hurd-headers" ,glibc/hurd-headers) ("hurd-rc" ,(hurd-rc-script)) + ("libgcrypt" ,libgcrypt) ;for /hurd/random ;; Tools for the /libexec/* scripts. ("bash-minimal" ,bash-minimal) ("coreutils" ,coreutils) @@ -449,6 +451,7 @@ fsysopts / --writable\n")) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) + ("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config' ("mig" ,(if (%current-target-system) ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG, ;; hence this hack. -- cgit v1.2.3 From a16022a7b889cefc86cb368c3475a7d0dd2edfb6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Apr 2020 15:53:32 +0200 Subject: gnu: libdaemon: Allow cross-compilation. * gnu/packages/libdaemon.scm (libdaemon)[arguments]: New field. --- gnu/packages/libdaemon.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm index 81cf6e58ba..a92892a6ae 100644 --- a/gnu/packages/libdaemon.scm +++ b/gnu/packages/libdaemon.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +45,12 @@ "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) + (arguments + (if (%current-target-system) + ;; The 'setpgrp' test cannot provide an answer when cross-compiling, + ;; so provide the right one for glibc. + `(#:configure-flags (list "ac_cv_func_setpgrp_void=yes")) + '())) ;; XXX: Stale URL, missing replacement. See . (home-page "http://0pointer.de/lennart/projects/libdaemon/") -- cgit v1.2.3 From 5ea5d0512f912375358c339f81334454b03ef5a3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Apr 2020 15:26:57 +0200 Subject: gnu: libdaemon: Cross-build with --localstatedir=/var. * gnu/packages/libdaemon.scm (libdaemon)[arguments]: Add "--localstatedir=/var" when (%current-target-system) is true. --- gnu/packages/libdaemon.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm index a92892a6ae..e47d66cfa7 100644 --- a/gnu/packages/libdaemon.scm +++ b/gnu/packages/libdaemon.scm @@ -49,7 +49,15 @@ (if (%current-target-system) ;; The 'setpgrp' test cannot provide an answer when cross-compiling, ;; so provide the right one for glibc. - `(#:configure-flags (list "ac_cv_func_setpgrp_void=yes")) + `(#:configure-flags (list "ac_cv_func_setpgrp_void=yes" + + ;; TODO: Move this globally on the next + ;; rebuild cycle. + ;; Set a valid localstatedir for the + ;; benefit of the default + ;; 'daemon_pid_file_proc', used by the + ;; Hurd's console client. + "--localstatedir=/var")) '())) ;; XXX: Stale URL, missing replacement. See . -- cgit v1.2.3 From 1d5fc9f7a70b89c70bfc540ac087d08d5b1943b8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Apr 2020 15:54:39 +0200 Subject: gnu: hurd: Add dependency on libdaemon. * gnu/packages/hurd.scm (hurd)[inputs]: Add dependency on libdaemon. [native-inputs]: Add PKG-CONFIG. --- gnu/packages/hurd.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 8d9ba1137d..620faf30ca 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -33,8 +33,10 @@ #:use-module (gnu packages flex) #:use-module (gnu packages gnupg) #:use-module (gnu packages bison) + #:use-module (gnu packages libdaemon) #:use-module (gnu packages linux) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages texinfo) @@ -442,6 +444,8 @@ fsysopts / --writable\n")) ("hurd-rc" ,(hurd-rc-script)) ("libgcrypt" ,libgcrypt) ;for /hurd/random + ("libdaemon" ,libdaemon) ;for /bin/console --daemonize + ;; Tools for the /libexec/* scripts. ("bash-minimal" ,bash-minimal) ("coreutils" ,coreutils) @@ -452,6 +456,7 @@ fsysopts / --writable\n")) `(("autoconf" ,autoconf) ("automake" ,automake) ("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config' + ("pkg-config" ,pkg-config) ("mig" ,(if (%current-target-system) ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG, ;; hence this hack. -- cgit v1.2.3 From ad3bbeadb46accce9c744f45cf079426b7e9a318 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Apr 2020 16:55:29 +0200 Subject: gnu: hurd: Install a BDF font. * gnu/packages/hurd.scm (unifont): New variable. (hurd)[arguments]: In 'install-goodies' phase, install OUT/share/hurd/vga-system.bdf. [inputs]: Add UNIFONT. --- gnu/packages/hurd.scm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 620faf30ca..f7c0637f40 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -292,6 +292,17 @@ Hurd-minimal package which are needed for both glibc and GCC.") (description "GNU Mach is the microkernel upon which a GNU Hurd system is based."))) +(define unifont + ;; GNU Unifont, . + ;; Used the the VGA driver of the Hurd's console client. + (origin + (method url-fetch) + (uri + "http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont-7.0.06.bdf.gz") + (sha256 + (base32 + "0p2vhnc18cnbmb39vq4m7hzv4mhnm2l0a2s7gx3ar277fwng3hys")))) + (define (hurd-rc-script) "Return a script to be installed as /libexec/rc in the 'hurd' package. The script takes care of installing the relevant passive translators on the first @@ -413,14 +424,23 @@ fsysopts / --writable\n")) (find-files (string-append out "/libexec"))) #t))) (add-after 'install 'install-goodies - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Install additional goodies. ;; TODO: Build & install *.msgids for rpctrace. - (let ((out (assoc-ref outputs "out"))) + (let* ((out (assoc-ref outputs "out")) + (datadir (string-append out "/share/hurd"))) ;; Install the fancy UTF-8 motd. (mkdir-p (string-append out "/etc")) (copy-file "console/motd.UTF8" (string-append out "/etc/motd")) + + ;; Install the BDF font for use by the console client. + (copy-file (assoc-ref inputs "unifont") + "unifont.gz") + (invoke "gunzip" "unifont.gz") + (mkdir-p datadir) + (copy-file "unifont" + (string-append datadir "/vga-system.bdf")) #t))) (add-after 'install 'install-rc-file (lambda* (#:key inputs outputs #:allow-other-keys) @@ -445,6 +465,7 @@ fsysopts / --writable\n")) ("libgcrypt" ,libgcrypt) ;for /hurd/random ("libdaemon" ,libdaemon) ;for /bin/console --daemonize + ("unifont" ,unifont) ;; Tools for the /libexec/* scripts. ("bash-minimal" ,bash-minimal) -- cgit v1.2.3 From 1c4268e4147063355f41b7958bdb61bef96f58c0 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 5 Apr 2020 16:45:18 +0200 Subject: gnu: cross-libc: Add patch to allow 'gettyent' reading store file names. * gnu/packages/patches/glibc-hurd-gettyent.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/cross-base.scm (cross-libc): Add it in 'patch-libc/hurd' phase when 'hurd-target?' is true. --- gnu/local.mk | 1 + gnu/packages/cross-base.scm | 15 +++++++++--- gnu/packages/patches/glibc-hurd-gettyent.patch | 34 ++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/glibc-hurd-gettyent.patch diff --git a/gnu/local.mk b/gnu/local.mk index 02e9d804e9..8303fdca7f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -977,6 +977,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \ %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch \ %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \ + %D%/packages/patches/glibc-hurd-gettyent.patch \ %D%/packages/patches/glibc-hurd-mach-print.patch \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index c21390767f..9b4aa103da 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -522,11 +522,15 @@ and the cross tool chain." (string-append out "/lib/libc.so.0.3" " libmachuser.so libhurduser.so")))) #t)) + ;; TODO: move to glibc in the next rebuild cycle (add-after 'unpack 'patch-libc/hurd (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs - "hurd-mach-print.patch"))) - (invoke "patch" "-p1" "--force" "-i" patch))))) + (for-each + (lambda (name) + (let ((patch (assoc-ref inputs name))) + (invoke "patch" "-p1" "--force" "-i" patch))) + '("hurd-mach-print.patch" + "hurd-gettyent.patch"))))) '()))))) ;; Shadow the native "kernel-headers" because glibc's recipe expects the @@ -543,8 +547,11 @@ and the cross tool chain." `(("cross-mig" ,@(assoc-ref (package-native-inputs xheaders) "cross-mig")) + ;; TODO: move to glibc in the next rebuild cycle ("hurd-mach-print.patch" - ,@(search-patches "glibc-hurd-mach-print.patch"))) + ,@(search-patches "glibc-hurd-mach-print.patch")) + ("hurd-gettyent.patch" + ,@(search-patches "glibc-hurd-gettyent.patch"))) '()) ,@(package-inputs libc) ;FIXME: static-bash ,@(package-native-inputs libc)))))) diff --git a/gnu/packages/patches/glibc-hurd-gettyent.patch b/gnu/packages/patches/glibc-hurd-gettyent.patch new file mode 100644 index 0000000000..721a8d4fa8 --- /dev/null +++ b/gnu/packages/patches/glibc-hurd-gettyent.patch @@ -0,0 +1,34 @@ +From d6d2caef3e44d0713bb6625f697a1ec615abae70 Mon Sep 17 00:00:00 2001 +From: "Jan (janneke) Nieuwenhuizen" +Date: Sun, 5 Apr 2020 16:29:54 +0200 +Subject: [PATCH 4/4] misc: Choose a longer arbitrary line length. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This allows running specifying a `getty' in the GNU Guix store. + +* misc/getttyent.c (MAXLINELENGTH): Use 512 (instead of 100) as +another "great" arbitrary limit. + +Co-Authored-By: Ludovic Courtès +--- + misc/getttyent.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/getttyent.c b/misc/getttyent.c +index 92d92b026f..508d296291 100644 +--- a/misc/getttyent.c ++++ b/misc/getttyent.c +@@ -66,7 +66,7 @@ __getttyent (void) + static struct ttyent tty; + int c; + char *p; +-#define MAXLINELENGTH 100 ++#define MAXLINELENGTH 512 + static char line[MAXLINELENGTH]; + + if (!tf && !__setttyent()) +-- +2.26.0 + -- cgit v1.2.3 From 916ec91f23be829b2f7b5e6105b7476c70d08c1d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 5 Apr 2020 12:54:29 +0200 Subject: gnu: guile@3: Disable JIT on GNU/Hurd. * gnu/packages/guile.scm (guile-3.0)[arguments]: New field. --- gnu/packages/guile.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a665c05568..d69dee51c9 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -291,6 +291,13 @@ without requiring the source code to be rewritten.") (sha256 (base32 "12lziar4j27j9whqp2n18427q45y9ghq7gdd8lqhmj1k0lr7vi2k")))) + (arguments + ;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd. + (if (hurd-target?) + (substitute-keyword-arguments (package-arguments guile-2.2) + ((#:configure-flags flags ''()) + `(cons "--disable-jit" ,flags))) + (package-arguments guile-2.2))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") -- cgit v1.2.3 From 7fa6155b2396224360660c255b89865d065c9f96 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Apr 2020 15:40:30 +0200 Subject: database: 'reset-timestamps' can optionally preserve permissions. * guix/store/database.scm (reset-timestamps): Add #:preserve-permissions? and honor it. --- guix/store/database.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/guix/store/database.scm b/guix/store/database.scm index 88d05dc42e..ef52036ede 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019 Caleb Ristvedt -;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -228,16 +228,18 @@ Every store item in REFERENCES must already be registered." ;;; High-level interface. ;;; -(define (reset-timestamps file) +(define* (reset-timestamps file #:key preserve-permissions?) "Reset the modification time on FILE and on all the files it contains, if -it's a directory. While at it, canonicalize file permissions." +it's a directory. Canonicalize file permissions unless PRESERVE-PERMISSIONS? +is true." ;; Note: We're resetting to one second after the Epoch like 'guix-daemon' ;; has always done. (let loop ((file file) (type (stat:type (lstat file)))) (case type ((directory) - (chmod file #o555) + (unless preserve-permissions? + (chmod file #o555)) (utime file 1 1 0 0) (let ((parent file)) (for-each (match-lambda @@ -254,7 +256,8 @@ it's a directory. While at it, canonicalize file permissions." ((symlink) (utime file 1 1 0 0 AT_SYMLINK_NOFOLLOW)) (else - (chmod file (if (executable-file? file) #o555 #o444)) + (unless preserve-permissions? + (chmod file (if (executable-file? file) #o555 #o444))) (utime file 1 1 0 0))))) (define* (register-path path -- cgit v1.2.3 From 6a488a3504b345b193e24dfdba2a2ac6b1db1234 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Apr 2020 15:16:09 +0200 Subject: vm: Preserve file permissions on /dev. Previously, when REGISTER-CLOSURES? was false, we'd set all the files under /dev to #o644, including /dev/null, /dev/zero, etc. * gnu/build/vm.scm (root-partition-initializer): Call 'reset-timestamps' separately for /dev, with #:preserve-permissions? #t. --- gnu/build/vm.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 63140f1cee..84bb2592e2 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -33,6 +33,7 @@ #:use-module (guix records) #:use-module ((guix combinators) #:select (fold2)) #:use-module (ice-9 format) + #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 popen) @@ -419,7 +420,16 @@ system that is passed to 'populate-root-file-system'." ;; 'register-closure' resets timestamps and everything, so no need to do it ;; once more in that case. (unless register-closures? - (reset-timestamps target)))) + ;; 'reset-timestamps' also resets file permissions; do that everywhere + ;; except on /dev so that /dev/null remains writable, etc. + (for-each (lambda (directory) + (reset-timestamps (string-append target "/" directory))) + (scandir target + (match-lambda + ((or "." ".." "dev") #f) + (_ #t)))) + (reset-timestamps (string-append target "/dev") + #:preserve-permissions? #t)))) (define (register-bootcfg-root target bootcfg) "On file system TARGET, register BOOTCFG as a GC root." -- cgit v1.2.3 From 683cba75ea529c7390a79826124d7798d47d65cd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Apr 2020 16:19:05 +0200 Subject: linux-boot: 'make-essential-device-nodes' root parameter is optional. * gnu/build/linux-boot.scm (make-essential-device-nodes): Change 'root' to an optional parameter. * gnu/build/vm.scm (root-partition-initializer): Adjust accordingly. --- gnu/build/linux-boot.scm | 4 ++-- gnu/build/vm.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 4fb711b8f2..787665e320 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Guillaume Le Vaillant ;;; @@ -223,7 +223,7 @@ one specific hardware device. These we have to create." (call-with-input-file devname-name read-static-device-nodes)))) -(define* (make-essential-device-nodes #:key (root "/")) +(define* (make-essential-device-nodes #:optional (root "/")) "Make essential device nodes under ROOT/dev." ;; The hand-made devtmpfs/udev! diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 84bb2592e2..c062ab5c71 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -392,7 +392,7 @@ system that is passed to 'populate-root-file-system'." target)) ;; Populate /dev. - (make-essential-device-nodes #:root target) + (make-essential-device-nodes target) ;; Optionally, register the inputs in the image's store. (when register-closures? -- cgit v1.2.3 From ac61e876a4594af763994f0d5d4681ee5284f1f0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Apr 2020 09:47:36 +0200 Subject: linux-boot: Add 'make-hurd-device-nodes'. * gnu/build/linux-boot.scm (make-hurd-device-nodes): New procedure. --- gnu/build/linux-boot.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 787665e320..d1c9f47f33 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -40,6 +40,7 @@ find-long-option find-long-options make-essential-device-nodes + make-hurd-device-nodes make-static-device-nodes configure-qemu-networking @@ -323,6 +324,36 @@ one specific hardware device. These we have to create." ;; File systems in user space (FUSE). (mknod (scope "dev/fuse") 'char-special #o666 (device-number 10 229))) +(define* (make-hurd-device-nodes #:optional (root "/")) + "Make some of the nodes needed on GNU/Hurd." + (define (scope dir) + (string-append root + (if (string-suffix? "/" root) + "" + "/") + dir)) + + (mkdir (scope "dev")) + (for-each (lambda (file) + (call-with-output-file (scope file) + (lambda (port) + (chmod port #o666)))) + '("dev/null" + "dev/zero" + "dev/full" + "dev/random" + "dev/urandom")) + ;; Don't create /dev/console, /dev/vcs, etc.: they are created by + ;; console-run on first boot. + + (mkdir (scope "servers")) + (mkdir (scope "servers/socket")) + ;; Don't create /servers/socket/1 & co: runsystem does that on first boot. + + ;; TODO: Set the 'gnu.translator' extended attribute for passive translator + ;; settings? + ) + (define %host-qemu-ipv4-address (inet-pton AF_INET "10.0.2.10")) -- cgit v1.2.3 From cd45d656f1e8746fadacfbffd5740d22228c4c21 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Apr 2020 10:21:48 +0200 Subject: vm: Make the device node procedure a parameter. * gnu/build/vm.scm (root-partition-initializer): Add #:make-device-nodes parameter and use it. * gnu/system/vm.scm (qemu-image): Add #:device-node parameter. Pass #:make-device-nodes to 'root-partition-initializer'. --- gnu/build/vm.scm | 4 +++- gnu/system/vm.scm | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index c062ab5c71..d2bf7418fd 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -371,6 +371,8 @@ it, run its initializer, and unmount it." (register-closures? #t) system-directory (deduplicate? #t) + (make-device-nodes + make-essential-device-nodes) (extra-directives '())) "Return a procedure to initialize a root partition. @@ -392,7 +394,7 @@ system that is passed to 'populate-root-file-system'." target)) ;; Populate /dev. - (make-essential-device-nodes target) + (make-device-nodes target) ;; Optionally, register the inputs in the image's store. (when register-closures? diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 65e96d42ee..e8c2f6e162 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -369,6 +369,7 @@ INPUTS is a list of inputs (as for packages)." (disk-image-format "qcow2") (file-system-type "ext4") (file-system-options '()) + (device-nodes 'linux) (extra-directives '()) file-system-label file-system-uuid @@ -397,6 +398,9 @@ the image. By default, REGISTER-CLOSURES? is set to true only if a service of type GUIX-SERVICE-TYPE is present in the services definition of the operating system. +When DEVICE-NODES is 'linux, create Linux-device block and character devices +under /dev. When it is 'hurd, do Hurdish things. + EXTRA-DIRECTIVES is an optional list of directives to populate the root file system that is passed to 'populate-root-file-system'." (define schema @@ -416,6 +420,9 @@ system that is passed to 'populate-root-file-system'." #~(begin (use-modules (gnu build bootloader) (gnu build vm) + ((gnu build linux-boot) + #:select (make-essential-device-nodes + make-hurd-device-nodes)) (guix store database) (guix build utils) (srfi srfi-26) @@ -453,6 +460,11 @@ system that is passed to 'populate-root-file-system'." #:register-closures? #$register-closures? #:system-directory #$os + #:make-device-nodes + #$(match device-nodes + ('linux #~make-essential-device-nodes) + ('hurd #~make-hurd-device-nodes)) + ;; Disable deduplication to speed things up, ;; and because it doesn't help much for a ;; single system generation. -- cgit v1.2.3 From a9f7993ea719c5368ee3e64b813b169eece4e6a1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Apr 2020 16:18:23 +0200 Subject: Add (gnu system hurd). * gnu/system/hurd.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/system/hurd.scm | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 gnu/system/hurd.scm diff --git a/gnu/local.mk b/gnu/local.mk index 8303fdca7f..120359f0de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -598,6 +598,7 @@ GNU_SYSTEM_MODULES = \ %D%/system.scm \ %D%/system/accounts.scm \ %D%/system/file-systems.scm \ + %D%/system/hurd.scm \ %D%/system/install.scm \ %D%/system/keyboard.scm \ %D%/system/linux-container.scm \ diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm new file mode 100644 index 0000000000..0728ce8603 --- /dev/null +++ b/gnu/system/hurd.scm @@ -0,0 +1,112 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu system hurd) + #:use-module (guix gexp) + #:use-module (guix utils) + #:use-module (gnu bootloader grub) + #:use-module (gnu packages base) + #:use-module (gnu packages cross-base) + #:use-module (gnu packages hurd) + #:use-module (gnu system vm) + #:export (cross-hurd-image)) + +;;; Commentary: +;;; +;;; This module provides tools to (cross-)build GNU/Hurd virtual machine +;;; images. +;;; +;;; Code: + +(define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach)) + "Return a cross-built GNU/Hurd image." + (define hurd-os + (let-syntax ((for-hurd (syntax-rules () + ((_ things ...) + (list (with-parameters ((%current-target-system + "i586-pc-gnu")) + things) ...))))) + (directory-union "gnu+hurd" + (cons (with-parameters ((%current-system "i686-linux")) + gnumach) + (for-hurd hurd coreutils grep sed))))) + + (define grub.cfg + (let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu")) + hurd)) + (mach (with-parameters ((%current-system "i686-linux")) + gnumach)) + (libc (cross-libc "i586-pc-gnu"))) + (computed-file "grub.cfg" + #~(call-with-output-file #$output + (lambda (port) + (format port " +set timeout=2 +search.file ~a/boot/gnumach + +menuentry \"GNU\" { + multiboot ~a/boot/gnumach root=device:hd0s1 + module ~a/hurd/ext2fs.static ext2fs \\ + --multiboot-command-line='${kernel-command-line}' \\ + --host-priv-port='${host-port}' \\ + --device-master-port='${device-port}' \\ + --exec-server-task='${exec-task}' -T typed '${root}' \\ + '$(task-create)' '$(task-resume)' + module ~a/lib/ld.so.1 exec ~a/hurd/exec '$(exec-task=task-create)' +}\n" + #+mach #+mach #+hurd + #+libc #+hurd)))))) + + (define hurd-directives + `((directory "/servers") + ,@(map (lambda (server) + `(file ,(string-append "/servers/" server))) + '("startup" "exec" "proc" "password" + "default-pager" "crash-dump-core" + "kill" "suspend")) + ("/servers/crash" -> "crash-dump-core") + (directory "/servers/socket") + (file "/servers/socket/1") + (file "/servers/socket/2") + (file "/servers/socket/16") + ("/servers/socket/local" -> "1") + ("/servers/socket/inet" -> "2") + ("/servers/socket/inet6" -> "16") + (file "/etc/resolv.conf" + "nameserver 10.0.2.3\n") + (directory "/boot") + ("/boot/grub.cfg" -> ,grub.cfg) ;XXX: not strictly needed + ("/hurd" -> ,(file-append (with-parameters ((%current-target-system + "i586-pc-gnu")) + hurd) + "/hurd")))) + + (qemu-image #:file-system-type "ext2" + #:file-system-options '("-o" "hurd") + #:device-nodes 'hurd + #:inputs `(("system" ,hurd-os) + ("grub.cfg" ,grub.cfg)) + #:copy-inputs? #t + #:os hurd-os + #:bootcfg-drv grub.cfg + #:bootloader grub-bootloader + #:register-closures? #f + #:extra-directives hurd-directives)) + +;; Return this thunk so one can type "guix build -f gnu/system/hurd.scm". +cross-hurd-image -- cgit v1.2.3 From 379d0f51841f808d456b885824b50949d0939bd9 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 5 Apr 2020 08:39:20 +0200 Subject: system: hurd: Add "/etc/fstab". This allows running mount -o remount,rw / successfully. * gnu/system/hurd.scm (cross-hurd-image): Create a hard coded fstab and add it to hurd-os. --- gnu/system/hurd.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 0728ce8603..03c49d472f 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -72,6 +72,14 @@ menuentry \"GNU\" { #+mach #+mach #+hurd #+libc #+hurd)))))) + (define fstab + (plain-file "fstab" +"# This file was generated from your Guix configuration. Any changes +# will be lost upon reboot or reconfiguration. + +/dev/hd0s1 / ext2 defaults +")) + (define hurd-directives `((directory "/servers") ,@(map (lambda (server) @@ -94,13 +102,15 @@ menuentry \"GNU\" { ("/hurd" -> ,(file-append (with-parameters ((%current-target-system "i586-pc-gnu")) hurd) - "/hurd")))) + "/hurd")) + ("/etc/fstab" -> ,fstab))) (qemu-image #:file-system-type "ext2" #:file-system-options '("-o" "hurd") #:device-nodes 'hurd #:inputs `(("system" ,hurd-os) - ("grub.cfg" ,grub.cfg)) + ("grub.cfg" ,grub.cfg) + ("fstab" , fstab)) #:copy-inputs? #t #:os hurd-os #:bootcfg-drv grub.cfg -- cgit v1.2.3 From cd4faab5636cfc30765f9642189787f49daba519 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 5 Apr 2020 13:51:56 +0200 Subject: system: hurd: Add ttys symlink in "/etc/ttys". * gnu/packages/hurd.scm (hurd): Substitute /libexec/. * gnu/system/hurd.scm (cross-hurd-image): Add symlink /etc/ttys => /etc/ttys. --- gnu/system/hurd.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 03c49d472f..4830c91553 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -103,7 +103,12 @@ menuentry \"GNU\" { "i586-pc-gnu")) hurd) "/hurd")) - ("/etc/fstab" -> ,fstab))) + ("/etc/fstab" -> ,fstab) + ;; XXX can we instead, harmlessly set _PATH_TTYS (from glibc) in runttys.c? + ("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system + "i586-pc-gnu")) + hurd) + "/etc/ttys")))) (qemu-image #:file-system-type "ext2" #:file-system-options '("-o" "hurd") -- cgit v1.2.3 From 6598c6149b28ea7ba3450e0081a55e2baabf1371 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 5 Apr 2020 14:36:34 +0200 Subject: system: hurd: Add /etc/{passwd,shadow}. * gnu/system/hurd.scm: Generate hard-coded /etc/{passwd,shadow}, allows running chown in MAKEDEV and loggin in. --- gnu/system/hurd.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 4830c91553..3926f11315 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -80,6 +80,18 @@ menuentry \"GNU\" { /dev/hd0s1 / ext2 defaults ")) + (define passwd + (plain-file "passwd" +"root:x:0:0:root:/root:/bin/sh +" +)) + + (define shadow + (plain-file "shadow" +"root::0:0:0:0::: +" +)) + (define hurd-directives `((directory "/servers") ,@(map (lambda (server) @@ -104,6 +116,8 @@ menuentry \"GNU\" { hurd) "/hurd")) ("/etc/fstab" -> ,fstab) + ("/etc/passwd" -> ,passwd) + ("/etc/shadow" -> ,shadow) ;; XXX can we instead, harmlessly set _PATH_TTYS (from glibc) in runttys.c? ("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system "i586-pc-gnu")) @@ -115,7 +129,9 @@ menuentry \"GNU\" { #:device-nodes 'hurd #:inputs `(("system" ,hurd-os) ("grub.cfg" ,grub.cfg) - ("fstab" , fstab)) + ("fstab" ,fstab) + ("passwd" ,passwd) + ("shadow" ,shadow)) #:copy-inputs? #t #:os hurd-os #:bootcfg-drv grub.cfg -- cgit v1.2.3 From fe1f9646b4533fd4d3ec98bcfaa1b09391396e76 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 5 Apr 2020 17:16:30 +0200 Subject: system: hurd: Add "/bin/sh" symlink. This allows login.c to succeed for root. * gnu/system/hurd.scm (cross-hurd-image): Link /bin/sh to full the full bash. --- gnu/system/hurd.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 3926f11315..65706161cb 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -21,6 +21,7 @@ #:use-module (guix utils) #:use-module (gnu bootloader grub) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages cross-base) #:use-module (gnu packages hurd) #:use-module (gnu system vm) @@ -44,7 +45,7 @@ (directory-union "gnu+hurd" (cons (with-parameters ((%current-system "i686-linux")) gnumach) - (for-hurd hurd coreutils grep sed))))) + (for-hurd hurd bash coreutils grep sed))))) (define grub.cfg (let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu")) @@ -122,7 +123,11 @@ menuentry \"GNU\" { ("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system "i586-pc-gnu")) hurd) - "/etc/ttys")))) + "/etc/ttys")) + ("/bin/sh" -> ,(file-append (with-parameters ((%current-target-system + "i586-pc-gnu")) + bash) + "/bin/sh")))) (qemu-image #:file-system-type "ext2" #:file-system-options '("-o" "hurd") -- cgit v1.2.3 From 5fbf4f85e1bfe028cc17d6fbcd9e337bf7a9e389 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Apr 2020 14:58:58 +0200 Subject: system: hurd: Create /etc/{hostname,motd,login} and /root. * gnu/system/hurd.scm (cross-hurd-image): Add /etc/{hostname,motd,login} and /root. --- gnu/system/hurd.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 65706161cb..75b9dacd68 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -108,17 +108,32 @@ menuentry \"GNU\" { ("/servers/socket/local" -> "1") ("/servers/socket/inet" -> "2") ("/servers/socket/inet6" -> "16") - (file "/etc/resolv.conf" - "nameserver 10.0.2.3\n") (directory "/boot") ("/boot/grub.cfg" -> ,grub.cfg) ;XXX: not strictly needed ("/hurd" -> ,(file-append (with-parameters ((%current-target-system "i586-pc-gnu")) hurd) "/hurd")) + + ;; TODO: Create those during activation, eventually. + (directory "/root") ("/etc/fstab" -> ,fstab) ("/etc/passwd" -> ,passwd) ("/etc/shadow" -> ,shadow) + (file "/etc/hostname" "guixygnu") + (file "/etc/resolv.conf" + "nameserver 10.0.2.3\n") + + ("/etc/motd" -> ,(file-append (with-parameters ((%current-target-system + "i586-pc-gnu")) + hurd) + "/etc/motd")) + ("/etc/login" -> ,(file-append (with-parameters ((%current-target-system + "i586-pc-gnu")) + hurd) + "/etc/login")) + + ;; XXX can we instead, harmlessly set _PATH_TTYS (from glibc) in runttys.c? ("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system "i586-pc-gnu")) -- cgit v1.2.3 From da987ece8f9a4ecb6d1d40b042da2c829367f059 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 8 Apr 2020 08:04:52 +0200 Subject: system: hurd: Add root profile. * gnu/system/hurd.scm (%base-packages/hurd): New variable. (cross-hurd-image)[for-hurd]: New function. (cross-hurd-image)[hurd-os]: Use them. (cross-hurd-image)[profile]: Hack'y .profile for root, only setting PATH. --- gnu/system/hurd.scm | 59 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 75b9dacd68..7cf7476bd1 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -23,6 +23,8 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages cross-base) + #:use-module (gnu packages file) + #:use-module (gnu packages guile) #:use-module (gnu packages hurd) #:use-module (gnu system vm) #:export (cross-hurd-image)) @@ -34,18 +36,20 @@ ;;; ;;; Code: +(define %base-packages/hurd + (list hurd bash coreutils file findutils grep sed guile-3.0)) + (define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach)) "Return a cross-built GNU/Hurd image." + + (define (for-hurd p) + (with-parameters ((%current-target-system "i586-pc-gnu")) p)) + (define hurd-os - (let-syntax ((for-hurd (syntax-rules () - ((_ things ...) - (list (with-parameters ((%current-target-system - "i586-pc-gnu")) - things) ...))))) - (directory-union "gnu+hurd" - (cons (with-parameters ((%current-system "i686-linux")) - gnumach) - (for-hurd hurd bash coreutils grep sed))))) + (directory-union "gnu+hurd" + (cons (with-parameters ((%current-system "i686-linux")) + gnumach) + (map for-hurd %base-packages/hurd)))) (define grub.cfg (let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu")) @@ -73,9 +77,20 @@ menuentry \"GNU\" { #+mach #+mach #+hurd #+libc #+hurd)))))) + (define profile + (let ((packages (map for-hurd %base-packages/hurd))) + (computed-file + "profile" + #~(call-with-output-file #$output + (lambda (port) + (format port " +PATH=~a/bin:~a/sbin:~a/hurd +" + #+hurd-os #+hurd-os #+hurd-os)))))) + (define fstab (plain-file "fstab" -"# This file was generated from your Guix configuration. Any changes + "# This file was generated from your Guix configuration. Any changes # will be lost upon reboot or reconfiguration. /dev/hd0s1 / ext2 defaults @@ -83,15 +98,13 @@ menuentry \"GNU\" { (define passwd (plain-file "passwd" -"root:x:0:0:root:/root:/bin/sh -" -)) + "root:x:0:0:root:/root:/bin/sh +")) (define shadow (plain-file "shadow" -"root::0:0:0:0::: -" -)) + "root::0:0:0:0::: +")) (define hurd-directives `((directory "/servers") @@ -109,7 +122,7 @@ menuentry \"GNU\" { ("/servers/socket/inet" -> "2") ("/servers/socket/inet6" -> "16") (directory "/boot") - ("/boot/grub.cfg" -> ,grub.cfg) ;XXX: not strictly needed + ("/boot/grub.cfg" -> ,grub.cfg) ;XXX: not strictly needed ("/hurd" -> ,(file-append (with-parameters ((%current-target-system "i586-pc-gnu")) hurd) @@ -117,6 +130,7 @@ menuentry \"GNU\" { ;; TODO: Create those during activation, eventually. (directory "/root") + ("/root/.profile" -> ,profile) ("/etc/fstab" -> ,fstab) ("/etc/passwd" -> ,passwd) ("/etc/shadow" -> ,shadow) @@ -129,16 +143,16 @@ menuentry \"GNU\" { hurd) "/etc/motd")) ("/etc/login" -> ,(file-append (with-parameters ((%current-target-system - "i586-pc-gnu")) - hurd) + "i586-pc-gnu")) + hurd) "/etc/login")) ;; XXX can we instead, harmlessly set _PATH_TTYS (from glibc) in runttys.c? ("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system - "i586-pc-gnu")) - hurd) - "/etc/ttys")) + "i586-pc-gnu")) + hurd) + "/etc/ttys")) ("/bin/sh" -> ,(file-append (with-parameters ((%current-target-system "i586-pc-gnu")) bash) @@ -151,6 +165,7 @@ menuentry \"GNU\" { ("grub.cfg" ,grub.cfg) ("fstab" ,fstab) ("passwd" ,passwd) + ("profile" ,profile) ("shadow" ,shadow)) #:copy-inputs? #t #:os hurd-os -- cgit v1.2.3 From df0010a9dc18937ba481393f9d153a476dac13c0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Apr 2020 15:35:58 +0200 Subject: gnu: hurd: "/libexec/rc" spawns the console client. * gnu/packages/hurd.scm (hurd-rc-script): Start the console client. --- gnu/packages/hurd.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index f7c0637f40..90e39a279b 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -341,7 +341,12 @@ boot, since this cannot be done from GNU/Linux." (unless (translated? node) (mkdir-p (dirname node)) (apply invoke "settrans" "-c" node command)))) - '#$translators)))) + '#$translators) + + ;; Start the oh-so-fancy console client. + (mkdir-p "/var/run") ;for the PID file + (invoke "console" "--daemonize" "-c" "/dev/vcs" + "-d" "vga" "-d" "pc_kbd" "-d" "generic_speaker")))) ;; FIXME: We want the program to use the cross-compiled Guile when ;; cross-compiling. But why do we need to be explicit here? -- cgit v1.2.3 From c62126940419d2a6c21e16e21a973990fb11e054 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Apr 2020 16:36:08 +0200 Subject: system: hurd: Create a proper profile. * gnu/system/hurd.scm (compile-manifest): New procedure. (cross-hurd-image)[for-hurd, hurd-os]: Remove. [cross-built, cross-built-entry]: New procedures. [system-profile]: New variable. [grub.cfg]: Use 'cross-built'. [profile]: Rename to... [etc-profile]: ... this, and adjust accordingly. [hurd-directives]: Create /run/current-system/profile and /etc/profile. Adjust arguments to 'qemu-image'. --- gnu/system/hurd.scm | 69 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 24 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 7cf7476bd1..b35a99cdfc 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -18,6 +18,7 @@ (define-module (gnu system hurd) #:use-module (guix gexp) + #:use-module (guix profiles) #:use-module (guix utils) #:use-module (gnu bootloader grub) #:use-module (gnu packages base) @@ -36,24 +37,39 @@ ;;; ;;; Code: +;; XXX: Surely this belongs in (guix profiles), but perhaps we need high-level +;; objects so one can specify hooks, etc.? +(define-gexp-compiler (compile-manifest (manifest + (@@ (guix profiles) )) + system target) + "Lower MANIFEST as a profile." + (profile-derivation manifest + #:system system + #:target target)) + (define %base-packages/hurd (list hurd bash coreutils file findutils grep sed guile-3.0)) (define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach)) "Return a cross-built GNU/Hurd image." - (define (for-hurd p) - (with-parameters ((%current-target-system "i586-pc-gnu")) p)) + (define (cross-built thing) + (with-parameters ((%current-target-system "i586-pc-gnu")) + thing)) + + (define (cross-built-entry entry) + (manifest-entry + (inherit entry) + (item (cross-built (manifest-entry-item entry))) + (dependencies (map cross-built-entry + (manifest-entry-dependencies entry))))) - (define hurd-os - (directory-union "gnu+hurd" - (cons (with-parameters ((%current-system "i686-linux")) - gnumach) - (map for-hurd %base-packages/hurd)))) + (define system-profile + (map-manifest-entries cross-built-entry + (packages->manifest %base-packages/hurd))) (define grub.cfg - (let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu")) - hurd)) + (let ((hurd (cross-built hurd)) (mach (with-parameters ((%current-system "i686-linux")) gnumach)) (libc (cross-libc "i586-pc-gnu"))) @@ -77,17 +93,6 @@ menuentry \"GNU\" { #+mach #+mach #+hurd #+libc #+hurd)))))) - (define profile - (let ((packages (map for-hurd %base-packages/hurd))) - (computed-file - "profile" - #~(call-with-output-file #$output - (lambda (port) - (format port " -PATH=~a/bin:~a/sbin:~a/hurd -" - #+hurd-os #+hurd-os #+hurd-os)))))) - (define fstab (plain-file "fstab" "# This file was generated from your Guix configuration. Any changes @@ -106,6 +111,19 @@ PATH=~a/bin:~a/sbin:~a/hurd "root::0:0:0:0::: ")) + (define etc-profile + (plain-file "profile" + "\ +export PS1='\\u@\\h\\$ ' + +GUIX_PROFILE=\"/run/current-system/profile\" +. \"$GUIX_PROFILE/etc/profile\" + +GUIX_PROFILE=\"$HOME/.guix-profile\" +if [ -f \"$GUIX_PROFILE/etc/profile\" ]; then + . \"$GUIX_PROFILE/etc/profile\" +fi\n")) + (define hurd-directives `((directory "/servers") ,@(map (lambda (server) @@ -130,7 +148,10 @@ PATH=~a/bin:~a/sbin:~a/hurd ;; TODO: Create those during activation, eventually. (directory "/root") - ("/root/.profile" -> ,profile) + (directory "/run") + (directory "/run/current-system") + ("/run/current-system/profile" -> ,system-profile) + ("/etc/profile" -> ,etc-profile) ("/etc/fstab" -> ,fstab) ("/etc/passwd" -> ,passwd) ("/etc/shadow" -> ,shadow) @@ -161,14 +182,14 @@ PATH=~a/bin:~a/sbin:~a/hurd (qemu-image #:file-system-type "ext2" #:file-system-options '("-o" "hurd") #:device-nodes 'hurd - #:inputs `(("system" ,hurd-os) + #:inputs `(("system" ,system-profile) ("grub.cfg" ,grub.cfg) ("fstab" ,fstab) ("passwd" ,passwd) - ("profile" ,profile) + ("etc-profile" ,etc-profile) ("shadow" ,shadow)) #:copy-inputs? #t - #:os hurd-os + #:os system-profile #:bootcfg-drv grub.cfg #:bootloader grub-bootloader #:register-closures? #f -- cgit v1.2.3 From db047a482c150806301075a9b65fce2bf01fe8e8 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 8 Apr 2020 17:39:30 +0200 Subject: system: hurd: Add net-base and inetutils, and /etc/{services,protocols}. This fixes In procedure getaddrinfo: Servname not supported for ai_socktype * gnu/system/hurd.scm (%base-packages/hurd): Add net-base, inetutils. (cross-hurd-image): Add /etc/{services,protocols} from net-base. --- gnu/system/hurd.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index b35a99cdfc..322ac10db8 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -21,6 +21,7 @@ #:use-module (guix profiles) #:use-module (guix utils) #:use-module (gnu bootloader grub) + #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages cross-base) @@ -48,7 +49,8 @@ #:target target)) (define %base-packages/hurd - (list hurd bash coreutils file findutils grep sed guile-3.0)) + (list hurd bash coreutils file findutils grep sed guile-3.0 + net-base inetutils)) (define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach)) "Return a cross-built GNU/Hurd image." @@ -158,7 +160,14 @@ fi\n")) (file "/etc/hostname" "guixygnu") (file "/etc/resolv.conf" "nameserver 10.0.2.3\n") - + ("/etc/services" -> ,(file-append (with-parameters ((%current-target-system + "i586-pc-gnu")) + net-base) + "/etc/services")) + ("/etc/protocols" -> ,(file-append (with-parameters ((%current-target-system + "i586-pc-gnu")) + net-base) + "/etc/protocols")) ("/etc/motd" -> ,(file-append (with-parameters ((%current-target-system "i586-pc-gnu")) hurd) -- cgit v1.2.3 From 5084fd38541a5fc233f3299e10a33c3a38a7173f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Apr 2020 23:10:14 +0200 Subject: system: hurd: Add guile-candy. * gnu/system/hurd.scm (%base-packages/hurd): Add GUILE-COLORIZED and GUILE-READLINE. (cross-hurd-image)[hurd-directives]: Add /root/.guile. --- gnu/system/hurd.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 322ac10db8..2583ff00fa 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages cross-base) #:use-module (gnu packages file) #:use-module (gnu packages guile) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages hurd) #:use-module (gnu system vm) #:export (cross-hurd-image)) @@ -49,7 +50,8 @@ #:target target)) (define %base-packages/hurd - (list hurd bash coreutils file findutils grep sed guile-3.0 + (list hurd bash coreutils file findutils grep sed + guile-3.0 guile-colorized guile-readline net-base inetutils)) (define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach)) @@ -150,6 +152,11 @@ fi\n")) ;; TODO: Create those during activation, eventually. (directory "/root") + (file "/root/.guile" + ,(object->string + '(begin + (use-modules (ice-9 readline) (ice-9 colorized)) + (activate-readline) (activate-colorized)))) (directory "/run") (directory "/run/current-system") ("/run/current-system/profile" -> ,system-profile) -- cgit v1.2.3 From a58f3708b278941b134bb2a5229f127faad709ee Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 7 Apr 2020 07:57:55 +0200 Subject: gnu: openssl: Support cross-compilation to the Hurd. * gnu/packages/tls.scm (openssl)[arguments]: Add `i586' => hurd-x86 platform setting. --- gnu/packages/tls.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index eea3b12185..2b1deb1000 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -331,6 +331,8 @@ required structures.") (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" (cond + ((string-prefix? "i586" target) + "hurd-x86") ((string-prefix? "i686" target) "linux-x86") ((string-prefix? "x86_64" target) -- cgit v1.2.3 From 6a39cbe72287a00d85b71ff86197c9b3c6c2fd9d Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 7 Apr 2020 17:48:45 +0200 Subject: gnu: openssh: Build fix for the Hurd. * gnu/packages/patches/openssh-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ssh.scm (openssh)[source]: Use it. [inputs]: If hurd-target? is true, omit xauth. --- gnu/local.mk | 1 + gnu/packages/patches/openssh-hurd.patch | 30 ++++++++++++++++++++++++++++++ gnu/packages/ssh.scm | 7 ++++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openssh-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index 120359f0de..8deea48951 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1288,6 +1288,7 @@ dist_patch_DATA = \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ %D%/packages/patches/openocd-nrf52.patch \ + %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ diff --git a/gnu/packages/patches/openssh-hurd.patch b/gnu/packages/patches/openssh-hurd.patch new file mode 100644 index 0000000000..1ad09a7ee6 --- /dev/null +++ b/gnu/packages/patches/openssh-hurd.patch @@ -0,0 +1,30 @@ +Author: Jan (janneke) Nieuwenhuizen" +Not upstreamed. + +From 1ddae040d67e9a4ebcc3e1b95af1bff12c0f086b Mon Sep 17 00:00:00 2001 +From: "Jan (janneke) Nieuwenhuizen" +Date: Tue, 7 Apr 2020 17:41:05 +0200 +Subject: [PATCH] Build fix for the Hurd. + +* gss-serv.c (ssh_gssapi_acquire_cred): Use HOST_NAME_MAX instead of +MAXHOSTNAMELEN. +--- + gss-serv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gss-serv.c b/gss-serv.c +index 1d47870e7..22081c6f1 100644 +--- a/gss-serv.c ++++ b/gss-serv.c +@@ -107,7 +107,7 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx) + gss_create_empty_oid_set(&status, &oidset); + gss_add_oid_set_member(&status, ctx->oid, &oidset); + +- if (gethostname(lname, MAXHOSTNAMELEN)) { ++ if (gethostname(lname, HOST_NAME_MAX)) { + gss_release_oid_set(&status, &oidset); + return (-1); + } +-- +2.26.0 + diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 506ea06bc8..1d1b1c9951 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019, 2020 Mathieu Othacehe +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages libedit) + #:use-module (gnu packages hurd) #:use-module (gnu packages linux) #:use-module (gnu packages logging) #:use-module (gnu packages m4) @@ -136,6 +138,7 @@ a server that supports the SSH-2 protocol.") (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" "openssh-" version ".tar.gz")) + (patches (search-patches "openssh-hurd.patch")) (sha256 (base32 "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3")))) @@ -147,7 +150,9 @@ a server that supports the SSH-2 protocol.") ("pam" ,linux-pam) ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) - ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y' + ,@(if (hurd-target?) + '() + `(("xauth" ,xauth))))) ; for 'ssh -X' and 'ssh -Y' (arguments `(#:test-target "tests" ;; Otherwise, the test scripts try to use a nonexistent directory and -- cgit v1.2.3 From 541122957c68a15f8657775e62448b1cfafd7cb8 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 7 Apr 2020 20:49:13 +0200 Subject: gnu: guile-json: Cross-build fix. * gnu/packages/patches/guile-json-cross.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/guile.scm (guile-json-3)[source]: Use it. [arguments]: Remove configure to trigger bootstrap phase. --- gnu/local.mk | 1 + gnu/packages/guile.scm | 13 +++++-- gnu/packages/patches/guile-json-cross.patch | 54 +++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/guile-json-cross.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8deea48951..8705a96a36 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1020,6 +1020,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ + %D%/packages/patches/guile-json-cross.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-relocatable.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d69dee51c9..8ccbc22f26 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -526,12 +526,21 @@ specification. These are the main features: (method url-fetch) (uri (string-append "mirror://savannah/guile-json/guile-json-" version ".tar.gz")) + (patches (search-patches "guile-json-cross.patch")) (sha256 (base32 "14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz")))) - (native-inputs `(("pkg-config" ,pkg-config) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) ("guile" ,guile-3.0))) - (inputs `(("guile" ,guile-3.0))))) + (inputs `(("guile" ,guile-3.0))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-configure + (lambda _ + (delete-file "configure") + #t))))))) (define-public guile2.2-json (package-for-guile-2.2 guile-json-3)) diff --git a/gnu/packages/patches/guile-json-cross.patch b/gnu/packages/patches/guile-json-cross.patch new file mode 100644 index 0000000000..b9081f3df2 --- /dev/null +++ b/gnu/packages/patches/guile-json-cross.patch @@ -0,0 +1,54 @@ +Patch accepted upstream. + +From 9bbe0d78391c6dbe0316aa56a105d1966fddc9f0 Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Wed, 4 Mar 2020 11:17:02 +0100 +Subject: [PATCH] build: Support cross building. + +* configure.ac: Add AC_CANONICAL_HOST to get host. +* Makefile.am (.scm.go): Set it as target. +* json/Makefile.am (.scm.go): Likewise. +--- + Makefile.am | 2 +- + configure.ac | 1 + + json/Makefile.am | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 996f18b..1823a3f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -42,7 +42,7 @@ nobase_nodist_obj_DATA = $(GOBJECTS) + GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat + SUFFIXES = .scm .go + .scm.go: +- $(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<" ++ $(top_builddir)/env $(GUILD) compile --target="$(host)" $(GUILE_WARNINGS) -o "$@" "$<" + + SOURCES = json.scm + +diff --git a/configure.ac b/configure.ac +index fbc1aff..937dcf7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,7 @@ AC_CONFIG_SRCDIR(json.scm) + AC_CONFIG_AUX_DIR([build-aux]) + AM_INIT_AUTOMAKE([color-tests -Wall -Wno-portability]) + AM_SILENT_RULES([yes]) ++AC_CANONICAL_HOST + + dnl We require pkg.m4 (from pkg-config) and guile.m4. + dnl Make sure they are available. +diff --git a/json/Makefile.am b/json/Makefile.am +index adf5972..103b867 100644 +--- a/json/Makefile.am ++++ b/json/Makefile.am +@@ -36,4 +36,4 @@ CLEANFILES = $(GOBJECTS) + GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat + SUFFIXES = .scm .go + .scm.go: +- $(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<" ++ $(top_builddir)/env $(GUILD) compile --target="$(host)" $(GUILE_WARNINGS) -o "$@" "$<" +-- +2.26.0 + -- cgit v1.2.3 From 7eee37cd56595628ebf3829f1b8b6d526204818c Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 10 Apr 2020 07:34:03 +0200 Subject: gnu: gnutls-3.6.13: Cross-build fix. * gnu/packages/patches/gnutls-cross.patch: New file. * gnu/packages/tls.scm (gnutls-3.6.13)[source]: Use it. [native-inputs]: If cross-compiling, add native guile-3.0. This actually cross compiles .go modules. --- gnu/local.mk | 1 + gnu/packages/patches/gnutls-cross.patch | 82 +++++++++++++++++++++++++++++++++ gnu/packages/tls.scm | 10 +++- 3 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/gnutls-cross.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8705a96a36..0d49838398 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1003,6 +1003,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ + %D%/packages/patches/gnutls-cross.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ diff --git a/gnu/packages/patches/gnutls-cross.patch b/gnu/packages/patches/gnutls-cross.patch new file mode 100644 index 0000000000..82d08da24e --- /dev/null +++ b/gnu/packages/patches/gnutls-cross.patch @@ -0,0 +1,82 @@ +Not sent upstream. + +From e23de62e28f64599148ff06e439fac116a391299 Mon Sep 17 00:00:00 2001 +From: "Jan (janneke) Nieuwenhuizen" +Date: Fri, 10 Apr 2020 07:24:48 +0200 +Subject: [PATCH] guile: Cross build fix. + +To cross-build, both the host guile and the native guile-for-build +must be available. If the native guile is not available, no snarfing +is done and the guile cross build is skipped. + +During the cross-build gnutls.scm does not load when compliling +extra.scm, becase of missing definitions from guile-gnutls-v-2. + +* guile/modules/gnutls.in (protocol/ssl-3 protocol/tls-1.0, +protocol/tls-1.1, credentials/anonymous, cipher/rijndael-256-cbc, +cipher/rijndael-128-cbc, cipher/rijndael-cbc, cipher/arcfour-128, +certificate-verify/allow-any-x509-v1-ca-certificate, +certificate-verify/allow-x509-v1-ca-certificate): Define to #f +initially. When "GNUTLS_GUILE_CROSS_COMPILING" not set, set! to value +from "guile-gnutls-v-2" load-extension C module. +--- + guile/modules/gnutls.in | 40 +++++++++++++++++++++++++++------------- + 1 file changed, 27 insertions(+), 13 deletions(-) + +diff --git a/guile/modules/gnutls.in b/guile/modules/gnutls.in +index 6461c404a..954e315de 100644 +--- a/guile/modules/gnutls.in ++++ b/guile/modules/gnutls.in +@@ -564,22 +564,36 @@ This defines 'variable' as an alias for 'alias', and emits a warning when + (identifier? #'id) + #'alias)))))))))) + +- + ;; Renaming. +-(define protocol/ssl-3 protocol/ssl3) +-(define protocol/tls-1.0 protocol/tls1-0) +-(define protocol/tls-1.1 protocol/tls1-1) ++(define protocol/ssl-3 #f) ++(define protocol/tls-1.0 #f) ++(define protocol/tls-1.1 #f) + + ;; Aliases. +-(define credentials/anonymous credentials/anon) +-(define cipher/rijndael-256-cbc cipher/aes-256-cbc) +-(define cipher/rijndael-128-cbc cipher/aes-128-cbc) +-(define cipher/rijndael-cbc cipher/aes-128-cbc) +-(define cipher/arcfour-128 cipher/arcfour) +-(define certificate-verify/allow-any-x509-v1-ca-certificate +- certificate-verify/allow-any-x509-v1-ca-crt) +-(define certificate-verify/allow-x509-v1-ca-certificate +- certificate-verify/allow-x509-v1-ca-crt) ++(define credentials/anonymous #f) ++(define cipher/rijndael-256-cbc #f) ++(define cipher/rijndael-128-cbc #f) ++(define cipher/rijndael-cbc #f) ++(define cipher/arcfour-128 #f) ++(define certificate-verify/allow-any-x509-v1-ca-certificate #f) ++(define certificate-verify/allow-x509-v1-ca-certificate #f) ++ ++(unless (getenv "GNUTLS_GUILE_CROSS_COMPILING") ++ ;; Renaming. ++ (set! protocol/ssl-3 protocol/ssl3) ++ (set! protocol/tls-1.0 protocol/tls1-0) ++ (set! protocol/tls-1.1 protocol/tls1-1) ++ ++ ;; Aliases. ++ (set! credentials/anonymous credentials/anon) ++ (set! cipher/rijndael-256-cbc cipher/aes-256-cbc) ++ (set! cipher/rijndael-128-cbc cipher/aes-128-cbc) ++ (set! cipher/rijndael-cbc cipher/aes-128-cbc) ++ (set! cipher/arcfour-128 cipher/arcfour) ++ (set! certificate-verify/allow-any-x509-v1-ca-certificate ++ certificate-verify/allow-any-x509-v1-ca-crt) ++ (set! certificate-verify/allow-x509-v1-ca-certificate ++ certificate-verify/allow-x509-v1-ca-crt)) + + ;; Deprecated OpenPGP bindings. + (define-deprecated certificate-type/openpgp) +-- +2.26.0 + diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 2b1deb1000..27d38ed258 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -260,10 +260,16 @@ required structures.") (uri (string-append "mirror://gnupg/gnutls/v" (version-major+minor version) "/gnutls-3.6.13.tar.xz")) - (patches (search-patches "gnutls-skip-trust-store-test.patch")) + (patches (search-patches "gnutls-skip-trust-store-test.patch" + "gnutls-cross.patch")) (sha256 (base32 - "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j")))))) + "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j")))) + (native-inputs + `(,@(if (%current-target-system) ;for cross-build + `(("guile" ,guile-3.0)) ;to create .go files + '()) + ,@(package-native-inputs gnutls))))) (define-public gnutls/guile-2.0 ;; GnuTLS for Guile 2.0. -- cgit v1.2.3 From 2d1f79229cb28505c3aab6dc0d6d7bab864bd406 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 17:56:06 +0200 Subject: gnu: pcmanfm-qt: Remove obsolete workaround. * gnu/packages/lxqt.scm (pcmanfm-qt)[inputs]: Remove GLIB:BIN. [arguments]: Remove phase 'wrap-glib'. --- gnu/packages/lxqt.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index a440491633..a5a15e583b 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -994,8 +994,7 @@ components to build desktop file managers which belongs to LXDE.") (base32 "0x3c25inlxll965xszx37mnl5gp3smm2h7x04f67z0qlh3vsbrjq")))) (build-system cmake-build-system) (inputs - `(("glib:bin" ,glib "bin") - ("libfm-qt" ,libfm-qt) + `(("libfm-qt" ,libfm-qt) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -1011,17 +1010,7 @@ components to build desktop file managers which belongs to LXDE.") (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) - #t)) - (add-after 'install 'wrap-glib - (lambda* (#:key outputs inputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (glib (assoc-ref inputs "glib:bin")) - (gio-exe-path (string-append glib "/bin/gio-launch-desktop"))) - (if (file-exists? gio-exe-path) - (wrap-program (string-append out "/bin/pcmanfm-qt") - `("GIO_LAUNCH_DESKTOP" = (,gio-exe-path))) - (error "could not find gio-launch-desktop")) - #t)))))) + #t))))) (home-page "https://lxqt.org/") (synopsis "File manager and desktop icon manager") (description "PCManFM-Qt is the Qt port of PCManFM, the file manager of -- cgit v1.2.3 From 8035e63cd65d4f101745407bbaf7895bfc00684e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 18:46:01 +0200 Subject: gnu: moarvm: Propagate libffi. * gnu/packages/perl6.scm (moarvm)[inputs]: Move LIBFFI ... [propagated-inputs]: ... here. --- gnu/packages/perl6.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index ef46c00385..04e37a3b85 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -74,10 +74,9 @@ ;; These should be inputs but moar.h can't find them when building rakudo (propagated-inputs `(("libatomic-ops" ,libatomic-ops) + ("libffi" ,libffi) ("libtommath" ,libtommath-1.0) ("libuv" ,libuv))) - (inputs - `(("libffi" ,libffi))) (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "VM for NQP And Rakudo Perl 6") -- cgit v1.2.3 From 94cbae1b8901f9fdfdfb89d0880619727654ac65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Apr 2020 19:39:47 +0200 Subject: gnu: perl-ev: Update to 4.31. * gnu/packages/libevent.scm (perl-ev): Update to 4.31. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 608264f2f4..dab574a155 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -170,14 +170,14 @@ not rely on XS.") (define-public perl-ev (package (name "perl-ev") - (version "4.25") + (version "4.31") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-" version ".tar.gz")) (sha256 (base32 - "0slw68zxrkfribf6lhggdhpay3mdng0nqxlglkwrk19myblchr9f")) + "1jxlhnvrqim39977zwavjrcbdf9bifb46pwaxvm0s8klq121kjwb")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 13d25c546010ded6a275f167497386e6e253b54e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Apr 2020 19:45:02 +0200 Subject: gnu: python2-backports-shutil-get-terminal-size: Fix test failure. * gnu/packages/python-xyz.scm (python2-backports-shutil-get-terminal-size)[arguments]: In the check phase, set PYTHONPATH before running the tests. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ba00670459..e5f7808baf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7196,6 +7196,8 @@ Python 2 and Python 3.") (modify-phases %standard-phases (replace 'check (lambda _ + (setenv "PYTHONPATH" (string-append "./build/lib:" + (getenv "PYTHONPATH"))) (invoke "py.test" "-v")))))) (native-inputs `(("python2-pytest" ,python2-pytest))) -- cgit v1.2.3 From 9d89818a359dd0657e4eb7649b29ad4197b8db39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Apr 2020 20:00:29 +0200 Subject: gnu: autogen: Disable parallel tests. * gnu/packages/autogen.scm (autogen)[arguments]: Add #:parallel-tests?. --- gnu/packages/autogen.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/autogen.scm b/gnu/packages/autogen.scm index 034db2ee96..968337ad8d 100644 --- a/gnu/packages/autogen.scm +++ b/gnu/packages/autogen.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014 Eric Bavier ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,10 @@ ;; “Something went wrong bootstrapping makefile fragments for ;; automatic dependency tracking. Try re-running configure with […]” (list "--disable-dependency-tracking") + + ;; XXX: Parallel tests may cause an indefinite hang with GNU Make 4.3. + #:parallel-tests? #f + #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'patch-test-scripts -- cgit v1.2.3 From 87bb750a7e8dd1f6cd21033b0cd47d77adfd83fe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Apr 2020 20:30:31 +0200 Subject: gnu: icu4c: Remove redundant icu4c-66.1 variable. * gnu/packages/icu4c.scm (icu4c-66.1): Remove variable. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change from ICU4C-66.1 to ICU4C. --- gnu/packages/chromium.scm | 2 +- gnu/packages/icu4c.scm | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 3625eb7964..d92d463e03 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -786,7 +786,7 @@ from forcing GEXP-PROMISE." ("glib" ,glib) ("gtk+" ,gtk+) ("harfbuzz" ,harfbuzz) - ("icu4c" ,icu4c-66.1) + ("icu4c" ,icu4c) ("jsoncpp" ,jsoncpp) ("lcms" ,lcms) ("libevent" ,libevent) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index d8a898263a..cf76c6fe20 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -114,24 +114,6 @@ C/C++ part.") #t))))))) (native-inputs '()))) -(define-public icu4c-66.1 - (package - (inherit icu4c) - (version "66.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/unicode-org/icu/releases/download/release-" - (string-map (lambda (x) (if (char=? x #\.) #\- x)) version) - "/icu4c-" - (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) - "-src.tgz")) - (patch-flags '("-p2")) - (patches (search-patches "icu4c-CVE-2020-10531.patch")) - (sha256 - (base32 - "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj")))))) - (define-public java-icu4j (package (name "java-icu4j") -- cgit v1.2.3 From 83e6b0640acf933ef54a674dbbadf71f51e8cc14 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Apr 2020 20:35:27 +0200 Subject: gnu: qgis: Do not use the deprecated sqlite-with-column-metadata. * gnu/packages/geo.scm (qgis)[inputs]: Change from SQLITE-WITH-COLUMN-METADATA to SQLITE. --- gnu/packages/geo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index f11eaeb7b2..a8f5153b32 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1985,7 +1985,7 @@ growing set of geoscientific methods.") ("qtwebkit" ,qtwebkit) ("qwt" ,qwt) ("saga" ,saga) - ("sqlite" ,sqlite-with-column-metadata))) + ("sqlite" ,sqlite))) (native-inputs `(("bison" ,bison) ("flex" ,flex) -- cgit v1.2.3 From f7cbf403efa5368b5585f763262b152577339919 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Apr 2020 22:29:35 +0200 Subject: gnu: dune-istl: Fix build failure. * gnu/packages/maths.scm (dune-istl)[arguments]: Add phase 'hide-gfortran'. --- gnu/packages/maths.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e3d3216eab..08e0e7dd7a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4863,6 +4863,18 @@ This package contains the basic DUNE grid classes.") (arguments `(#:phases (modify-phases %standard-phases + ;; XXX: istl/test/matrixtest.cc includes and fails to find + ;; the stdlib types when the gfortran header is used. Remove gfortran + ;; from CPLUS_INCLUDE_PATH as a workaround. + (add-after 'set-paths 'hide-gfortran + (lambda* (#:key inputs #:allow-other-keys) + (let ((gfortran (assoc-ref inputs "gfortran"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gfortran "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) + ":")) + #t))) (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags)))))) -- cgit v1.2.3 From 109bf6a0e7111a75a54924be8a58c0fbc9a55c7d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Apr 2020 22:30:05 +0200 Subject: gnu: dune-localfunctions: Fix build failure. * gnu/packages/maths.scm (dune-localfunctions)[arguments]: Add phase 'hide-gfortran'. --- gnu/packages/maths.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 08e0e7dd7a..b814105a36 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4921,6 +4921,18 @@ aggregation-based algebraic multigrid.") (arguments `(#:phases (modify-phases %standard-phases + ;; XXX: localfunctions/test/lagrangeshapefunctiontest.cc includes + ;; and fails to find the stdlib types when the gfortran header is used. + ;; Hide gfortran from CPLUS_INCLUDE_PATH to ensure we get the GCC header. + (add-after 'set-paths 'hide-gfortran + (lambda* (#:key inputs #:allow-other-keys) + (let ((gfortran (assoc-ref inputs "gfortran"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gfortran "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) + ":")) + #t))) (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags)))))) -- cgit v1.2.3 From a4f1a7e2db22cd028fb514846c2791928b8734d3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 15 Apr 2020 02:03:26 -0400 Subject: gnu: linphoneqt: Fix reproducibility issue and improve description. * gnu/packages/linphone.scm (linphoneqt)[phases]: Rename the 'patch phase to 'set-version-string, and use the version variable of the package in the replacement. {set-qt-rcc-source-date-override, fix-cmake-error}: Add phases. [synopsis]: Explicit what the package is. [description]: Mention more useful keywords and features. --- gnu/packages/linphone.scm | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 6278dcaba7..e18d04bd06 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -488,13 +488,27 @@ and video calls or instant messaging capabilities to an application.") (arguments `(#:tests? #f ; No test target #:phases - ;; For replacing undeclared variable. (modify-phases %standard-phases - (add-after 'unpack 'patch + (add-after 'set-paths 'set-qt-rcc-source-date-override + (lambda _ + ;; This fixes a reproducibility problem where the Qt Resource + ;; Compiler (RCC) includes timestamp of the its source files + ;; (see: https://reproducible-builds.org/docs/ + ;; deterministic-build-systems/#cmake-notes) + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (add-after 'unpack 'fix-cmake-error + (lambda _ + ;; This is fixed in commit efed2fd8 of the master branch. + (substitute* "CMakeLists.txt" + (("js)\\$\"") + "js$\"")) + #t)) + (add-after 'unpack 'set-version-string (lambda _ (substitute* "src/app/AppController.cpp" (("LINPHONE_QT_GIT_VERSION") - "\"4.1.1\"")) + (format #f "~s" ,version))) #t))))) (native-inputs `(("qttools" ,qttools))) @@ -509,10 +523,24 @@ and video calls or instant messaging capabilities to an application.") ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg))) - (synopsis "Belledonne Communications Softphone Application") - (description "Linphone is a softphone for voice and video over IP calling -and instant messaging. It is fully SIP-based, for all calling, presence -and IM features.") + (synopsis "Desktop client for the Linphone SIP softphone") + (description "Linphone is a SIP softphone for voice and video over IP calling +(VoIP) and instant messaging. Amongst its features are: +@itemize +@item High Definition (HD) audio and video calls +@item Multiple call management (pause and resume) +@item Call transfer +@item Audio conferencing (merge calls into a conference call) +@item Call recording and replay (audio only) +@item Instant Messaging with message delivery status (IMDN) +@item Picture and file sharing +@item Echo cancellation +@item Secure user authentication using TLS client certificates +@item SRTP, zRTP and SRTP-DTLS voice and video encryption +@item Telephone tone (DTMF) support using SIP INFO or RFC 4733 +@item Audio codecs: opus, speex, g711, g729, gsm, iLBC, g722, SILK, etc. +@item Video codecs: VP8, H.264 and H.265 with resolutions up to 1080P, MPEG4 +@end itemize") (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop") (license license:gpl2+))) -- cgit v1.2.3 From 1988ef21f82430d4b380dd4887160a902d8796fd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 15 Apr 2020 23:57:02 -0400 Subject: gnu: linphone: Reformat code to respect coding style conventions. * gnu/packages/linphone.scm (bcunit, belr, belcard, bcmatroska2, bzrtp) (belle-sip, mediastreamer2, msopenh264, mssilk, msamr): Adjust code formatting to meet the 80 characters line width convention, along with other minor cosmetic edits. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 136 +++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 73 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index e18d04bd06..779ddf8cb7 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -69,12 +69,11 @@ (arguments '(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=NO"))) ; Not required + (list "-DENABLE_STATIC=NO"))) ; Not required (synopsis "Belledonne Communications Unit Testing Framework") - (description "BCUnit is a fork of the defunct project CUnit, -with several fixes and patches applied. It is an unit testing -framework for writing, administering, and running unit tests in C.") + (description "BCUnit is a fork of the defunct project CUnit, with several +fixes and patches applied. It is an unit testing framework for writing, +administering, and running unit tests in C.") (home-page "https://gitlab.linphone.org/BC/public/bcunit") (license license:lgpl2.0+))) @@ -94,8 +93,7 @@ framework for writing, administering, and running unit tests in C.") (arguments '(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=OFF"))) ; Not required + (list "-DENABLE_STATIC=OFF"))) ; Not required (inputs `(("bcunit" ,bcunit) ("mbedtls" ,mbedtls-apache))) @@ -121,14 +119,14 @@ Communications software like belle-sip, mediastreamer2 and linphone.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=OFF"))) ; Not required + (list "-DENABLE_STATIC=OFF"))) ; Not required (inputs `(("bctoolbox" ,bctoolbox))) (synopsis "Belledonne Communications Language Recognition Library") - (description "Belr is Belledonne Communications' language recognition library, -written in C++11. It parses text inputs formatted according to a language -defined by an ABNF grammar, such as the protocols standardized at IETF.") + (description "Belr is Belledonne Communications' language recognition +library, written in C++11. It parses text inputs formatted according to a +language defined by an ABNF grammar, such as the protocols standardized at +IETF.") (home-page "https://gitlab.linphone.org/BC/public/belr") (license license:gpl3+))) @@ -148,13 +146,13 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=OFF"))) ; Not required + (list "-DENABLE_STATIC=OFF"))) ; Not required (inputs `(("bctoolbox" ,bctoolbox) ("belr" ,belr))) (synopsis "Belledonne Communications VCard Library") - (description "Belcard is a C++ library to manipulate VCard standard format.") + (description "Belcard is a C++ library to manipulate VCard standard +format.") (home-page "https://gitlab.linphone.org/BC/public/belcard") (license license:gpl3+))) @@ -177,16 +175,16 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.") (list "-DENABLE_STATIC=NO"))) ; Not required (synopsis "Belledonne Communications Media Container") - (description "BcMatroska is a free and open standard multi-media -container format. It can hold an unlimited number of video, audio, -picture, or subtitle tracks in one file. ") + (description "BcMatroska is a free and open standard multi-media container +format. It can hold an unlimited number of video, audio, picture, or subtitle +tracks in one file. ") (home-page "https://gitlab.linphone.org/BC/public/bcmatroska2") (license (list - ;; That license applies for Core C and LibEBML2. + ;; For Core C and LibEBML2. ;; https://www.matroska.org/node/47 license:bsd-4 - ;; That license applies for LibMatroska2. + ;; For LibMatroska2. ;; https://www.matroska.org/node/47 license:lgpl2.1+)))) @@ -206,8 +204,7 @@ picture, or subtitle tracks in one file. ") (arguments `(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=NO"))) ; Not required + (list "-DENABLE_STATIC=NO"))) ; Not required (synopsis "Belledonne Communications G729 Codec") (description "BcG729 is an implementation of both encoder and decoder of the ITU G729 speech codec. The library written in C 99 is fully portable and @@ -233,8 +230,7 @@ such as conferencing.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=NO"))) ; Not required + (list "-DENABLE_STATIC=NO"))) ; Not required (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen))) @@ -262,16 +258,15 @@ implements the RFC 3550 standard.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=NO"))) + (list "-DENABLE_STATIC=NO"))) ; Not required (inputs `(("bctoolbox" ,bctoolbox) ("sqlite3" ,sqlite) ("xml2" ,libxml2))) (synopsis "Belledonne Communications ZRTP Library") - (description "BZRTP is an implementation of ZRTP keys exchange -protocol, written in C. It is fully portable and can be executed on many -platforms including both ARM and x86.") + (description "BZRTP is an implementation of ZRTP keys exchange protocol, +written in C. It is fully portable and can be executed on many platforms +including both ARM and x86.") (home-page "https://gitlab.linphone.org/BC/public/bzrtp") (license license:gpl2+))) @@ -291,16 +286,15 @@ platforms including both ARM and x86.") (arguments `(#:tests? #f ; Requires network access #:configure-flags - (list - "-DENABLE_STATIC=NO") + (list "-DENABLE_STATIC=NO") ; Not required #:phases (modify-phases %standard-phases (add-after 'unpack 'patch (lambda _ (substitute* "src/CMakeLists.txt" - ;; ANTLR would use multithreaded DFA generation - ;; otherwise--which would not be reproducible. - (("-Xmultithreaded ") "")) + ;; ANTLR would use multithreaded DFA generation otherwise, + ;; which would not be reproducible. + (("-Xmultithreaded ") "")) #t))))) (inputs `(("antlr3" ,antlr3-3.3) @@ -333,12 +327,11 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_STRICT=NO" ; Would otherwise treat warnings as err - "-DENABLE_BV16=NO" ; Not available - "-DCMAKE_C_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"" - "-DCMAKE_CXX_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"") + (list "-DENABLE_STATIC=NO" ; Not required + "-DENABLE_STRICT=NO" ; Would otherwise treat warnings as err + "-DENABLE_BV16=NO" ; Not available + "-DCMAKE_C_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"" + "-DCMAKE_CXX_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"") #:phases (modify-phases %standard-phases (add-after 'install 'separate-outputs @@ -395,13 +388,12 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") ("vpx" ,libvpx) ("x11" ,libx11) ("xv" ,libxv) - ("zrtp", bzrtp))) + ("zrtp" ,bzrtp))) (synopsis "Belledonne Communications Streaming Engine") - (description "Mediastreamer2 is a powerful and lightweight -streaming engine for telephony applications. This media processing -and streaming toolkit is responsible for receiving and sending all -multimedia streams in Linphone, including media capture, encoding and -decoding, and rendering.") + (description "Mediastreamer2 is a powerful and lightweight streaming engine +for telephony applications. This media processing and streaming toolkit is +responsible for receiving and sending all multimedia streams in Linphone, +including media capture, encoding and decoding, and rendering.") (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2") (license license:gpl2+))) @@ -421,16 +413,15 @@ decoding, and rendering.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list - (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR=" - (string-append (assoc-ref %build-inputs "gtk2") - "/lib/gtk-2.0/include")) - (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR=" - (string-append (assoc-ref %build-inputs "glib") - "/lib/glib-2.0/include")) - "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_STRICT=NO" - "-DENABLE_GTK_UI=YES") ; for legacy UI + (list (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR=" + (string-append (assoc-ref %build-inputs "gtk2") + "/lib/gtk-2.0/include")) + (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR=" + (string-append (assoc-ref %build-inputs "glib") + "/lib/glib-2.0/include")) + "-DENABLE_STATIC=NO" ; Not required + "-DENABLE_STRICT=NO" + "-DENABLE_GTK_UI=YES") ; for legacy UI #:phases (modify-phases %standard-phases (add-after 'unpack 'patch @@ -492,9 +483,9 @@ and video calls or instant messaging capabilities to an application.") (add-after 'set-paths 'set-qt-rcc-source-date-override (lambda _ ;; This fixes a reproducibility problem where the Qt Resource - ;; Compiler (RCC) includes timestamp of the its source files + ;; Compiler (RCC) includes timestamp of its source files ;; (see: https://reproducible-builds.org/docs/ - ;; deterministic-build-systems/#cmake-notes) + ;; deterministic-build-systems/#cmake-notes). (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") #t)) (add-after 'unpack 'fix-cmake-error @@ -562,17 +553,18 @@ and video calls or instant messaging capabilities to an application.") (origin (method url-fetch) (uri - (string-append "https://gitlab.linphone.org/BC/public/msopenh264/commit/" - "493d147d28c9a0f788ba4e50b47a1ce7b18bf326.diff")) + (string-append "https://gitlab.linphone.org/BC/public/msopenh264/" + "commit/493d147d28c9a0f788ba4e50b47a1ce7b18bf326" + ".diff")) (file-name "msopenh264-openh264.patch") (sha256 - (base32 "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb"))))))) + (base32 + "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb"))))))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=NO"))) ; Not required + (list "-DENABLE_STATIC=NO"))) ; Not required (inputs `(("mediastreamer2" ,mediastreamer2) ("openh264" ,openh264) @@ -599,14 +591,13 @@ mediastreamer2 based on the openh264 library.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=NO"))) ; Not required + (list "-DENABLE_STATIC=NO"))) ; Not required (inputs `(("mediastreamer2" ,mediastreamer2) ("ortp" ,ortp))) (synopsis "Media Streamer SILK Codec") - (description "MSSILK is a plugin of MediaStreamer, adding support for -AMR codec. It is based on the Skype's SILK implementation.") + (description "MSSILK is a plugin of MediaStreamer, adding support for AMR +codec. It is based on the Skype's SILK implementation.") (home-page "https://gitlab.linphone.org/BC/public/mssilk") (license license:gpl2+))) @@ -627,7 +618,7 @@ AMR codec. It is based on the Skype's SILK implementation.") `(#:tests? #f ; No test target #:configure-flags (list - "-DENABLE_STATIC=NO"))) + "-DENABLE_STATIC=NO"))) ; Not required (inputs `(("bctoolbox" ,bctoolbox) ("mediastreamer2" ,mediastreamer2) @@ -654,16 +645,15 @@ WebRTC codec. It includes features from WebRTC, such as, iSAC and AECM.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list - "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_WIDEBAND=YES"))) + (list "-DENABLE_STATIC=NO" ; Not required + "-DENABLE_WIDEBAND=YES"))) (inputs `(("mediastreamer2" ,mediastreamer2) ("opencoreamr" ,opencore-amr) ("ortp" ,ortp) ("voamrwbenc" ,vo-amrwbenc))) (synopsis "Media Streamer AMR Codec") - (description "MSAMR is a plugin of MediaStreamer, adding support for -AMR codec. It is based on the opencore-amr implementation.") + (description "MSAMR is a plugin of MediaStreamer, adding support for AMR +codec. It is based on the opencore-amr implementation.") (home-page "https://gitlab.linphone.org/BC/public/msamr") (license license:gpl3+))) -- cgit v1.2.3 From cfd7fc6dd93d47857f450ec4cd49cf2f82b9fae1 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 17 Apr 2020 19:27:07 +0200 Subject: news: Add entry for the further reduced (aka Scheme-only) bootstrap. * etc/news.scm: Add entry for the further reduced (aka Scheme-only) bootstrap. --- etc/news.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index 61fc6b6255..b498ce139d 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -2,6 +2,7 @@ ;; ;; Copyright © 2019, 2020 Ludovic Courtès ;; Copyright © 2020 Mathieu Othacehe +;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;; ;; Copying and distribution of this file, with or without modification, are ;; permitted in any medium without royalty provided the copyright notice and @@ -10,6 +11,15 @@ (channel-news (version 0) + (entry (commit "2ca7af43fe17d9acf082dce85d137a27a8ac4887") + (title (en "Further reduced binary seed bootstrap")) + (body + (en "The package graph on x86_64 and i686 is now rooted in a further +@dfn{reduced set of binary seeds}. The initial set of binaries from which +packages are built now weighs in at approximately 60 MiB, a quarter of what it +used to be. Run @code{info \"(guix) Bootstrapping\"} to learn more, or watch +the talk at @uref{https://fosdem.org/2020/schedule/event/gnumes/}."))) + (entry (commit "0468455e7d279c89ea3ad1b51935efb2b785ec47") (title (en "Rottlog service added to @code{%base-services}") (de "Rottlog-Dienst ist nun Teil der @code{%base-services}")) -- cgit v1.2.3 From 45fd28f76405df30070f161fe79365363d7103b3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 16 Apr 2020 10:26:11 -0400 Subject: gnu: linphoneqt: Fix crashes. The application was crashing when clicking on the Preferences menu or the conference icon. * gnu/packages/patches/linphoneqt-tabbutton.patch: Add file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/linphone.scm (linphoneqt)[source]: Use it. [inputs]: Add qtquickcontrols. Signed-off-by: Maxim Cournoyer --- gnu/local.mk | 1 + gnu/packages/linphone.scm | 4 +- gnu/packages/patches/linphoneqt-tabbutton.patch | 96 +++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/linphoneqt-tabbutton.patch diff --git a/gnu/local.mk b/gnu/local.mk index b11876d14d..5bfbaaa0a2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1188,6 +1188,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/linkchecker-tests-require-network.patch \ + %D%/packages/patches/linphoneqt-tabbutton.patch \ %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 779ddf8cb7..4f142312cc 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -474,7 +474,8 @@ and video calls or instant messaging capabilities to an application.") (string-append "https://www.linphone.org/releases/sources/" name "/" name "-" version ".tar.gz")) (sha256 - (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a")))) + (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a")) + (patches (search-patches "linphoneqt-tabbutton.patch")))) (build-system qt-build-system) (arguments `(#:tests? #f ; No test target @@ -512,6 +513,7 @@ and video calls or instant messaging capabilities to an application.") ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg))) (synopsis "Desktop client for the Linphone SIP softphone") diff --git a/gnu/packages/patches/linphoneqt-tabbutton.patch b/gnu/packages/patches/linphoneqt-tabbutton.patch new file mode 100644 index 0000000000..6b3214026e --- /dev/null +++ b/gnu/packages/patches/linphoneqt-tabbutton.patch @@ -0,0 +1,96 @@ +From ecaab0f73d0b74bbfbf150286305fa6e12970037 Mon Sep 17 00:00:00 2001 +From: Ronan Abhamon +Date: Fri, 19 Jan 2018 14:42:01 +0100 +Subject: [PATCH] fix(SettingsWindow): rename icon property of TabButton to + iconName (issue with Qt 5.10 and new icon property) + +--- + ui/modules/Common/Form/Tab/TabButton.qml | 8 ++++---- + ui/views/App/Settings/SettingsWindow.qml | 14 +++++++------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/ui/modules/Common/Form/Tab/TabButton.qml b/ui/modules/Common/Form/Tab/TabButton.qml +index ad220ab2..a47bb20b 100644 +--- a/ui/modules/Common/Form/Tab/TabButton.qml ++++ b/ui/modules/Common/Form/Tab/TabButton.qml +@@ -12,8 +12,8 @@ Controls.TabButton { + + // --------------------------------------------------------------------------- + +- property string icon + property int iconSize: TabButtonStyle.icon.size ++ property string iconName + + readonly property bool _isSelected: parent.parent.currentItem === button + +@@ -66,9 +66,9 @@ Controls.TabButton { + Layout.leftMargin: TabButtonStyle.text.leftPadding + + icon: { +- var icon = button.icon +- return icon.length +- ? (icon + '_' + (button._isSelected ? 'selected' : 'normal')) ++ var iconName = button.iconName ++ return iconName.length ++ ? (iconName + '_' + (button._isSelected ? 'selected' : 'normal')) + : '' + } + iconSize: button.iconSize +diff --git a/ui/views/App/Settings/SettingsWindow.qml b/ui/views/App/Settings/SettingsWindow.qml +index b8f5a80f..58909544 100644 +--- a/ui/views/App/Settings/SettingsWindow.qml ++++ b/ui/views/App/Settings/SettingsWindow.qml +@@ -48,43 +48,43 @@ ApplicationWindow { + id: tabBar + + TabButton { +- icon: 'settings_sip_accounts' ++ iconName: 'settings_sip_accounts' + text: qsTr('sipAccountsTab') + width: implicitWidth + } + + TabButton { +- icon: 'settings_audio' ++ iconName: 'settings_audio' + text: qsTr('audioTab') + width: implicitWidth + } + + TabButton { +- icon: 'settings_video' ++ iconName: 'settings_video' + text: qsTr('videoTab') + width: implicitWidth + } + + TabButton { +- icon: 'settings_call' ++ iconName: 'settings_call' + text: qsTr('callsAndChatTab') + width: implicitWidth + } + + TabButton { +- icon: 'settings_network' ++ iconName: 'settings_network' + text: qsTr('networkTab') + width: implicitWidth + } + + TabButton { +- icon: 'settings_advanced' ++ iconName: 'settings_advanced' + text: qsTr('uiTab') + width: implicitWidth + } + + TabButton { +- icon: 'settings_advanced' ++ iconName: 'settings_advanced' + text: qsTr('uiAdvanced') + width: implicitWidth + } +-- +2.21.0 + -- cgit v1.2.3 From cef392f3936922b7b0b74bd59be67e660c10db67 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 17 Apr 2020 18:16:19 +0100 Subject: guix: self: Use guile with libgc-7. Rather than libgc version 8. This should avoid crashes that can occur, particularly when loading data in to the Guix Data Service [1]. 1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525 * gnu/packages/guile.scm (guile-3.0/libgc-7): New variable. * guix/self.scm (specification->package): Use guile-3.0/libgc-7 for guile. --- gnu/packages/guile.scm | 11 +++++++++++ guix/self.scm | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8ccbc22f26..a262553ba1 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -309,6 +309,17 @@ without requiring the source code to be rewritten.") (define-public guile-next guile-3.0) +(define-public guile-3.0/libgc-7 + ;; Using libgc-7 avoid crashes that can occur, particularly when loading + ;; data in to the Guix Data Service: + ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525 + (hidden-package + (package + (inherit guile-3.0) + (propagated-inputs + `(("bdw-gc" ,libgc-7) + ,@(srfi-1:alist-delete "bdw-gc" (package-propagated-inputs guile-3.0))))))) + (define-public guile-3.0/fixed ;; A package of Guile that's rarely changed. It is the one used in the ;; `base' module, and thus changing it entails a full rebuild. diff --git a/guix/self.scm b/guix/self.scm index 842161400e..905f931aeb 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -48,7 +48,7 @@ (let ((ref (lambda (module variable) (module-ref (resolve-interface module) variable)))) (match-lambda - ("guile" (ref '(gnu packages guile) 'guile-3.0)) + ("guile" (ref '(gnu packages guile) 'guile-3.0/libgc-7)) ("guile-json" (ref '(gnu packages guile) 'guile-json-3)) ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) ("guile-git" (ref '(gnu packages guile) 'guile-git)) -- cgit v1.2.3 From e21788f2cc1a01ecf6ed273fbfc2764971caa291 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 14 Dec 2019 14:02:11 -0500 Subject: gnu: adwaita-icon-theme: Update to 3.34.3. * gnu/packages/gnome.scm (adwaita-icon-theme): Update to 3.34.3. (cherry picked from commit e8cccae4e1964df5bbe63c37bc5b23dea5e19709) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2e406c5485..435684a1cd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1742,7 +1742,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.") (define-public adwaita-icon-theme (package (inherit gnome-icon-theme) (name "adwaita-icon-theme") - (version "3.32.0") + (version "3.34.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1750,7 +1750,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.") name "-" version ".tar.xz")) (sha256 (base32 - "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9")))) + "025rj1fskw1y448hiar4a9icyzpyr242nlh9xhsmyp8jb71dihp7")))) (native-inputs `(("gtk-encode-symbolic-svg" ,gtk+ "bin"))))) -- cgit v1.2.3 From 7f4d075d3e41df83f3a5897c15d9292d84a77cb0 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 14 Dec 2019 18:05:40 -0500 Subject: gnu: dconf: Update to 3.34.0. * gnu/packages/gnome.scm (dconf): Update to 3.34.0. (cherry picked from commit a720afbc4e0b7366261e5c4784fc9bb807bd4f87) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 435684a1cd..32d752d176 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3353,7 +3353,7 @@ and RDP protocols.") (define-public dconf (package (name "dconf") - (version "0.32.0") + (version "0.34.0") (source (origin (method url-fetch) (uri (string-append @@ -3363,7 +3363,7 @@ and RDP protocols.") (patches (search-patches "dconf-meson-0.52.patch")) (sha256 (base32 - "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38")))) + "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll")))) (build-system meson-build-system) (propagated-inputs ;; In Requires of dconf.pc. -- cgit v1.2.3 From 720aa20f350c0b42337b213d5dc299e82ac49759 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 14 Dec 2019 18:23:04 -0500 Subject: gnu: dconf-editor: Update to 3.34.2. * gnu/packages/gnome.scm (dconf-editor): Update to 3.34.2. [arguments]: Remove obsolete 'set-glib-minimum-version' phase. [home-page]: Follow permanent redirect. (cherry picked from commit 929ad4f3f3e33add34bd9eebebdd08e9476063b6) --- gnu/packages/gnome.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 32d752d176..a2df1d58c9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7608,7 +7608,7 @@ beautifying border effects.") (define-public dconf-editor (package (name "dconf-editor") - (version "3.32.0") + (version "3.34.2") (source (origin (method url-fetch) @@ -7617,19 +7617,8 @@ beautifying border effects.") name "-" version ".tar.xz")) (sha256 (base32 - "1fmsmlh16njjm948grz20mzrsvb4wjj7pl1fvkrkxqi7mhr177gi")))) + "0pwxjada2vaf69ihpjgp9nky54iykvxq63lp1vl8pxjanif2mk6f")))) (build-system meson-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'configure 'set-glib-minimum-version - (lambda _ - ;; Change the minimum required GLib version so that - ;; 'valac' is passed '--target-glib 2.60.0'; failing to - ;; do that, it complains that "55" is not an even - ;; number. See . - (substitute* "editor/meson.build" - (("2\\.55\\.1") "2.60.0")) - #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache @@ -7640,7 +7629,7 @@ beautifying border effects.") `(("dconf" ,dconf) ("gtk+" ,gtk+) ("libxml2" ,libxml2))) - (home-page "https://git.gnome.org/browse/dconf-editor") + (home-page "https://gitlab.gnome.org/GNOME/dconf-editor") (synopsis "Graphical editor for GNOME's dconf configuration system") (description "Dconf-editor is a graphical tool for browsing and editing the dconf -- cgit v1.2.3 From 0c9031fa1b6c1e043a8959f2ff707795c306795a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 14 Dec 2019 22:39:19 -0500 Subject: gnu: eog: Update to 3.34.1. * gnu/packages/gnome.scm (eog): Update to 3.34.1. [inputs]: Replace librsvg with librsvg-next. (cherry picked from commit 904227e94edbe97f4c28871a9d2e899936c08692) --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a2df1d58c9..dd98603abd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5015,7 +5015,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") (define-public eog (package (name "eog") - (version "3.32.2") + (version "3.34.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5023,7 +5023,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") name "-" version ".tar.xz")) (sha256 (base32 - "1bcxpqgzlk2cy4wfb3b5h66mhpj2fhrk1rrb5qqcv5xrr62ik5xy")))) + "0b7ld4azs9xbdjsk9b91ywhdzvxgajhndiwiivxjzbr0hjgp7c7x")))) (build-system meson-build-system) (arguments `(#:configure-flags @@ -5063,7 +5063,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") ("libexif" ,libexif) ("libpeas" ,libpeas) ("libjpeg" ,libjpeg-turbo) - ("librsvg" ,librsvg) + ("librsvg" ,librsvg-next) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+))) (home-page "https://wiki.gnome.org/Apps/EyeOfGnome") -- cgit v1.2.3 From 8a7afc8159991cdafb75f06aaafe6a01eb758c26 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 14 Dec 2019 23:01:00 -0500 Subject: gnu: gnome-desktop: Update to 3.34.2. * gnu/packages/gnome.scm (gnome-desktop): Update to 3.34.2. (cherry picked from commit 8ff022afb1da6ae4eb345e0f9836e285c137b9c2) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dd98603abd..8946cab755 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1216,7 +1216,7 @@ offline sources, providing a centralized place for managing your contacts.") (define-public gnome-desktop (package (name "gnome-desktop") - (version "3.32.2") + (version "3.34.2") (source (origin (method url-fetch) @@ -1225,7 +1225,7 @@ offline sources, providing a centralized place for managing your contacts.") name "-" version ".tar.xz")) (sha256 (base32 - "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9")))) + "1v983xirwp1y6ggz97bh742ak6gff0hxb359dgn37nikjxhvm0a0")))) (build-system meson-build-system) (arguments '(#:phases -- cgit v1.2.3 From 0856b0d976537b4ddc95995abc23ac55ef4c4db8 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 14 Dec 2019 23:08:32 -0500 Subject: gnu: gnome-backgrounds: Update to 3.34.0. * gnu/packages/gnome.scm (gnome-backgrounds): Update to 3.34.0. (cherry picked from commit 873082931dd5e25320cc77c7ba2bec1e36520f46) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8946cab755..399e994a19 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7546,7 +7546,7 @@ is complete it provides a graphical representation of each selected folder.") (define-public gnome-backgrounds (package (name "gnome-backgrounds") - (version "3.32.0") + (version "3.34.0") (source (origin (method url-fetch) @@ -7555,7 +7555,7 @@ is complete it provides a graphical representation of each selected folder.") name "-" version ".tar.xz")) (sha256 (base32 - "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz")))) + "0zxlwy55fz7i582hch2wnj8zy1kzikssgaix0l2y41ccp5nzpdy2")))) (build-system meson-build-system) (native-inputs `(("intltool" ,intltool))) -- cgit v1.2.3 From 8468117e457efb202c9964eedec2c3cdd149bba9 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 14 Dec 2019 23:09:16 -0500 Subject: gnu: gsettings-desktop-schemas: Update to 3.34.0. * gnu/packages/gnome.scm (gsettings-desktop-schemas): Update to 3.34.0. (cherry picked from commit fdfaefaaf4ee56a34276cbf6d431bf388518dd6a) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 399e994a19..4aa96cd160 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1631,7 +1631,7 @@ on the GNOME Desktop with a single simple application.") (define-public gsettings-desktop-schemas (package (name "gsettings-desktop-schemas") - (version "3.32.0") + (version "3.34.0") (source (origin (method url-fetch) @@ -1640,7 +1640,7 @@ on the GNOME Desktop with a single simple application.") name "-" version ".tar.xz")) (sha256 (base32 - "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d")))) + "1bayr76aylawf2fhyjhv9zgk4kpv7ivrrmd80khb0h3h1wk092r8")))) (build-system meson-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From c94db354c32e9f1cb4b308be0345ec19719e55da Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 14 Dec 2019 23:17:53 -0500 Subject: gnu: libdazzle: Update to 3.34.1. * gnu/packages/gnome.scm (libdazzle): Update to 3.34.1. (cherry picked from commit 781da7d80b6b3a8e48b922acb754a5ba47f1d98b) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4aa96cd160..b34c0663fe 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9241,7 +9241,7 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") (define-public libdazzle (package (name "libdazzle") - (version "3.33.90") + (version "3.34.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libdazzle/" @@ -9249,7 +9249,7 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") "libdazzle-" version ".tar.xz")) (sha256 (base32 - "189m7q88d1a7bq0yyal9f3yhm9kz46lb61379nn4wsnnhpa1d0qs")))) + "01cmcrd75b7ns7j2b4p6h7pv68vjhkcl9zbvzzx7pf4vknxir61x")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5a30f67fdba478847a33d92df919f85326616cd6 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 15 Dec 2019 09:38:04 -0500 Subject: gnu: epiphany: Update to 3.34.2. * gnu/packages/gnome.scm (epiphany): Update to 3.34.2. (cherry picked from commit 7c4411701354e84d877816e095f01c1075cbff9d) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b34c0663fe..b4d6217fdb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5360,7 +5360,7 @@ a secret password store, an adblocker, and a modern UI.") (define-public epiphany (package (name "epiphany") - (version "3.32.5") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -5368,7 +5368,7 @@ a secret password store, an adblocker, and a modern UI.") "epiphany-" version ".tar.xz")) (sha256 (base32 - "1hj4yy53fwh96h17cqiw3gxc070vmc7yqwc7phvhnpyinkp9g5my")))) + "18d48vcp2nxs63bddkdplslgbnlfq79pm2ivl8hk38kkggy3dahf")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From edec7128df4946a1094e3617c81167f9795fc5d7 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 15 Dec 2019 09:46:10 -0500 Subject: gnu: gedit: Update to 3.34.1. * gnu/packages/gnome.scm (gedit): Update to 3.34.1. (cherry picked from commit 49c537dab1cd4ff7aa154c5817e0c83c2ee02197) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b4d6217fdb..bc23967257 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5863,7 +5863,7 @@ javascript engine and the GObject introspection framework.") (define-public gedit (package (name "gedit") - (version "3.32.2") + (version "3.34.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5871,7 +5871,7 @@ javascript engine and the GObject introspection framework.") name "-" version ".tar.xz")) (sha256 (base32 - "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl")))) + "1inm50sdfw63by1lf4f1swb59mpyxlly0g5rdg99j5l3357fzygb")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From ea9f74b03208f985a6e377a7c8a8951654dcfb00 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 15 Dec 2019 10:01:46 -0500 Subject: gnu: glib-networking: Update to 2.62.2. * gnu/packages/gnome.scm (glib-networking): Update to 2.62.2. (cherry picked from commit 48d8c3b28f4edb2607e84334ffdf064850642318) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc23967257..fd2647cab6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3507,7 +3507,7 @@ library.") (define-public glib-networking (package (name "glib-networking") - (version "2.60.3") + (version "2.62.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glib-networking/" @@ -3515,7 +3515,7 @@ library.") "glib-networking-" version ".tar.xz")) (sha256 (base32 - "1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm")))) + "0i2mw75297ql72h47vyvff3hqa0kcmqybblj52fqrarb0kfbhi06")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dlibproxy_support=false"))) -- cgit v1.2.3 From e8f4bf6b42a640b91d843b0dd114e77f265798eb Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 16 Dec 2019 22:12:09 -0500 Subject: gnu: gnome-bluetooth: Update to 3.34.0. * gnu/packages/gnome.scm (gnome-bluetooth): Update to 3.34.0. (cherry picked from commit 9d875e791fcca55807cdce623842b80eac0bf345) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fd2647cab6..ef367da7b0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6949,7 +6949,7 @@ usage and information about running processes.") (define-public gnome-bluetooth (package (name "gnome-bluetooth") - (version "3.32.1") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6957,7 +6957,7 @@ usage and information about running processes.") name "-" version ".tar.xz")) (sha256 (base32 - "1am1gf0nzwg6x1s8ly13j0xnjzgrfj06j0dp52x4zy9s67ywlhb4")))) + "1bvbxcsjkyl0givy8nfm7112bq3c0vn1v89fdk2pip714dsfcrz8")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc. -- cgit v1.2.3 From 462d3416a871f97ae3de867e725f8c6e4f976731 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 16 Dec 2019 23:16:11 -0500 Subject: gnu: libgweather: Update to 3.34.0. * gnu/packages/gnome.scm (libgweather): Update to 3.34.0. (cherry picked from commit fea74bf26d1a77129da919f2eb7473c94a947200) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ef367da7b0..02b89ee539 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4145,7 +4145,7 @@ service via the system message bus.") (define-public libgweather (package (name "libgweather") - (version "3.28.3") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4153,7 +4153,7 @@ service via the system message bus.") name "-" version ".tar.xz")) (sha256 (base32 - "1xz60h59zgyk61y2wwzm0xlqav72i668g7v0x7rh9idz240hxls5")))) + "1fgiqswkhiaijanml3mb16ajn5aanrk7x6yiwagp9n9rssam6902")))) (build-system meson-build-system) (arguments `(#:tests? #f ; one of two tests requires network access -- cgit v1.2.3 From 162048be3b838e221e5256b0f670ac6f884f607a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 11:01:23 -0500 Subject: gnu: evolution-data-server: Update to 3.34.2. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.34.2. [arguments]: Adjust 'disable-failing-tests' phase. * gnu/packages/patches/evolution-data-server-libical-compat.patch: Update patch. (cherry picked from commit 3febbdc80004c907507dbf4162bf6e7bfde74d28) --- gnu/packages/gnome.scm | 11 ++--------- .../patches/evolution-data-server-libical-compat.patch | 16 ++++++++-------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 02b89ee539..8754c08b3c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6155,7 +6155,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.32.4") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6165,7 +6165,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "evolution-data-server-libical-compat.patch")) (sha256 (base32 - "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3")))) + "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y")))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -6192,13 +6192,6 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (delete-file-recursively "tests/book-migration") (substitute* "tests/CMakeLists.txt" (("add_subdirectory\\(book-migration\\)") "")) - ;; tests/libebook/client/test-book-client-view-operations:8077): - ;; e-data-server-WARNING **: - ;; (src/libedataserver/e-source-registry.c:264):thread_closure_free: - ;; runtime check failed: - ;; (!g_main_context_pending (closure->main_context)) - (substitute* "tests/libebook/client/CMakeLists.txt" - (("test-book-client-view-operations") "")) #t)) (add-after 'unpack 'patch-paths (lambda _ diff --git a/gnu/packages/patches/evolution-data-server-libical-compat.patch b/gnu/packages/patches/evolution-data-server-libical-compat.patch index a988519ea0..da4302d42e 100644 --- a/gnu/packages/patches/evolution-data-server-libical-compat.patch +++ b/gnu/packages/patches/evolution-data-server-libical-compat.patch @@ -8,29 +8,29 @@ Adapted from upstream: https://gitlab.gnome.org/GNOME/evolution-data-server/commit/77384ab552c19bf374dbeda53dc37f98d07bd4ec diff --git a/CMakeLists.txt b/CMakeLists.txt +index e16b8b225..b3c881967 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -108,7 +108,7 @@ +@@ -111,7 +111,7 @@ add_definitions(-DSOUP_VERSION_MIN_REQUIRED=${soup_encoded_version}) set(gcr_minimum_version 3.4) set(libgdata_minimum_version 0.15.1) --set(libical_minimum_version 2.0) -+set(libical_minimum_version 3.0.7) +-set(libical_glib_minimum_version 3.0.5) ++set(libical_glib_minimum_version 3.0.7) set(libsecret_minimum_version 0.5) set(libxml_minimum_version 2.0.0) set(sqlite_minimum_version 3.7.17) diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index 7501f2a43dcc3af91e93e89751caf76e77c2ac23..93f4806ba2c5193f746e9fae5bf74d08ad05f8bf 100644 +index 7501f2a43..93f4806ba 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c -@@ -3958,9 +3958,8 @@ +@@ -4067,8 +4067,7 @@ e_cal_meta_backend_inline_local_attachments_sync (ECalMetaBackend *meta_backend, gchar *base64; base64 = g_base64_encode ((const guchar *) content, len); -- new_attach = icalattach_new_from_data (base64, NULL, NULL); -+ new_attach = icalattach_new_from_data (base64, (GFunc) g_free, NULL); +- new_attach = i_cal_attach_new_from_data (base64, NULL, NULL); ++ new_attach = i_cal_attach_new_from_data (base64, (GFunc) g_free, NULL); g_free (content); - g_free (base64); ecmb_remove_all_but_filename_parameter (prop); - -- cgit v1.2.3 From 179699401908f41f00dd6e09e0adbf90480a6433 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 11:13:11 -0500 Subject: gnu: gnome-autoar: Update to 0.2.4. * gnu/packages/gnome.scm (gnome-autoar): Update to 0.2.4. [native-inputs]: Remove gnome-common. (cherry picked from commit 46d713ce690235450740616249f800b288bf0a51) --- gnu/packages/gnome.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8754c08b3c..34539c3e42 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7281,7 +7281,7 @@ as SASL, TLS and VeNCrypt. Additionally it supports encoding extensions.") (define-public gnome-autoar (package (name "gnome-autoar") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7289,14 +7289,13 @@ as SASL, TLS and VeNCrypt. Additionally it supports encoding extensions.") name "-" version ".tar.xz")) (sha256 (base32 - "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax")))) + "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a")))) (build-system glib-or-gtk-build-system) (native-inputs - `(("gnome-common" ,gnome-common) - ("gobject-introspection" ,gobject-introspection) + `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("libarchive" ,libarchive))) ; XXX document why + `(("libarchive" ,libarchive))) ; Required by gnome-autoar-0.pc (inputs `(("gtk+" ,gtk+))) (synopsis "Archives integration support for GNOME") -- cgit v1.2.3 From 0662fe86d2f161fd21267990383c1b1188df5a4b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 12:23:31 -0500 Subject: gnu: evolution: Update to 3.34.2. * gnu/packages/gnome.scm (evolution): Update to 3.34.2. [inputs]: Replace gtkspell3 with gspell. Remove evolution-data-server duplicate. (cherry picked from commit aace96f48804f43b07369408ffe7ed5c074437c0) --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 34539c3e42..a2982b4476 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9274,7 +9274,7 @@ generic enough to work for everyone.") (define-public evolution (package (name "evolution") - (version "3.32.4") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evolution/" @@ -9282,7 +9282,7 @@ generic enough to work for everyone.") "evolution-" version ".tar.xz")) (sha256 (base32 - "00hmmg4hfns8rq9rcilmy0gi1xkksld27lfbd9zmw2xw37wjmbqh")))) + "164vy8h432pjglafn8y2ms4gsvk3kbgc63h5qp0mk5dv4smsp29c")))) (build-system cmake-build-system) (arguments `(#:imported-modules (,@%cmake-build-system-modules @@ -9322,10 +9322,9 @@ generic enough to work for everyone.") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gnome-autoar" ,gnome-autoar) ("gnome-desktop" ,gnome-desktop) - ("gtkspell3" ,gtkspell3) + ("gspell" ,gspell) ("highlight" ,highlight) ("libcanberra" ,libcanberra) - ("libedataserverui" ,evolution-data-server) ("libgweather" ,libgweather) ("libnotify" ,libnotify) ("libsoup" ,libsoup) -- cgit v1.2.3 From a645a5a3bdd3e1f407a9ba44a2f3993ea66c3c60 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 13:26:30 -0500 Subject: gnu: dbus-glib: Update to 0.110. * gnu/packages/glib.scm (dbus-glib): Update to 0.110. (cherry picked from commit cff7f2f521a662d0dc01a07b5d7c2c61a7b47072) --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 92c693544d..185066ade9 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -555,7 +555,7 @@ translated.") (define dbus-glib (package (name "dbus-glib") - (version "0.108") + (version "0.110") (source (origin (method url-fetch) (uri @@ -563,7 +563,7 @@ translated.") version ".tar.gz")) (sha256 (base32 - "0b307hw9j41npzr6niw1bs6ryp87m5yafg492gqwvsaj4dz0qd4z")))) + "09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w")))) (build-system gnu-build-system) (propagated-inputs ; according to dbus-glib-1.pc `(("dbus" ,dbus) -- cgit v1.2.3 From fd11f6f30423ea0988e93ed7d635fe2125fc7169 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 14:08:51 -0500 Subject: gnu: folks: Update to 0.13.1. * gnu/packages/gnome.scm (folks): Update to 0.13.1. [build-system]: Use meson-build-system. [arguments]: Add 'skip-gtk-update-icon-cache' phase. [inputs]: Add readline. [native-inputs]: Add glib:bin. (cherry picked from commit e4e7160c93baceb39686ce6bd1efe833ec5593c7) --- gnu/packages/gnome.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a2982b4476..ef34eb6f2b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8330,7 +8330,7 @@ the Moka icon theme.") (define-public folks (package (name "folks") - (version "0.11.4") + (version "0.13.1") (source (origin (method url-fetch) (uri (string-append @@ -8339,17 +8339,28 @@ the Moka icon theme.") "folks-" version ".tar.xz")) (sha256 (base32 - "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57")))) - (build-system glib-or-gtk-build-system) + "0pda8sx4ap3lyri5fdrnakl29la1zkhwlc9bmnp13qigp1iwdw9x")))) + (build-system meson-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t))))) (inputs `(("bdb" ,bdb) ("dbus-glib" ,dbus-glib) ("evolution-data-server" ,evolution-data-server) ("glib" ,glib) ("libgee" ,libgee) + ("readline" ,readline) ("telepathy-glib" ,telepathy-glib))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("vala" ,vala))) -- cgit v1.2.3 From b3492e39d791a58a54ce3e2357a619c7cd357821 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 16 Dec 2019 22:28:09 -0500 Subject: gnu: gnome-contacts: Update to 3.34. * gnu/packages/gnome.scm (gnome-contacts): Update to 3.34. [arguments]: Add 'skip-gtk-update-icon-cache' phase. [native-inputs]: Remove gtk+:bin. (cherry picked from commit c8be9392f03522f7a98ca787d31aa2372635a762) --- gnu/packages/gnome.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ef34eb6f2b..8263995dec 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1161,7 +1161,7 @@ commonly used macros.") (define-public gnome-contacts (package (name "gnome-contacts") - (version "3.32.1") + (version "3.34") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-contacts/" @@ -1169,10 +1169,11 @@ commonly used macros.") name "-" version ".tar.xz")) (sha256 (base32 - "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy")))) + "04igc9xvyc4kb5xf5g2missnvyvj9zv5cqxf5k4z7hb0sv42wq4r")))) (build-system meson-build-system) (arguments - `(#:phases + `(#:configure-flags '("-Dcheese=false") + #:phases (modify-phases %standard-phases (add-after 'unpack 'generate-vapis (lambda* (#:key inputs #:allow-other-keys) @@ -1183,14 +1184,18 @@ commonly used macros.") (invoke "vapigen" "--directory=vapi" "--pkg=gio-2.0" "--library=goa-1.0" (string-append goa "/share/gir-1.0/Goa-1.0.gir")) + #t)) + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "build-aux/meson_post_install.py" + (("gtk-update-icon-cache") "true")) #t))))) (native-inputs `(("glib:bin" ,glib "bin") - ("gtk+:bin" ,gtk+ "bin") ("pkg-config" ,pkg-config))) (inputs - `(("cheese" ,cheese) - ("docbook-xml" ,docbook-xml) + `(("docbook-xml" ,docbook-xml) ("dockbook-xsl" ,docbook-xsl) ("evolution-data-server" ,evolution-data-server) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From f67ce0069ad65dc6a811d14a3a86a2fe344097b3 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 15:30:52 -0500 Subject: gnu: gnome-session: Update to 3.34.2. * gnu/packages/gnome.scm (gnome-session): Update to 3.34.2. (cherry picked from commit 12a88070138ca2f11ebecf0aa0c7ae3b71b0032e) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8263995dec..00a8b00e2e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5739,7 +5739,7 @@ such as gzip tarballs.") (define-public gnome-session (package (name "gnome-session") - (version "3.32.0") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5747,7 +5747,7 @@ such as gzip tarballs.") name "-" version ".tar.xz")) (sha256 (base32 - "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v")))) + "1qgqp97f8k2zi2ydvhds14zsjzfj7cv521r6wx5sw0qacn0p7dwb")))) (arguments '(#:glib-or-gtk? #t #:phases -- cgit v1.2.3 From 201547590de0bfd08acbe1f39adecbaa582778af Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 16:59:37 -0500 Subject: gnu: gnome-settings-daemon: Update to 3.34.1. * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.34.1. [arguments]: Add configure flag to build without systemd. [inputs]: Add gcr and modem-manager. (cherry picked from commit 048875f365d1591ad45853e76bda180d32f2bef7) --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 00a8b00e2e..668e2a5259 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4192,7 +4192,7 @@ services for numerous locations.") (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.32.1") + (version "3.34.1") (source (origin (method url-fetch) @@ -4201,7 +4201,7 @@ services for numerous locations.") name "-" version ".tar.xz")) (sha256 (base32 - "02d0s0g2mmqfib44r3sf0499r08p61s8l2ndsjssbam1bi7x2dks")))) + "07y1gbicz0pbxmdgwrdzyc4byy30wfwpbqgvnx27gnpqmc5s50cr")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -4209,6 +4209,7 @@ services for numerous locations.") (list (string-append "-Dudev_dir=" (assoc-ref %outputs "out") "/lib/udev/rules.d/") + "-Dsystemd=false" ;; Otherwise, the RUNPATH will lack the final path component. (string-append "-Dc_link_args=-Wl,-rpath=" (assoc-ref %outputs "out") @@ -4246,7 +4247,9 @@ services for numerous locations.") ("librsvg" ,librsvg) ("xf86-input-wacom" ,xf86-input-wacom) ("wayland" ,wayland) - ("network-manager" ,network-manager))) + ("network-manager" ,network-manager) + ("gcr" ,gcr) + ("modem-manager" ,modem-manager))) (home-page "https://www.gnome.org") (synopsis "GNOME settings daemon") (description -- cgit v1.2.3 From c576328d77aaecb8fe4c0c2065b72df6471d900b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 18:48:17 -0500 Subject: gnu: gnome-control-center: Update to 3.34.2. * gnu/packages/gnome.scm (gnome-control-center): Update to 3.34.2. [arguments]: Add 'skip-gtk-update-icon-cache' phase. [native-inputs]: Remove gtk+:bin. (cherry picked from commit 093ab99e4f2d5b10ea604cfb469e47f19b187401) --- gnu/packages/gnome.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 668e2a5259..187fe01ea5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6985,7 +6985,7 @@ devices using the GNOME desktop.") (define-public gnome-control-center (package (name "gnome-control-center") - (version "3.32.2") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6993,7 +6993,7 @@ devices using the GNOME desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs")))) + "054igagvmyzpaa5nwzz98gv7bk7l5dwp6g813707132si3szlpx8")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -7034,10 +7034,15 @@ devices using the GNOME desktop.") (("DATADIR \"/gnome/gnome-version.xml\"") (string-append "\"" gnome-desktop "/share/gnome/gnome-version.xml\""))) - #t)))))) + #t))) + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "build-aux/meson/meson_post_install.py" + (("gtk-update-icon-cache") (which "true"))) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. - ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt) -- cgit v1.2.3 From 262e660ef4b3c4f1dbc2274af6bbc71dfc30b94d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 20:21:38 -0500 Subject: gnu: gnome-disk-utility: Update to 3.34.0. * gnu/packages/gnome.scm (gnome-disk-utility): Update to 3.34.0. [arguments]: Add configure flag to enable elogind support. [inputs]: Add elogind. (cherry picked from commit 586eb32f09e8a654272040b578bf6a99876c9f7d) --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 187fe01ea5..ffd77a68f9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1321,7 +1321,7 @@ and keep up to date translations of documentation.") (define-public gnome-disk-utility (package (name "gnome-disk-utility") - (version "3.32.1") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1329,10 +1329,11 @@ and keep up to date translations of documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg")))) + "1mb7q90lnlp97dhxhnadhjagcfd12dfqzp0vj9h6b1r61pzhy97y")))) (build-system meson-build-system) (arguments - '(#:phases + '(#:configure-flags '("-Dlogind=libelogind") + #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. @@ -1349,7 +1350,8 @@ and keep up to date translations of documentation.") ("libxml2" ,libxml2) ("libxslt" ,libxslt))) (inputs - `(("glib" ,glib) + `(("elogind" ,elogind) + ("glib" ,glib) ("appstream-glib" ,appstream-glib) ("gnome-settings-daemon" ,gnome-settings-daemon) ("gtk+" ,gtk+) -- cgit v1.2.3 From 14faeadd9e946b92f39a2ba70c67fc7ee3e4dc25 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 20:31:34 -0500 Subject: gnu: gnome-keyring: Update to 3.34.0. * gnu/packages/gnome.scm (gnome-keyring): Update to 3.34.0. (cherry picked from commit 44f210ab90566446c8ccf0a53c663a3d555bad9e) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ffd77a68f9..4119c0ccfd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1491,7 +1491,7 @@ GNOME Desktop.") (define-public gnome-keyring (package (name "gnome-keyring") - (version "3.28.2") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1499,7 +1499,7 @@ GNOME Desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1")))) + "0hqrsh5g9q9lm190f0m85q4nki8k4ng7wphl6qbccdry59aakkg9")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;48 of 603 tests fail because /var/lib/dbus/machine-id does -- cgit v1.2.3 From d5101dab538b728b1cc9cc49d38a4d12de5aba59 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 20:36:07 -0500 Subject: gnu: gnome-screenshot: Update to 3.34.0. * gnu/packages/gnome.scm (gnome-screenshot): Update to 3.34.0. [arguments]: Add 'skip-gtk-update-icon-cache' phase. [native-inputs]: Remove gtk+:bin. (cherry picked from commit e822ab3c7b6072c053b25a175ba802b515edff44) --- gnu/packages/gnome.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4119c0ccfd..453e6555e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7581,7 +7581,7 @@ can add your own files to the collection.") (define-public gnome-screenshot (package (name "gnome-screenshot") - (version "3.32.0") + (version "3.34.0") (source (origin (method url-fetch) @@ -7590,11 +7590,19 @@ can add your own files to the collection.") name "-" version ".tar.xz")) (sha256 (base32 - "09ha7dizjm5ymqpjyrqd10ijfb3xlqc1mwg9ajkrbfry11q9yq4b")))) + "1rmiq890j7gfn5mcz31xy6jfnnxgc17dq67bhn2k9m5ylbvza2n8")))) (build-system meson-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "build-aux/postinstall.py" + (("gtk-update-icon-cache") "true")) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. - ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("intltool" ,intltool) ("appstream-glib" ,appstream-glib) -- cgit v1.2.3 From 80f6f9d86e1b3006da427933db4ab584d210f8ec Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 20:39:01 -0500 Subject: gnu: gnome-terminal: Update to 3.34.2. * gnu/packages/gnome.scm (gnome-terminal): Update to 3.34.2. (cherry picked from commit c09d94546b75ecdd334494ed1730d44de551f29b) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 453e6555e9..674e3d3899 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3880,7 +3880,7 @@ more fun.") (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.32.2") + (version "3.34.2") (source (origin (method url-fetch) @@ -3889,7 +3889,7 @@ more fun.") name "-" version ".tar.xz")) (sha256 (base32 - "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km")))) + "0gc004f9b5k94gkdanmqjz3wqgnpny0l3nqm8zd19h4f0ps27mrv")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 8069ff0bc4fc90a2ea2a56a0e67d11e8edec79f6 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 17 Dec 2019 20:47:22 -0500 Subject: gnu: nautilus: Update to 3.34.2. * gnu/packages/gnome.scm (nautilus): Update to 3.34.2. [arguments]: Add 'skip-gtk-update-icon-cache' phase. [native-inputs]: Remove gtk+:bin. (cherry picked from commit ba1d88e83aeb2e6b3ec4006c901f687235cd63c0) --- gnu/packages/gnome.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 674e3d3899..d29e1778c1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7464,7 +7464,7 @@ shared object databases, search tools and indexing.") (define-public nautilus (package (name "nautilus") - (version "3.32.3") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7472,17 +7472,24 @@ shared object databases, search tools and indexing.") name "-" version ".tar.xz")) (sha256 (base32 - "1x9crzbj6rrrf8w5dkcx0c14j40byr4ijpzkwd5dcrbfvvdy1r01")))) + "19zqwq4qyyncc5wq3xls0f7rsavnw741k336p2h7kx35p4kf41mv")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "build-aux/meson/postinstall.py" + (("gtk-update-icon-cache") "true")) + #t))) ;; XXX: FAIL: check-nautilus ;; Settings schema 'org.gnome.nautilus.preferences' is not installed #:tests? #f)) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. - ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 961dc62d1910b3671ba089920b24297a34d27a32 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 18 Dec 2019 23:01:01 -0500 Subject: gnu: totem: Update to 3.34.1. * gnu/packages/gnome.scm (totem): Update to 3.34.1. (cherry picked from commit 513a19c38116795c811e6421004ac8f7d83525fa) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d29e1778c1..913c7eebe5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4831,7 +4831,7 @@ discovery protocols.") (define-public totem (package (name "totem") - (version "3.32.1") + (version "3.34.1") (source (origin (method url-fetch) @@ -4840,7 +4840,7 @@ discovery protocols.") name "-" version ".tar.xz")) (sha256 (base32 - "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v")))) + "028sc6xbyi7rs884862d8f3di6zhcm0lhvlpc3r69ifzjsq9my3b")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From ec3ceabd6ebfab7117b663979552c94d24762716 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 20 Dec 2019 21:36:33 -0500 Subject: gnu: mutter: Update to 3.34.2. * gnu/packages/gnome.scm (mutter): Update to 3.34.2. [arguments]: Add configure flag to disable profiling. Update configure flag that adds to the RUNPATH. Remove obsolete 'disable-werror' and 'use-elogind' phases. [native-inputs]: Add desktop-file-utils. (cherry picked from commit b9686aea5170e528893433de4f563dd9b1a68cc0) --- gnu/packages/gnome.scm | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 913c7eebe5..9d3b48fe1c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5994,7 +5994,7 @@ to display dialog boxes from the commandline and shell scripts.") (define-public mutter (package (name "mutter") - (version "3.32.2") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6002,7 +6002,7 @@ to display dialog boxes from the commandline and shell scripts.") name "-" version ".tar.xz")) (sha256 (base32 - "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva")))) + "0b8bz5kvs7rlwvqsg87cf6jhrrj95vgd1l235mjx8rip35ipfvrd")))) ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked ;; versions of cogl and clutter. As a result, many of the inputs, ;; propagated-inputs, and configure flags used in cogl and clutter are @@ -6014,10 +6014,12 @@ to display dialog boxes from the commandline and shell scripts.") #:tests? #f #:glib-or-gtk? #t #:configure-flags - ;; Otherwise, the RUNPATH will lack the final path component. - (list (string-append "-Dc_link_args=-Wl,-rpath=" + ;; TODO: Enable profiler when Sysprof is packaged. + (list "-Dprofiler=false" + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib:" - (assoc-ref %outputs "out") "/lib/mutter-4") + (assoc-ref %outputs "out") "/lib/mutter-5") ;; The following flags are needed for the bundled clutter (string-append "-Dxwayland_path=" @@ -6027,27 +6029,10 @@ to display dialog boxes from the commandline and shell scripts.") ;; the remaining flags are needed for the bundled cogl (string-append "-Dopengl_libname=" (assoc-ref %build-inputs "mesa") - "/lib/libGL.so")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-werror - (lambda _ - ;; XXX: build fails with [-Werror]: - ;; backends/meta-cursor-renderer.c:112:5: error: - ;; implicit declaration of function ?roundf? - (substitute* "meson.build" - (("'-Werror=.*',") "")) - #t)) - ;; Replace references to systemd libraries to elogind references. - (add-before 'configure 'use-elogind - (lambda _ - (substitute* (list "meson.build" - "src/backends/native/meta-launcher.c" - "src/core/main.c") - (("systemd") "elogind")) - #t))))) + "/lib/libGL.so")))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. + `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database + ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config) -- cgit v1.2.3 From 0fda99c572617bfa85d11f67ab0be824474004d8 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 20 Dec 2019 22:34:58 -0500 Subject: gnu: gdm: Update to 3.34.1. * gnu/packages/gnome.scm (gdm): Update to 3.34.1. [arguments]: Adjust 'pre-configure' phase accordingly. (cherry picked from commit b989db762e17b7bdb64b1f0e3156bc92a2f2dc32) --- gnu/packages/gnome.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9d3b48fe1c..0f3727efc2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6721,7 +6721,7 @@ libxml2.") (define-public gdm (package (name "gdm") - (version "3.32.0") + (version "3.34.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6729,7 +6729,7 @@ libxml2.") name "-" version ".tar.xz")) (sha256 (base32 - "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4")) + "1lyqvcwxhwxklbxn4xjswjzr6fhjix6h28mi9ypn34wdm9bzcpg8")) (patches (search-patches "gdm-default-session.patch")))) (build-system glib-or-gtk-build-system) (arguments @@ -6771,6 +6771,7 @@ libxml2.") (("#include ") "")) ;; Use elogind for sd-login. (substitute* '("common/gdm-common.c" + "daemon/gdm-local-display-factory.c" "daemon/gdm-manager.c" "libgdm/gdm-user-switching.c") (("#include ") @@ -6818,7 +6819,8 @@ libxml2.") (substitute* '("daemon/gdm-server.c") (("\\(X_SERVER X_SERVER_ARG_FORMAT") "(\"%s\" X_SERVER_ARG_FORMAT, g_getenv (\"GDM_X_SERVER\")")) - (substitute* '("daemon/gdm-x-session.c") + (substitute* '("daemon/gdm-wayland-session.c" + "daemon/gdm-x-session.c") (("\"dbus-daemon\"") "g_getenv (\"GDM_DBUS_DAEMON\")") (("X_SERVER") -- cgit v1.2.3 From 9064cde1a9332006f99000d303374239054d9b4b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 21 Dec 2019 23:19:13 -0500 Subject: gnu: telepathy-glib: Disable failing tests. * gnu/packages/glib.scm (telepathy-glib)[arguments]: Add phase to disable failing tests. (cherry picked from commit 9049e4d808f241dd88ddcb6a0f74b0766624fb08) --- gnu/packages/glib.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 185066ade9..1e9941945c 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -825,7 +825,18 @@ up the Gnome environment, and are used in many unrelated projects.") ;; ;; EOFError: EOF read where object expected ;; make[2]: *** [Makefile:1906: _gen/register-dbus-glib-marshallers-body.h] Error 1 - #:parallel-build? #f)) + #:parallel-build? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; None of the tests below are able to find the org.gtk.vfs.Daemon + ;; service file provided by gvfs. + (substitute* "tests/dbus/Makefile.in" + (("test-contacts\\$\\(EXEEXT\\)") "") + (("test-file-transfer-channel\\$\\(EXEEXT\\)") "") + (("test-stream-tube\\$\\(EXEEXT\\)") "")) + #t))))) (native-inputs `(("glib" ,glib "bin") ; uses glib-mkenums ("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 76e1830c03c3d1cff64795c65aa7e660a79a909c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 21 Dec 2019 23:21:18 -0500 Subject: gnu: gjs: Update to 1.58.3. * gnu/packages/gnome.scm (gjs): Update to 1.58.3. [native-inputs]: Add dconf. (cherry picked from commit be62a1b5a5d0d2c237beae6ddafebe9c6ef887fa) --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0f3727efc2..f8cdf94eaa 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5815,7 +5815,7 @@ configuration program to choose applications starting on login.") (define-public gjs (package (name "gjs") - (version "1.56.2") + (version "1.58.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5823,7 +5823,7 @@ configuration program to choose applications starting on login.") name "-" version ".tar.xz")) (sha256 (base32 - "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac")))) + "1bkksx362007zs8c31ydygb29spwa5g5kch1ad2grc2sp53wv7ya")))) (build-system gnu-build-system) (arguments '(#:phases @@ -5853,6 +5853,7 @@ configuration program to choose applications starting on login.") ("xmllint" ,libxml2) ;; For testing ("dbus-launch" ,dbus) + ("dconf" ,dconf) ; required to properly store settings ("uuidgen" ,util-linux) ("xvfb" ,xorg-server-for-tests))) (propagated-inputs -- cgit v1.2.3 From 28457ae6fe3302d426e03c9ebd4b9d187470a946 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 21 Dec 2019 23:21:51 -0500 Subject: gnu: gnome-shell: Update to 3.34.2. * gnu/packages/gnome.scm (gnome-shell): Update to 3.34.2. [source]: Add patch. [native-inputs]: Add asciidoc. [inputs]: Add gnome-autoar. * gnu/packages/patches/gnome-shell-theme.patch: Adjust patch accordingly. * gnu/packages/patches/gnome-shell-disable-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. (cherry picked from commit 4ac325aa9bf8dd237f5b5be7a1523d957be0067f) --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 11 +++++--- .../patches/gnome-shell-disable-test.patch | 25 ++++++++++++++++++ gnu/packages/patches/gnome-shell-theme.patch | 30 ++++++++++------------ 4 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/gnome-shell-disable-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5bfbaaa0a2..6297217d40 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1001,6 +1001,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-shell-theme.patch \ + %D%/packages/patches/gnome-shell-disable-test.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f8cdf94eaa..5c8852c4ff 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7088,7 +7088,7 @@ properties, screen resolution, and other GNOME parameters.") (define-public gnome-shell (package (name "gnome-shell") - (version "3.32.2") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7096,8 +7096,9 @@ properties, screen resolution, and other GNOME parameters.") name "-" version ".tar.xz")) (sha256 (base32 - "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5")) - (patches (search-patches "gnome-shell-theme.patch")) + "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh")) + (patches (search-patches "gnome-shell-theme.patch" + "gnome-shell-disable-test.patch")) (modules '((guix build utils))) (snippet #~(begin @@ -7191,7 +7192,8 @@ properties, screen resolution, and other GNOME parameters.") '("inkscape" "intltool" "glib:bin")) #:outputs outputs))))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. + `(("asciidoc" ,asciidoc) + ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("gobject-introspection" ,gobject-introspection) ("inkscape" ,inkscape) @@ -7212,6 +7214,7 @@ properties, screen resolution, and other GNOME parameters.") ("gdm" ,gdm) ("gdk-pixbuf" ,gdk-pixbuf+svg) ("gjs" ,gjs) + ("gnome-autoar" ,gnome-autoar) ("gnome-bluetooth" ,gnome-bluetooth) ("gnome-desktop" ,gnome-desktop) ("gnome-settings-daemon" ,gnome-settings-daemon) diff --git a/gnu/packages/patches/gnome-shell-disable-test.patch b/gnu/packages/patches/gnome-shell-disable-test.patch new file mode 100644 index 0000000000..b4c7e73cd7 --- /dev/null +++ b/gnu/packages/patches/gnome-shell-disable-test.patch @@ -0,0 +1,25 @@ +This test seems to require a D-Bus connection not available in the build +environment. + +diff -ur /tmp/guix-build-gnome-shell-3.34.2.drv-0/gnome-shell-3.34.2/src/st/meson.build b/src/st/meson.build +--- /tmp/guix-build-gnome-shell-3.34.2.drv-0/gnome-shell-3.34.2/src/st/meson.build 1969-12-31 19:00:00.000000000 -0500 ++++ b/src/st/meson.build 2019-12-23 00:46:14.721198022 -0500 +@@ -132,18 +132,6 @@ + sources: st_enums[1] + ) + +-test_theme = executable('test-theme', +- sources: 'test-theme.c', +- c_args: st_cflags, +- dependencies: [mutter_dep, gtk_dep], +- build_rpath: mutter_typelibdir, +- link_with: libst +-) +- +-test('CSS styling support', test_theme, +- workdir: meson.current_source_dir() +-) +- + libst_gir = gnome.generate_gir(libst, + sources: st_gir_sources, + nsversion: '1.0', diff --git a/gnu/packages/patches/gnome-shell-theme.patch b/gnu/packages/patches/gnome-shell-theme.patch index fc7f7caf0f..3fa0670c43 100644 --- a/gnu/packages/patches/gnome-shell-theme.patch +++ b/gnu/packages/patches/gnome-shell-theme.patch @@ -2,25 +2,23 @@ Adjust GNOME-Shell so that it uses a Guix theme by default. Patch by Ludovic Courtès . -diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml -index 76aeaa5..8eaf32e 100644 ---- a/data/gnome-shell-theme.gresource.xml -+++ b/data/gnome-shell-theme.gresource.xml -@@ -22,6 +22,8 @@ +diff -ur a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml +--- a/data/gnome-shell-theme.gresource.xml 2019-12-11 15:06:31.000000000 -0500 ++++ b/data/gnome-shell-theme.gresource.xml 2019-12-21 00:31:55.895866241 -0500 +@@ -19,6 +19,8 @@ no-events.svg no-notifications.svg noise-texture.png + guix-background.png + guix-logo.png pad-osd.css - page-indicator-active.svg - page-indicator-inactive.svg -diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss -index 54d9f39..b9badd0 100644 ---- a/data/theme/gnome-shell-sass/_common.scss -+++ b/data/theme/gnome-shell-sass/_common.scss -@@ -1742,7 +1742,16 @@ $legacy_icon_size: 24px; - + pointer-double-click-symbolic.svg + pointer-drag-symbolic.svg +diff -ur a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss +--- a/data/theme/gnome-shell-sass/_common.scss 2019-12-11 15:06:31.000000000 -0500 ++++ b/data/theme/gnome-shell-sass/_common.scss 2019-12-21 00:33:49.495832135 -0500 +@@ -1994,7 +1994,16 @@ + } } - .login-dialog-logo-bin { padding: 24px 0px; } @@ -37,14 +35,14 @@ index 54d9f39..b9badd0 100644 .login-dialog-banner { color: darken($osd_fg_color,10%); } .login-dialog-button-box { spacing: 5px; } .login-dialog-message-warning { color: $warning_color; } -@@ -1889,9 +1898,10 @@ $legacy_icon_size: 24px; +@@ -2143,9 +2152,10 @@ } #lockDialogGroup { -- background: #2e3436 url(resource:///org/gnome/shell/theme/noise-texture.png); +- background: lighten(#2e3436, 8%) url(resource:///org/gnome/shell/theme/noise-texture.png); - background-repeat: repeat; -} -+ background: #2e3436 url(resource:///org/gnome/shell/theme/guix-background.png); ++ background: lighten(#2e3436, 8%) url(resource:///org/gnome/shell/theme/guix-background.png); + background-repeat: no-repeat; + background-size: cover; + background-position: center; } -- cgit v1.2.3 From 1efcf722930f79f7544aa33a232792911c15c865 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 10:33:21 -0500 Subject: gnu: seahorse: Update to 3.34. * gnu/packages/gnome.scm (seahorse): Update to 3.34. [source]: Remove obsolete patch. * gnu/packages/patches/seahorse-gtk-use-0-on-empty-flags.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. (cherry picked from commit df3e812fe42a13325ca5b223a115fb2d3dbfd446) --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 6 ++-- .../seahorse-gkr-use-0-on-empty-flags.patch | 32 ---------------------- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6297217d40..0795dec6e8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1453,7 +1453,6 @@ dist_patch_DATA = \ %D%/packages/patches/scotch-integer-declarations.patch \ %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ - %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/shadow-hurd-pctrl.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5c8852c4ff..71f536c9ca 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3104,7 +3104,7 @@ engineering.") (define-public seahorse (package (name "seahorse") - (version "3.32.2") + (version "3.34") (source (origin (method url-fetch) @@ -3113,9 +3113,7 @@ engineering.") version ".tar.xz")) (sha256 (base32 - "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x")) - (patches (search-patches - "seahorse-gkr-use-0-on-empty-flags.patch")))) + "16sfnqrdlr5xx6kixx2ln1mva7nngjlw1k3f5n454vyaigffjh2v")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch b/gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch deleted file mode 100644 index 55866d2973..0000000000 --- a/gnu/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch +++ /dev/null @@ -1,32 +0,0 @@ -Patch from . - -From d9db29db567012b7c72e85e1be1fbf55fcc9b667 Mon Sep 17 00:00:00 2001 -From: Niels De Graef -Date: Sat, 11 May 2019 09:02:34 +0200 -Subject: [PATCH] gkr: Use 0 on empty flags - -A Flags-type variable without any flag set can be replaced with 0, so -this is a safe thing to do. It also prevents us from having to deal with -the accidental API break in libsecret (see -https://gitlab.gnome.org/GNOME/libsecret/merge_requests/19) ---- - gkr/gkr-keyring-add.vala | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/gkr/gkr-keyring-add.vala b/gkr/gkr-keyring-add.vala -index 4e92a520..f60c9a22 100644 ---- a/gkr/gkr-keyring-add.vala -+++ b/gkr/gkr-keyring-add.vala -@@ -41,8 +41,7 @@ public class Seahorse.Gkr.KeyringAdd : Gtk.Dialog { - - var cancellable = Dialog.begin_request(this); - var service = Backend.instance().service; -- Secret.Collection.create.begin(service, this.name_entry.text, null, -- Secret.CollectionCreateFlags.COLLECTION_CREATE_NONE, -+ Secret.Collection.create.begin(service, this.name_entry.text, null, 0, - cancellable, (obj, res) => { - /* Clear the operation without cancelling it since it is complete */ - Dialog.complete_request(this, false); --- -2.23.0 - -- cgit v1.2.3 From d79e9b1bb6226fbb8d0f0330cbb264d3b0db70fe Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 10:39:55 -0500 Subject: gnu: gnome-mines: Update to 3.34.0. * gnu/packages/gnome.scm (gnome-mines): Update to 3.34.0. (cherry picked from commit 92a7370c01161ea6aafb71460f74f469cb400394) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 71f536c9ca..f6e483b0ed 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3789,7 +3789,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") (define-public gnome-mines (package (name "gnome-mines") - (version "3.32.2") + (version "3.34.0") (source (origin (method url-fetch) @@ -3798,7 +3798,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") name "-" version ".tar.xz")) (sha256 (base32 - "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g")))) + "1spxa6qr1y8s5rrsvpciywpvhk812ngn95s1apaxaigwy2g1iw54")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 857eb19088e15a674fb55dbc6a96b48dcdd35dcf Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 10:41:35 -0500 Subject: gnu: gnome-sudoku: Update to 3.34.1. * gnu/packages/gnome.scm (gnome-sudoku): Update to 3.34.1. (cherry picked from commit d82cdcd537040e53e1c423a7994c0c773f2c71d6) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f6e483b0ed..2fb0303580 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3832,7 +3832,7 @@ floating in an ocean using only your brain and a little bit of luck.") (define-public gnome-sudoku (package (name "gnome-sudoku") - (version "3.32.0") + (version "3.34.1") (source (origin (method url-fetch) @@ -3841,7 +3841,7 @@ floating in an ocean using only your brain and a little bit of luck.") name "-" version ".tar.xz")) (sha256 (base32 - "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l")))) + "025y85r4qqardivvwiwhbmgarziykdy224m8zlrq8b79zv82793b")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 8ae23a1d168be9ff22cb02cee2bb37a4cdc5e2ae Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 10:43:22 -0500 Subject: gnu: devhelp: Update to 3.34.0. * gnu/packages/gnome.scm (devhelp): Update to 3.34.0. (cherry picked from commit df8dfba27d09cb19c94f81b666bc7ad91c65fb79) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2fb0303580..ec8e21a902 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4364,7 +4364,7 @@ both a traditional UI or a modern UI with a GtkHeaderBar.") (define-public devhelp (package (name "devhelp") - (version "3.32.0") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4372,7 +4372,7 @@ both a traditional UI or a modern UI with a GtkHeaderBar.") name "-" version ".tar.xz")) (sha256 (base32 - "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq")))) + "0zpmn6fgkgiayvn4diia5df0s6s7dqrdnp3nrvpavsmgn0vhb4pg")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 18364fbc30f505aa744141f24478f20e82234620 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 10:46:47 -0500 Subject: gnu: gnome-klotski: Update to 3.34.0. * gnu/packages/gnome.scm (gnome-klotski): Update to 3.34.0. (cherry picked from commit d2fce9c85e92cd7b1ebcd69ef130fb31f9d51bc9) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ec8e21a902..948fffaf5d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4695,7 +4695,7 @@ GNOME Games, but it may be used by others.") (define-public gnome-klotski (package (name "gnome-klotski") - (version "3.32.0") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4703,7 +4703,7 @@ GNOME Games, but it may be used by others.") name "-" version ".tar.xz")) (sha256 (base32 - "1p4s15gxj6gasix22z9vlx2yrx196fvcxr6v6qrl569idfgjbi72")))) + "0sbx0bzy32lh2c9jp8v7gz788wn9y1la8mr5a7gf7370szsl4d4f")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From feee5ff5e83d31ef361840f200ecc1d57666358d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 10:51:44 -0500 Subject: gnu: gnome-clocks: Update to 3.34.0. * gnu/packages/gnome.scm (gnome-clocks): Update to 3.34.0. [arguments]: Add phase to skip gtk-update-icon-cache. [native-inputs]: Remove gtk+:bin. (cherry picked from commit 0293a06e5524ca9e894f111f68c1c9e7b6263810) --- gnu/packages/gnome.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 948fffaf5d..0b82161a57 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7966,7 +7966,7 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.") (define-public gnome-clocks (package (name "gnome-clocks") - (version "3.32.0") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7974,15 +7974,22 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.") name "-" version ".tar.xz")) (sha256 (base32 - "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc")))) + "0g7hjk55smhkd09hwa9kag3h5a12l494wj89w9smpdk3ghsmy6b1")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t)) + '(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "build-aux/post-install.py" + (("gtk-update-icon-cache") "true")) + #t))))) (native-inputs `(("vala" ,vala) ("pkg-config" ,pkg-config) ("glib" ,glib "bin") ; for glib-compile-resources - ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("desktop-file-utils" ,desktop-file-utils) ("gettext" ,gettext-minimal) ("itstool" ,itstool))) -- cgit v1.2.3 From 27dd1d76b26e633507679116b9d0bdad77f0ab47 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 11:03:33 -0500 Subject: gnu: gnome-calendar: Update to 3.34.2. * gnu/packages/gnome.scm (gnome-calendar): Update to 3.34.2. [arguments]: Add phase to skip gtk-update-icon-cache. [native-inputs]: Remove gtk+:bin. (cherry picked from commit 2f7f0be50c267a55624ac27b44542aebfffdad5e) --- gnu/packages/gnome.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0b82161a57..3f3ef21058 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8011,7 +8011,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") (define-public gnome-calendar (package (name "gnome-calendar") - (version "3.32.2") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8019,17 +8019,24 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") name "-" version ".tar.xz")) (sha256 (base32 - "07p73cvzj8idr80npja5yiv9pjfyi6qqfhaz5jwcgqspqbnhnl7k")))) + "1bnmd191044zn2kr6f5vg7sm5q59qf7z652awll1f7s6ahijr8rw")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t ;; gnome-calendar has to be installed before the tests can be run ;; https://bugzilla.gnome.org/show_bug.cgi?id=788224 - #:tests? #f)) + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "build-aux/meson/meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t))))) (native-inputs `(("gettext" ,gettext-minimal) ("glib-bin" ,glib "bin") ; For glib-compile-schemas - ("gtk+-bin" ,gtk+ "bin") ; For gtk-update-icon-cache ("pkg-config" ,pkg-config))) (inputs `(("evolution-data-server" ,evolution-data-server) -- cgit v1.2.3 From 4add1bae4ba619e11ae685137edbce81caa66023 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 11:06:29 -0500 Subject: gnu: gnome-tweaks: Update to 3.34.0. * gnu/packages/gnome.scm (gnome-tweaks): Update to 3.34.0. [arguments]: Add phase to skip gtk-update-icon-cache. [native-inputs]: Remove gtk+:bin. [inputs]: Add libhandy. (cherry picked from commit 097da4b45a2e7d39d586e4a36973b1eaea9df9e8) --- gnu/packages/gnome.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3f3ef21058..f550470741 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8148,7 +8148,7 @@ existing databases over the internet.") (define-public gnome-tweaks (package (name "gnome-tweaks") - (version "3.32.0") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-tweaks/" @@ -8158,7 +8158,7 @@ existing databases over the internet.") (list (search-patch "gnome-tweaks-search-paths.patch"))) (sha256 (base32 - "037r35cw34ifcs676fq9n2v4mh1nkqx0qk474bznf18mr6r62h55")))) + "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -8168,6 +8168,12 @@ existing databases over the internet.") ,@%meson-build-system-modules) #:phases (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson-postinstall.py" + (("gtk-update-icon-cache") "true")) + #t)) (add-after 'install 'wrap (@@ (guix build python-build-system) wrap)) (add-after 'wrap 'wrap-gi-typelib @@ -8178,14 +8184,14 @@ existing databases over the internet.") `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) #t))))) (native-inputs - `(("gtk+:bin" ,gtk+ "bin") ; For gtk-update-icon-cache - ("intltool" ,intltool) + `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs `(("gnome-desktop" ,gnome-desktop) ("gtk+" ,gtk+) ("gobject-introspection" ,gobject-introspection) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("libhandy" ,libhandy) ("libnotify" ,libnotify) ("libsoup" ,libsoup) ("nautilus" ,nautilus) -- cgit v1.2.3 From c73054669bc66610073af5f2b99eba04d017a03d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 11:09:19 -0500 Subject: gnu: gnome-shell-extensions: Update to 3.34.2. * gnu/packages/gnome.scm (gnome-shell-extensions): Update to 3.34.2. (cherry picked from commit c7587d3ef346554468475202c4ec436ad4ef3b65) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f550470741..e7f10077b7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8209,7 +8209,7 @@ GNOME Shell appearance and extension, etc.") (define-public gnome-shell-extensions (package (name "gnome-shell-extensions") - (version "3.32.1") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8217,7 +8217,7 @@ GNOME Shell appearance and extension, etc.") name "-" version ".tar.xz")) (sha256 (base32 - "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2")))) + "1f5l35l3kdkzrv49xmg1sh11vwmgjbg7hx3gb91i39bfl1snxqd1")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Dextension_set=all"))) -- cgit v1.2.3 From 30e76da11586f4034d527ecf2303f56c2da0e2dd Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 11:15:57 -0500 Subject: gnu: orca: Update to 3.34.1. * gnu/packages/gnome.scm (orca): Update to 3.34.1. (cherry picked from commit f6342be942f03c8e63f6fbe863597c0e5f8ffc83) --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e7f10077b7..c33e8ab022 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8770,7 +8770,7 @@ accessibility infrastructure.") (define-public orca (package (name "orca") - (version "3.32.0") + (version "3.34.1") (source (origin (method url-fetch) (uri (string-append @@ -8779,7 +8779,7 @@ accessibility infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i")))) + "1q38n7hyshkiszmn361skxjynxr31lcms7a1iny6d0zlpmh1vnk4")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases -- cgit v1.2.3 From 3a7e066f717754133c71306bcf7c8dccf1fff314 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 13:00:36 -0500 Subject: gnu: cheese: Update to 3.34.0. * gnu/packages/gnome.scm (cheese): Update to 3.34.0. [build-system]: Use meson-build-system. [arguments]: Set #:glib-or-gtk? flag. Adjust 'skip-gtk-update-icon-cache' phase and run it after the 'unpack' phase. [native-inputs]: Add docbook-xsl, gtk-doc, and libxslt. (cherry picked from commit e96f871c3603da785e31a3c130ae1d1a64827a93) --- gnu/packages/gnome.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c33e8ab022..6de7aaf7c6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9034,7 +9034,7 @@ photo-booth-like software, such as Cheese.") (define-public cheese (package (name "cheese") - (version "3.32.1") + (version "3.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9042,16 +9042,17 @@ photo-booth-like software, such as Cheese.") version ".tar.xz")) (sha256 (base32 - "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv")))) + "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni")))) (arguments - ;; Tests require GDK. - `(#:tests? #f + `(#:glib-or-gtk? #t + ;; Tests require GDK. + #:tests? #f #:phases (modify-phases %standard-phases - (add-before 'install 'skip-gtk-update-icon-cache + (add-after 'unpack 'skip-gtk-update-icon-cache (lambda _ ;; Don't create 'icon-theme.cache' - (substitute* "Makefile" + (substitute* "meson_post_install.py" (("gtk-update-icon-cache") (which "true"))) #t)) (add-after 'install 'wrap-cheese @@ -9061,12 +9062,15 @@ photo-booth-like software, such as Cheese.") (wrap-program (string-append out "/bin/cheese") `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))) #t))))) - (build-system glib-or-gtk-build-system) + (build-system meson-build-system) (native-inputs - `(("glib:bin" ,glib "bin") + `(("docbook-xsl" ,docbook-xsl) + ("glib:bin" ,glib "bin") + ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) ("itstool" ,itstool) ("libxml2" ,libxml2) + ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) ("vala" ,vala))) (propagated-inputs -- cgit v1.2.3 From 5b4ebb42dc6b8fa9d8e9e79b63977a5d344628b5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 23 Dec 2019 13:06:46 -0500 Subject: gnu: gnome-maps: Update to 3.34.2. * gnu/packages/geo.scm (gnome-maps): Update to 3.34.2. (cherry picked from commit 08c5ffd3c283cd479602540cce4e0d40be4f4187) --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a8f5153b32..d78e2e0f11 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -140,7 +140,7 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "3.32.2.1") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -148,7 +148,7 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb")))) + "00xslcnhhwslqglgfv2im7vq3awa49y2jxzr8wsby7f713k28vf5")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 123e429e4ca29c385e5ea0ff13b1685de081bbd4 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 14 Apr 2020 11:06:07 -0400 Subject: gnu: libical: Enable introspection and Vala bindings. * gnu/packages/calendar.scm (libical)[arguments]: Enable introspection and Vala bindings. [native-inputs]: Add gobject-introspection and vala. (cherry picked from commit 1538791f2003620ff3436cba316a594931a5ab72) --- gnu/packages/calendar.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index bd47800d1d..5132a9d8ab 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages dav) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages perl) @@ -136,7 +137,10 @@ the library for handling time zones and leap seconds.") (build-system cmake-build-system) (arguments '(#:tests? #f ; test suite appears broken - #:configure-flags '("-DSHARED_ONLY=true") + #:configure-flags '("-DSHARED_ONLY=true" + ;; required by evolution-data-server + "-DGOBJECT_INTROSPECTION=true" + "-DICAL_GLIB_VAPI=true") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-paths @@ -153,9 +157,11 @@ the library for handling time zones and leap seconds.") (("\\\"/usr/share/lib/zoneinfo\\\"") ""))) #t))))) (native-inputs - `(("gtk-doc" ,gtk-doc) + `(("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("perl" ,perl) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (inputs `(("glib" ,glib) ("libxml2" ,libxml2) -- cgit v1.2.3 From 45b320d9f8e3e0780d1d47474b46edfa4a590ad7 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 18 Apr 2020 18:34:51 -0400 Subject: gnu: gdm: Update patch for GDM 3.34. * gnu/packages/patches/gdm-default-session.patch: Update patch for new version of GDM. --- gnu/packages/patches/gdm-default-session.patch | 44 ++++++++++++-------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/gnu/packages/patches/gdm-default-session.patch b/gnu/packages/patches/gdm-default-session.patch index 4839a04de4..9ab2829cdb 100644 --- a/gnu/packages/patches/gdm-default-session.patch +++ b/gnu/packages/patches/gdm-default-session.patch @@ -5,11 +5,10 @@ and not in the directories listed in $XDG_DATA_DIRS. The latter includes Fixes . -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index 6a116a8..02c1458 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -348,24 +348,18 @@ get_system_session_dirs (GdmSession *self) +diff -ur a/daemon/gdm-session.c b/daemon/gdm-session.c +--- a/daemon/gdm-session.c 2019-09-25 10:40:24.000000000 -0400 ++++ b/daemon/gdm-session.c 2020-04-18 18:30:02.671856808 -0400 +@@ -348,24 +348,18 @@ GArray *search_array = NULL; char **search_dirs; int i; @@ -35,7 +34,7 @@ index 6a116a8..02c1458 100644 g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs)); #ifdef ENABLE_WAYLAND_SUPPORT -@@ -373,16 +367,7 @@ get_system_session_dirs (GdmSession *self) +@@ -373,16 +367,7 @@ #ifdef ENABLE_USER_DISPLAY_SERVER g_array_prepend_val (search_array, wayland_search_dir); @@ -52,40 +51,39 @@ index 6a116a8..02c1458 100644 g_array_append_val (search_array, wayland_search_dir); #endif } -diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c -index afbc5c0..bb5e3e6 100644 ---- a/libgdm/gdm-sessions.c -+++ b/libgdm/gdm-sessions.c -@@ -238,19 +238,11 @@ collect_sessions (void) +diff -ur a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c +--- a/libgdm/gdm-sessions.c 2019-10-07 04:53:35.000000000 -0400 ++++ b/libgdm/gdm-sessions.c 2020-04-18 18:31:42.491348691 -0400 +@@ -245,19 +245,12 @@ "/etc/X11/sessions/", DMCONFDIR "/Sessions/", DATADIR "/gdm/BuiltInSessions/", - DATADIR "/xsessions/", -- NULL + "/run/current-system/profile/share/xsessions/" }; - xorg_search_array = g_array_new (TRUE, TRUE, sizeof (char *)); + names_seen_before = g_hash_table_new (g_str_hash, g_str_equal); + xorg_search_array = g_ptr_array_new_with_free_func (g_free); - const gchar * const *system_data_dirs = g_get_system_data_dirs (); - - for (i = 0; system_data_dirs[i]; i++) { - session_dir = g_build_filename (system_data_dirs[i], "xsessions", NULL); -- g_array_append_val (xorg_search_array, session_dir); +- g_ptr_array_add (xorg_search_array, session_dir); - } - - g_array_append_vals (xorg_search_array, xorg_search_dirs, G_N_ELEMENTS (xorg_search_dirs)); - - #ifdef ENABLE_WAYLAND_SUPPORT -@@ -261,11 +253,6 @@ collect_sessions (void) + for (i = 0; i < G_N_ELEMENTS (xorg_search_dirs); i++) { + g_ptr_array_add (xorg_search_array, g_strdup (xorg_search_dirs[i])); + } +@@ -269,11 +262,6 @@ - wayland_search_array = g_array_new (TRUE, TRUE, sizeof (char *)); + wayland_search_array = g_ptr_array_new_with_free_func (g_free); - for (i = 0; system_data_dirs[i]; i++) { - session_dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); -- g_array_append_val (wayland_search_array, session_dir); +- g_ptr_array_add (wayland_search_array, session_dir); - } - - g_array_append_vals (wayland_search_array, wayland_search_dirs, G_N_ELEMENTS (wayland_search_dirs)); - #endif - + for (i = 0; i < G_N_ELEMENTS (wayland_search_dirs); i++) { + g_ptr_array_add (wayland_search_array, g_strdup (wayland_search_dirs[i])); + } -- cgit v1.2.3 From 9a749af4677ef3d63cd4cd46c05045b53cb64dc1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Apr 2020 19:39:00 +0200 Subject: installer: Add GC root for Guile 3.0. * gnu/system/install.scm (%installation-services)[gc-root-service-type]: Add GC root for GUILE-3.0 instead of GUILE-2.2. --- gnu/system/install.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 8b3a5d5fc0..c1481d13e2 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -442,7 +442,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (list bare-bones-os glibc-utf8-locales texinfo - guile-2.2)) + guile-3.0)) ;; Machines without Kernel Mode Setting (those with many old and ;; current AMD GPUs, SiS GPUs, ...) need uvesafb to show the GUI -- cgit v1.2.3 From 0e907e27ed0066a0be56a7ace8a5fca6a36376eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Apr 2020 15:52:35 +0200 Subject: gnu: boost-static: Adjust for Python 3 migration in Boost. * gnu/packages/boost.scm (boost-static)[arguments]: Adjust libboost_python27.a file name to take the Python 3 counterpart in the provide_libboost_python phase. --- gnu/packages/boost.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index afdbdbd15b..c3fc144cec 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -210,10 +210,18 @@ across a broad spectrum of applications.") ((#:phases phases) `(modify-phases ,phases (replace 'provide-libboost_python - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python-version (python-version + (assoc-ref inputs "python"))) + (libboost_pythonNN.a + (string-append "libboost_python" + (string-join (string-split + python-version #\.) + "") + ".a"))) (with-directory-excursion (string-append out "/lib") - (symlink "libboost_python27.a" "libboost_python.a")) + (symlink libboost_pythonNN.a "libboost_python.a")) #t))))))))) (define-public boost-1.69 -- cgit v1.2.3 From 189bfb555d1a5cac8d705588a0c7ccdeaafd6a99 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 13 Apr 2020 07:47:38 +0200 Subject: gnu: python: Build fix for the Hurd. * gnu/packages/python.scm (python-2.7)[arguments]: Add `fix-regen' stage to correct a reference to "/usr". (python-3.8): Remove build fix for 2.x..3.5.9 that breaks on 3.8.2. --- gnu/packages/python.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f0a6193a92..a30ad6fb6e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,6 +82,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages dbm) + #:use-module (gnu packages hurd) #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) @@ -197,6 +199,14 @@ "Lib/test/test_subprocess.py")) (("/bin/sh") (which "sh"))) #t)) + ,@(if (hurd-system?) + `((add-before 'build 'patch-regen-for-hurd + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc"))) + (substitute* "Lib/plat-generic/regen" + (("/usr/include/") (string-append libc "/include/"))) + #t)))) + '()) (add-before 'configure 'do-not-record-configure-flags (lambda* (#:key configure-flags #:allow-other-keys) ;; Remove configure flags from the installed '_sysconfigdata.py' @@ -383,7 +393,9 @@ data types.") " test_socket"))) ((#:phases phases) `(modify-phases ,phases - + ,@(if (hurd-system?) + `((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9 + '()) (add-before 'check 'set-TZDIR (lambda* (#:key inputs native-inputs #:allow-other-keys) ;; test_email requires the Olson time zone database. -- cgit v1.2.3 From 1c5063af86246917853992421a11997470feff77 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 13 Apr 2020 00:11:27 +0200 Subject: gnu: commencement: Build fix for python-boot0 on the Hurd. Unlike during a non-chroot'ed build on Debian/Hurd, there is no /usr/include. * gnu/packages/commencement.scm (python-boot0)[arguments]: When building on the Hurd, add `fix-regen' stage to correct a reference to "/usr". --- gnu/packages/commencement.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 41d7772eea..f74be83912 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3217,7 +3217,15 @@ memoized as a function of '%current-system'." ;; built, since it requires Linux headers. (("'linux', ") "")) #t)) - (delete 'set-TZDIR))) + (delete 'set-TZDIR) + ,@(if (hurd-system?) + `((add-before 'build 'fix-regen + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc"))) + (substitute* "Lib/plat-generic/regen" + (("/usr/include/") (string-append libc "/include/"))) + #t)))) + '()))) ((#:tests? _ #f) #f)))))) (define/system-dependent ld-wrapper-boot0 -- cgit v1.2.3 From fc179005835365c7233b2b7f5abe838404ddf869 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 17 Apr 2020 11:43:23 +0200 Subject: gnu: git: Resurrect cross-compilation. * gnu/packages/version-control.scm (git-cross-configure-flags): Add missing "ac_cv_iconv_omits_bom" flag. (git)[arguments]: Avoid modify-PATH stage when cross-compiling as it depends on non-present "bash-for-tests". --- gnu/packages/version-control.scm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b0cf2bd152..88a25f04f1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 John D. Boy +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -147,7 +148,8 @@ as well as the classic centralized workflow.") (define git-cross-configure-flags '("ac_cv_fread_reads_directories=yes" - "ac_cv_snprintf_returns_bogus=no")) + "ac_cv_snprintf_returns_bogus=no" + "ac_cv_iconv_omits_bom=no")) (define-public git (package @@ -251,16 +253,19 @@ as well as the classic centralized workflow.") ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases - (add-after 'unpack 'modify-PATH - (lambda* (#:key inputs #:allow-other-keys) - (let ((path (string-split (getenv "PATH") #\:)) - (bash-full (assoc-ref inputs "bash-for-tests"))) - ;; Drop the test bash from PATH so that (which "sh") and - ;; similar does the right thing. - (setenv "PATH" (string-join - (remove (cut string-prefix? bash-full <>) path) - ":")) - #t))) + ;; We do not have bash-for-tests when cross-compiling. + ,@(if (%current-target-system) + '() + `((add-after 'unpack 'modify-PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((path (string-split (getenv "PATH") #\:)) + (bash-full (assoc-ref inputs "bash-for-tests"))) + ;; Drop the test bash from PATH so that (which "sh") and + ;; similar does the right thing. + (setenv "PATH" (string-join + (remove (cut string-prefix? bash-full <>) path) + ":")) + #t))))) ;; Add cross curl-config script to PATH when cross-compiling. ,@(if (%current-target-system) '((add-before 'configure 'add-cross-curl-config -- cgit v1.2.3 From 457ded48c54ba04489cb871d3ec6bda0c59bead7 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 17 Apr 2020 12:32:44 +0200 Subject: gnu: git: Fix for cross-compiling to the Hurd. * gnu/packages/version-control.scm (git)[arguments]: When cross-compiling, fix `config.mak.uname' kludge to use the host system configuration. --- gnu/packages/version-control.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 88a25f04f1..7fc0244bc9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -253,9 +253,17 @@ as well as the classic centralized workflow.") ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases - ;; We do not have bash-for-tests when cross-compiling. ,@(if (%current-target-system) - '() + ;; The git build system assumes build == host + `((add-after 'unpack 'use-host-uname_S + (lambda _ + (substitute* "config.mak.uname" + (("uname_S := .*" all) + (if (equal? ,(%current-target-system) "i586-pc-gnu") + "uname_S := GNU\n" + all))) + #t))) + ;; We do not have bash-for-tests when cross-compiling. `((add-after 'unpack 'modify-PATH (lambda* (#:key inputs #:allow-other-keys) (let ((path (string-split (getenv "PATH") #\:)) -- cgit v1.2.3 From 48acdefe2e39278bb53ab54995e4a2aca973e99c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 19 Apr 2020 21:51:33 -0400 Subject: gnu: linphoneqt: Add the missing ring sound files. * gnu/packages/linphone.scm (linphoneqt)[phases]: Add an 'extend-shared-resources phase. --- gnu/packages/linphone.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 4f142312cc..b9d455ab3e 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -501,7 +501,17 @@ and video calls or instant messaging capabilities to an application.") (substitute* "src/app/AppController.cpp" (("LINPHONE_QT_GIT_VERSION") (format #f "~s" ,version))) - #t))))) + #t)) + (add-after 'install 'extend-shared-resources + ;; Not using the FHS exposes an issue where the client refers to + ;; its own "share" directory, which lacks sound files installed by + ;; liblinphone. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((liblinphone (assoc-ref inputs "linphone")) + (out (assoc-ref outputs "out"))) + (symlink (string-append liblinphone "/share/sounds") + (string-append out "/share/sounds")) + #t)))))) (native-inputs `(("qttools" ,qttools))) (inputs -- cgit v1.2.3 From eaff60b35fed75c60d0db76c589e17d1500f60dd Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 18 Apr 2020 17:05:48 +0200 Subject: gnu: perl: Actually produce a host perl when cross-compiling. * gnu/packages/patches/perl-cross.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/perl.scm (perl)[native-inputs]: When cross-compiling, add `perl-cross' input and perl-cross.patch. [arguments]: When cross-compiling, use them to produce binary for host. --- gnu/local.mk | 1 + gnu/packages/patches/perl-cross.patch | 60 ++++++++++++++++++++ gnu/packages/perl.scm | 103 ++++++++++++++++++++++++++++++++-- 3 files changed, 159 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/perl-cross.patch diff --git a/gnu/local.mk b/gnu/local.mk index 08b659c929..749e93ec07 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1318,6 +1318,7 @@ dist_patch_DATA = \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ + %D%/packages/patches/perl-cross.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ %D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \ diff --git a/gnu/packages/patches/perl-cross.patch b/gnu/packages/patches/perl-cross.patch new file mode 100644 index 0000000000..a7d10b4e1f --- /dev/null +++ b/gnu/packages/patches/perl-cross.patch @@ -0,0 +1,60 @@ +Submitted upstream. + +From 4c3eb19a11dfe5c88c902481a8294c4f675fcd03 Mon Sep 17 00:00:00 2001 +From: "Jan (janneke) Nieuwenhuizen" +Date: Sun, 19 Apr 2020 23:33:28 +0200 +Subject: [PATCH] Support cross-compiling to the Hurd. + +* cnf/hints/gnu: New file. +* cnf/configure_tool.sh: Guess it. +--- + cnf/configure_tool.sh | 4 ++++ + cnf/hints/gnu | 21 +++++++++++++++++++++ + 2 files changed, 25 insertions(+) + create mode 100644 cnf/hints/gnu + +diff --git a/cnf/configure_tool.sh b/cnf/configure_tool.sh +index 32201c0..7b0baa4 100644 +--- a/cnf/configure_tool.sh ++++ b/cnf/configure_tool.sh +@@ -266,6 +266,10 @@ if not hinted 'osname'; then + define osname "bsd" + result "BSD" + ;; ++ *-gnu*) ++ define osname "gnu" ++ result "GNU" ++ ;; + *) + result "no" + ;; +diff --git a/cnf/hints/gnu b/cnf/hints/gnu +new file mode 100644 +index 0000000..a0583a2 +--- /dev/null ++++ b/cnf/hints/gnu +@@ -0,0 +1,21 @@ ++# Hurd syscalls ++d_voidsig='define' ++d_nanosleep='undef' ++d_clock_gettime='define' ++d_clock_getres='define' ++d_clock_nanosleep='define' ++d_clock='define' ++ ++# From the original linux.sh ++usemallocwrap='define' ++ ++# libraries to test ++libswanted='m crypt pthread nm ndbm gdbm dbm db dl gdbm_compat' ++ ++d_procselfexe='undef' ++procselfexe='"undef"' ++ ++st_ino_sign=1 ++st_ino_size=8 ++ ++d_fcntl_can_lock='define' +-- +2.26.0 + diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d6a75506ec..a47cc6b254 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2018, 2020 Roel Janssen ;;; Copyright © 2016 Ben Woodcroft -;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2017 Raoul J.P. Bonnal ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Adriano Peluso @@ -48,14 +48,17 @@ #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gd) + #:use-module (gnu packages hurd) #:use-module (gnu packages less) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl-check) @@ -110,6 +113,8 @@ (add-before 'configure 'setup-configure (lambda _ ;; Use the right path for `pwd'. + ;; TODO: use coreutils from INPUTS instead of 'which' + ;; in next rebuild cycle, see fixup below. (substitute* "dist/PathTools/Cwd.pm" (("/bin/pwd") (which "pwd"))) @@ -120,10 +125,80 @@ (("-std=c89") "-std=gnu89")) #t)) - (replace 'configure - (lambda* (#:key configure-flags #:allow-other-keys) - (format #t "Perl configure flags: ~s~%" configure-flags) - (apply invoke "./Configure" configure-flags))) + ,@(if (%current-target-system) + `((add-after 'unpack 'unpack-cross + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((cross-checkout + (assoc-ref native-inputs "perl-cross")) + (cross-patch + (assoc-ref native-inputs "perl-cross-patch"))) + (rename-file "Artistic" "Artistic.perl") + (rename-file "Copying" "Copying.perl") + (copy-recursively cross-checkout ".") + (format #t "Applying ~a\n" cross-patch) + (invoke "patch" "-p1" "-i" cross-patch)) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* '("Makefile.config.SH" + "cnf/config.guess" + "cnf/config.sub" + "cnf/configure" + "cnf/configure_misc.sh" + "miniperl_top") + (("! */bin/sh") (string-append "! " bash "/bin/bash")) + ((" /bin/sh") (string-append bash "/bin/bash"))) + (substitute* '("ext/Errno/Errno_pm.PL") + (("\\$cpp < errno.c") "$Config{cc} -E errno.c"))) + #t)) + (replace 'configure + (lambda* (#:key configure-flags outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (store-directory (%store-directory)) + (configure-flags + (cons* + ;; `perl-cross' confuses target and host + (string-append "--target=" ,(%current-target-system)) + (string-append "--prefix=" out) + (string-append "-Dcc=" ,(%current-target-system) "-gcc") + "-Dbyteorder=1234" + (filter (negate + (lambda (x) (or (string-prefix? "-d" x) + (string-prefix? "-Dcc=" x)))) + configure-flags))) + (bash (assoc-ref inputs "bash")) + (coreutils (assoc-ref inputs "coreutils"))) + (format (current-error-port) + "running ./configure ~a\n" (string-join configure-flags)) + (apply invoke (cons "./configure" configure-flags)) + (substitute* "config.sh" + (((string-append store-directory "/[^/]*-bash-[^/]*")) + bash)) + (substitute* '("config.h") + (("^#define SH_PATH .*") + (string-append "#define SH_PATH \"" bash "/bin/bash\"\n"))) + ;;TODO: fix this in setup-configure next rebuild cycle + (substitute* "dist/PathTools/Cwd.pm" + (((string-append store-directory "/[^/]*-coreutils-[^/]*")) + coreutils)) + #t))) + (add-after 'build 'touch-non-built-files-for-install + (lambda _ + ;; `make install' wants to install these although they do + ;; not get built... + (with-directory-excursion "cpan" + (mkdir-p "Pod-Usage/blib/script") + (mkdir-p "Pod-Parser/blib/script") + (for-each (lambda (file) + (call-with-output-file file + (lambda (port) (display "" port)))) + '("Pod-Usage/blib/script/pod2text" + "Pod-Usage/blib/script/pod2usage" + "Pod-Checker/blib/script/podchecker" + "Pod-Parser/blib/script/podselect"))) + #t))) + `((replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (format #t "Perl configure flags: ~s~%" configure-flags) + (apply invoke "./Configure" configure-flags))))) (add-after 'install 'remove-extra-references (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -152,6 +227,24 @@ "/lib',\n")))) config2) #t)))))) + (inputs + (if (%current-target-system) + `(("bash" ,bash-minimal) + ("coreutils" ,coreutils)) + '())) + (native-inputs + (if (%current-target-system) + `(("perl-cross" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arsv/perl-cross") + (commit "1.3.3"))) + (file-name (git-file-name "perl-cross" "1.3.3")) + (sha256 + (base32 "065qbl1x44maykaj8p8za0b6qxj74bz7fi2zsrlydir1mqb1js3d")))) + ("perl-cross-patch" ,@(search-patches "perl-cross.patch"))) + '())) (native-search-paths (list (search-path-specification (variable "PERL5LIB") (files '("lib/perl5/site_perl"))))) -- cgit v1.2.3 From 2d49f175125cb83b3cffae89026404138f463aa3 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 15 Apr 2020 18:14:24 +0200 Subject: gnu: tls: Remove datefudge and disable tests on the Hurd. * gnu/packages/tls.scm (gnutls)[arguments]: When compiling for the Hurd, disable tests. [native-inputs]: When compiling for the Hurd, do not include datefudge. --- gnu/packages/tls.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 27d38ed258..c1bb7f6be0 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -181,7 +181,8 @@ living in the same process.") "0jvca1qahn9lrwv6f5kfs95icirc15b2a8x9fzczyj996ipg3b5z")))) (build-system gnu-build-system) (arguments - `(; Ensure we don't keep a reference to this buggy software. + `(,@(if (hurd-target?) '(#:tests? #f) '()) + ; Ensure we don't keep a reference to this buggy software. #:disallowed-references (,net-tools) #:configure-flags (list @@ -230,7 +231,8 @@ living in the same process.") `(("net-tools" ,net-tools))) ("pkg-config" ,pkg-config) ("which" ,which) - ("datefudge" ,datefudge) ;tests rely on 'datefudge' + ,@(if (hurd-target?) '() + `(("datefudge" ,datefudge))) ;tests rely on 'datefudge' ("util-linux" ,util-linux))) ;one test needs 'setsid' (inputs `(("guile" ,guile-3.0))) -- cgit v1.2.3 From a7c3c5dcca21d9f708ca918e83ad3a55bd259fd7 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 16 Apr 2020 13:35:47 +0200 Subject: gnu: cmake: Remove "libuv" dependency for the Hurd. * gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: When compiling for the Hurd, remove "libuv". --- gnu/packages/cmake.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e24979d2b2..cf3bc406bc 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Pierre-Moana Levesque +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages file) + #:use-module (gnu packages hurd) #:use-module (gnu packages libevent) #:use-module (gnu packages ncurses) #:use-module (gnu packages serialization) @@ -206,7 +208,9 @@ ("expat" ,expat) ("file" ,file) ("libarchive" ,libarchive) - ("libuv" ,libuv) + ,@(if (hurd-target?) + '() + `(("libuv" ,libuv))) ;not supported on the Hurd ("ncurses" ,ncurses) ;required for ccmake ("rhash" ,rhash) ("zlib" ,zlib))) -- cgit v1.2.3 From aa8db0ed0de700f6a6977b9bda2ea02b28224301 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 13 Apr 2020 07:42:07 +0200 Subject: gnu: coreutils: Mark three more tests XFAIL on the Hurd. * gnu/packages/base.scm (coreutils)[arguments]: Add three more failing tests. --- gnu/packages/base.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 80a158a685..9041d99b65 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -327,7 +327,10 @@ used to apply commands with arbitrarily long arguments.") (list (string-append "XFAIL_TESTS=tests/misc/env-S.pl" " tests/misc/kill.sh" " tests/misc/nice.sh" + " tests/misc/shred-passes.sh" " tests/split/fail.sh" + " tests/split/l-chunk.sh" + " tests/dd/stats.sh" " test-fdutimensat" " test-futimens" " test-linkat" -- cgit v1.2.3 From 4e0059beb1a7cf857f1575792febf995aadbef40 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 15 Apr 2020 09:42:09 +0200 Subject: gnu: tar: Disable troublesome tests on the Hurd. The sparse03.at test apparently freezes the Hurd; messages on the console: 165: listing sparse files bigger than 2^33 ext2fs: device:hd0s1: warning: bit already cleared for block 245780 ext2fs: device:hd0s1: warning: bit already cleared for block 245781 ext2fs: device:hd0s1: warning: bit already cleared for block 245782 ... ext2fs: BUG: unexpected fault on disk image ... err 0xa ext2fs: disk-pager.c:98: fault_handler: Assertion 'err' failed. the other tests just fail. * gnu/packages/base.scm (tar)[arguments]: When compiling for the Hurd, skip `sparse' and failing tests. --- gnu/packages/base.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9041d99b65..31563bab5c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -171,7 +171,22 @@ implementation offers several extensions over the standard utility.") (build-system gnu-build-system) ;; Note: test suite requires ~1GiB of disk space. (arguments - `(#:phases (modify-phases %standard-phases + `(,@(if (hurd-target?) + '(#:make-flags + (list (string-append + "TESTSUITEFLAGS= -k '" + "!sparse" + ",!renamed dirs in incrementals" + ",!--exclude-tag option in incremental pass" + ",!incremental dumps with -C" + ",!incremental dumps of nested directories" + ",!incremental restores with -C" + ",!concatenated incremental archives (renames)" + ",!renamed directory containing subdirectories" + ",!renamed subdirectories" + "'"))) + '()) + #:phases (modify-phases %standard-phases (add-before 'build 'set-shell-file-name (lambda* (#:key inputs #:allow-other-keys) ;; Do not use "/bin/sh" to run programs. -- cgit v1.2.3 From ce784e6c2891b585d93ab68909519752685d0e3c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Apr 2020 17:58:03 +0200 Subject: gnu: GNOME: Only include Eye of GNOME on x86_64-linux. * gnu/packages/gnome.scm (gnome)[propagated-inputs]: Conditionally add EOG. --- gnu/packages/gnome.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fbd4c5eb96..fb8c8b9472 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7828,7 +7828,11 @@ world.") ;; GNOME-Core-Utilities ("baobab" ,baobab) ("cheese" ,cheese) - ("eog" ,eog) + ;; XXX: EoG requires librsvg-next, which depends on Rust, which currently + ;; only works on x86_64, so exclude it on other architectures. + ,@(if (string-prefix? "x86_64" (%current-system)) + `(("eog" ,eog)) + '()) ("epiphany" ,epiphany) ("evince" ,evince) ("file-roller" ,file-roller) -- cgit v1.2.3 From f9ea3b242721fd071d033b8aa3fb36caaf3f764c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Apr 2020 13:08:41 +0200 Subject: gnu: python-pyrsistent: Fix build with Pytest 5. * gnu/packages/python-xyz.scm (python-pyrsistent)[arguments]: New field. --- gnu/packages/python-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0636b2b3ea..c5e9c8e6d7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2264,6 +2264,16 @@ from git information. (base32 "1lrsjgblnapfimd0alsi1as5nz2lfqv97131l7d6anbjzq2rjri8")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + ;; The package works fine with newer Pytest and Hypothesis, but + ;; has pinned older versions to stay compatible with Python 2. + (add-before 'check 'loosen-pytest-requirement + (lambda _ + (substitute* "setup.py" + (("pytest<5") "pytest") + (("hypothesis<5") "hypothesis")) + #t))))) (native-inputs `(("python-hypothesis" ,python-hypothesis) ("python-pytest" ,python-pytest) -- cgit v1.2.3 From 3994b55cd64831b36f52025192580d50028448f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Apr 2020 13:38:58 +0200 Subject: gnu: python-jedi: Fix test failure with Python 3.8. * gnu/packages/python-xyz.scm (python-jedi)[arguments]: Add phase 'adjust-test-for-python-3.8'. --- gnu/packages/python-xyz.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c5e9c8e6d7..86f4552cc5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11998,6 +11998,14 @@ characters, mouse support, and auto suggestions.") (arguments `(#:phases (modify-phases %standard-phases + (add-before 'check 'adjust-test-for-python-3.8 + (lambda _ + ;; Mimic upstream commit e7feeef64 to allow for extra output lines + ;; in TestSetupReadline on Python 3.8. Remove for jedi > 0.17.0. + (substitute* "test/test_utils.py" + (("assert len\\(difference\\) < 20") + "assert len(difference) < 22")) + #t)) (replace 'check (lambda _ (setenv "HOME" "/tmp") -- cgit v1.2.3 From e5109374d89713268079dff9c0c6a154e2068f8f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Apr 2020 19:07:09 +0200 Subject: gnu: qt@4: Hide the default GCC from CPLUS_INCLUDE_PATH. * gnu/packages/qt.scm (qt-4)[native-inputs]: Distinguish GCC-5. [arguments]: Add phase to hide the default GCC from CPLUS_INCLUDE_PATH to fix conflicting headers. --- gnu/packages/qt.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 238caa117d..8338e5fcfc 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -223,7 +223,7 @@ system, and the core design of Django is reused in Grantlee.") `(;; XXX: The JavaScriptCore engine does not build with the C++11 standard. ;; We could build it with -std=gnu++98, but then we'll get in trouble with ;; ICU later. Just keep using GCC 5 for now. - ("gcc" ,gcc-5) + ("gcc@5" ,gcc-5) ("bison" ,bison) ("flex" ,flex) ("gperf" ,gperf) @@ -240,6 +240,17 @@ system, and the core design of Django is reused in Grantlee.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'set-paths 'hide-default-gcc + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + ;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent + ;; conflicts with the GCC 5 input. + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) + ":")) + #t))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From b085d43633d28b1810b7bc74f8dff25717056420 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 18 Apr 2020 19:49:54 +0200 Subject: gnu: autoconf: Support cross-build. Autoconf does not cross-built properly: it lacks the concept of -for-build. It runs the host `autom4te' (a perl script) during build. * gnu/packages/autotools.scm (autoconf)[inputs]: Add bash-minimal, perl, and m4. To avoid triggering a rebuild, do this while cross-compiling only. [arguments]: When cross-building, add `patch-non-shebang-references' phase to substitute the host bash, m4 and perl. --- gnu/packages/autotools.scm | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 99ca52730e..26acfad95f 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Pierre-Moana Levesque +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,12 +56,43 @@ (base32 "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4")))) (build-system gnu-build-system) + (inputs + ;; TODO: remove `if' in the next rebuild cycle. + (if (%current-target-system) + `(("bash" ,bash-minimal) + ("perl" ,perl) + ("m4" ,m4)) + '())) (native-inputs `(("perl" ,perl) ("m4" ,m4))) - ;; XXX: testsuite: 209 and 279 failed. The latter is an impurity. It - ;; should use our own "cpp" instead of "/lib/cpp". - (arguments `(#:tests? #f)) + (arguments + `(;; XXX: testsuite: 209 and 279 failed. The latter is an impurity. It + ;; should use our own "cpp" instead of "/lib/cpp". + #:tests? #f + ,@(if (%current-target-system) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'patch-non-shebang-references + (lambda* (#:key build inputs outputs #:allow-other-keys) + ;; `patch-shebangs' patches shebangs only, and the Perl + ;; scripts use a re-exec feature that references the + ;; build hosts' perl. Also, BASH and M4 store references + ;; hide in the scripts. + (let ((bash (assoc-ref inputs "bash")) + (m4 (assoc-ref inputs "m4")) + (perl (assoc-ref inputs "perl")) + (out (assoc-ref outputs "out")) + (store-directory (%store-directory))) + (substitute* (find-files (string-append out "/bin")) + (((string-append store-directory "/[^/]*-bash-[^/]*")) + bash) + (((string-append store-directory "/[^/]*-m4-[^/]*")) + m4) + (((string-append store-directory "/[^/]*-perl-[^/]*")) + perl)) + #t))))) + '()))) (home-page "https://www.gnu.org/software/autoconf/") (synopsis "Create source code configuration scripts") (description -- cgit v1.2.3 From d64a6d267db7643edb6c9a76a830be08e147127b Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 18 Apr 2020 19:50:06 +0200 Subject: gnu: automake: Support cross-build. Automake does not cross-built properly: it lacks the concept of -for-build. It runs the host `autoconf' during build. * gnu/packages/autotools.scm (automake)[inputs]: Add autoconf, bash-minimal and perl. To avoid triggering a rebuild, do this while cross-compiling only. [arguments]: When cross-building, add `patch-non-shebang-references' phase to substitute autoconf and perl. --- gnu/packages/autotools.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 26acfad95f..657d4d3cb9 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -293,6 +293,13 @@ output is indexed in many ways to simplify browsing.") (patches (search-patches "automake-skip-amhello-tests.patch")))) (build-system gnu-build-system) + (inputs + ;; TODO: remove `if' in the next rebuild cycle. + (if (%current-target-system) + `(("autoconf" ,autoconf-wrapper) + ("bash" ,bash-minimal) + ("perl" ,perl)) + '())) (native-inputs `(("autoconf" ,autoconf-wrapper) ("perl" ,perl))) @@ -301,7 +308,7 @@ output is indexed in many ways to simplify browsing.") (variable "ACLOCAL_PATH") (files '("share/aclocal"))))) (arguments - '(#:modules ((guix build gnu-build-system) + `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1) (srfi srfi-26) @@ -330,6 +337,28 @@ output is indexed in many ways to simplify browsing.") (string-append "exit 77\n" all "\n"))) #t)) + ,@(if (%current-target-system) + `((add-after 'install 'patch-non-shebang-references + (lambda* (#:key build inputs outputs #:allow-other-keys) + ;; `patch-shebangs' patches shebangs only, and the Perl + ;; scripts use a re-exec feature that references the + ;; build hosts' perl. Also, AUTOCONF and BASH store + ;; references hide in the scripts. + (let ((autoconf (assoc-ref inputs "autoconf")) + (bash (assoc-ref inputs "bash")) + (perl (assoc-ref inputs "perl")) + (out (assoc-ref outputs "out")) + (store-directory (%store-directory))) + (substitute* (find-files (string-append out "/bin")) + (((string-append store-directory "/[^/]*-autoconf-[^/]*")) + autoconf) + (((string-append store-directory "/[^/]*-bash-[^/]*")) + bash) + (((string-append store-directory "/[^/]*-perl-[^/]*")) + perl)) + #t)))) + '()) + ;; Files like `install-sh', `mdate.sh', etc. must use ;; #!/bin/sh, otherwise users could leak erroneous shebangs ;; in the wild. See for an -- cgit v1.2.3 From 95c14929a7fbd3c55c5e8756953c2f257625e2b7 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 19 Apr 2020 12:06:46 +0200 Subject: gnu: texinfo: Cross-build fix. * gnu/packages/texinfo.scm (texinfo)[inputs]: Add perl. This makes the host texi2any (makeinfo) refer to the correct perl. To avoid triggering a rebuild, do this while cross-compiling only. --- gnu/packages/texinfo.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 7457d99653..70e050371d 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Pierre-Moana Levesque ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,7 +69,11 @@ "env ")) #t)))) '())) - (inputs `(("ncurses" ,ncurses))) + (inputs `(("ncurses" ,ncurses) + ;; TODO: remove `if' in the next rebuild cycle. + ,@(if (%current-target-system) + `(("perl" ,perl)) + '()))) ;; When cross-compiling, texinfo will build some of its own binaries with ;; the native compiler. This means ncurses is needed both in both inputs ;; and native-inputs. -- cgit v1.2.3 From 62c3fd34e498327f1eeae6283b0c54ae56b7282b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Apr 2020 15:34:46 +0200 Subject: gnu: shepherd: Remove obsolete patch. * gnu/packages/patches/shepherd-hurd.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/admin.scm (shepherd)[source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/admin.scm | 1 - gnu/packages/patches/shepherd-hurd.patch | 44 -------------------------------- 3 files changed, 46 deletions(-) delete mode 100644 gnu/packages/patches/shepherd-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index 535c23d98b..63a9c83c19 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1463,7 +1463,6 @@ dist_patch_DATA = \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/shadow-hurd-pctrl.patch \ - %D%/packages/patches/shepherd-hurd.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ %D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-config.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 567c7cfb94..a9240dbdb1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -206,7 +206,6 @@ and provides a \"top-like\" mode (monitoring).") (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) - (patches (search-patches "shepherd-hurd.patch")) (sha256 (base32 "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll")))) diff --git a/gnu/packages/patches/shepherd-hurd.patch b/gnu/packages/patches/shepherd-hurd.patch deleted file mode 100644 index 5043e831f2..0000000000 --- a/gnu/packages/patches/shepherd-hurd.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fixes compilation on the Hurd. - -Taken from upstream: http://git.savannah.gnu.org/cgit/shepherd.git/commit/?id=232331369fe2a0495c7c777e11eecabee6257b3f - -From 232331369fe2a0495c7c777e11eecabee6257b3f Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Sat, 7 Mar 2020 22:01:23 +0100 -Subject: [PATCH] system: Support compilation on the Hurd. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* modules/shepherd/system.scm.in (prctl): Wrap 'dynamic-func' call in -'false-if-exception'. - -Co-authored-by: Ludovic Courtès ---- - modules/shepherd/system.scm.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules/shepherd/system.scm.in b/modules/shepherd/system.scm.in -index 769404a..0b2cc9d 100644 ---- a/modules/shepherd/system.scm.in -+++ b/modules/shepherd/system.scm.in -@@ -1,6 +1,7 @@ - ;; system.scm -- Low-level operating system interface. - ;; Copyright (C) 2013, 2014, 2016, 2018 Ludovic Courtès - ;; Copyright (C) 2018 Carlo Zancanaro -+;; Copyright (C) 2020 Jan (janneke) Nieuwenhuizen - ;; - ;; This file is part of the GNU Shepherd. - ;; -@@ -145,7 +146,7 @@ ctrlaltdel(8) and see kernel/reboot.c in Linux." - (define PR_SET_CHILD_SUBREAPER @PR_SET_CHILD_SUBREAPER@) - - (define prctl -- (if (dynamic-func "prctl" (dynamic-link)) -+ (if (false-if-exception (dynamic-func "prctl" (dynamic-link))) - (let ((proc (syscall->procedure long "prctl" (list int int)))) - (lambda (process operation) - "Perform an operation on the given process" --- -2.24.0 - -- cgit v1.2.3 From 621caeb73b3feecb9a5f2517663ce03f02274db7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Apr 2020 19:32:24 +0200 Subject: gnu: GCC@8: Remove obsolete patch. This is no longer required since the update to 8.4.0 in 60ce496ad8. * gnu/packages/patches/gcc-8-libsanitizer-mode-size.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gcc.scm (gcc-8)[source](patches): Remove it. --- gnu/local.mk | 1 - gnu/packages/gcc.scm | 1 - .../patches/gcc-8-libsanitizer-mode-size.patch | 56 ---------------------- 3 files changed, 58 deletions(-) delete mode 100644 gnu/packages/patches/gcc-8-libsanitizer-mode-size.patch diff --git a/gnu/local.mk b/gnu/local.mk index 63a9c83c19..7c117b7a6b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -924,7 +924,6 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-4.9-libsanitizer-mode-size.patch \ %D%/packages/patches/gcc-6-libsanitizer-mode-size.patch \ %D%/packages/patches/gcc-7-libsanitizer-mode-size.patch \ - %D%/packages/patches/gcc-8-libsanitizer-mode-size.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ %D%/packages/patches/gcc-strmov-store-file-names.patch \ %D%/packages/patches/gcc-4-compile-with-gcc-5.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 6221a123d8..b69f3cf4b3 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -547,7 +547,6 @@ It also includes runtime support libraries for these languages."))) (base32 "1m1d3gfix56w4aq8myazzfffkl8bqcrx4jhhapnjf7qfs596w2p3")) (patches (search-patches "gcc-8-strmov-store-file-names.patch" - "gcc-8-libsanitizer-mode-size.patch" "gcc-5.0-libvtv-runpath.patch")))))) (define-public gcc-9 diff --git a/gnu/packages/patches/gcc-8-libsanitizer-mode-size.patch b/gnu/packages/patches/gcc-8-libsanitizer-mode-size.patch deleted file mode 100644 index e343034991..0000000000 --- a/gnu/packages/patches/gcc-8-libsanitizer-mode-size.patch +++ /dev/null @@ -1,56 +0,0 @@ -Fix assertion failure in libsanitizer when using glibc 2.31 and later. - -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92154 -https://reviews.llvm.org/D69104 - -Adapted from these upstream revision: - -https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=277981 -https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=279653 - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -index a915d37cdfe..5c720b2e700 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -1147,8 +1147,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); - CHECK_SIZE_AND_OFFSET(ipc_perm, gid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); --#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) --/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ -+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) -+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit -+ on many architectures. */ - CHECK_SIZE_AND_OFFSET(ipc_perm, mode); - #endif - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index 4d11d071776..eda75a7cd84 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -210,14 +210,8 @@ namespace __sanitizer { - u64 __unused1; - u64 __unused2; - #elif defined(__sparc__) --#if defined(__arch64__) - unsigned mode; -- unsigned short __pad1; --#else -- unsigned short __pad1; -- unsigned short mode; - unsigned short __pad2; --#endif - unsigned short __seq; - unsigned long long __unused1; - unsigned long long __unused2; -@@ -228,8 +222,7 @@ namespace __sanitizer { - unsigned long __unused1; - unsigned long __unused2; - #else -- unsigned short mode; -- unsigned short __pad1; -+ unsigned int mode; - unsigned short __seq; - unsigned short __pad2; - #if defined(__x86_64__) && !defined(_LP64) - -- cgit v1.2.3 From 8176ef86bee124b1cb77a9f893684a3b1222e8ab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Apr 2020 00:37:07 +0200 Subject: gnu: Update glibc locale compatibility packages for 2.29. * gnu/packages/base.scm (glibc-locales-2.28, glibc-utf8-locales-2.28): Rename to ... (glibc-locales-2.29, glibc-utf8-locales-2.29): ... this. Update to 2.29. --- gnu/packages/base.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 31563bab5c..13971b9f18 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1241,12 +1241,12 @@ test environments.") (make-glibc-utf8-locales glibc)) ;; Packages provided to ease use of binaries linked against the previous libc. -(define-public glibc-locales-2.28 - (package (inherit (make-glibc-locales glibc-2.28)) - (name "glibc-locales-2.28"))) -(define-public glibc-utf8-locales-2.28 - (package (inherit (make-glibc-utf8-locales glibc-2.28)) - (name "glibc-utf8-locales-2.28"))) +(define-public glibc-locales-2.29 + (package (inherit (make-glibc-locales glibc-2.29)) + (name "glibc-locales-2.29"))) +(define-public glibc-utf8-locales-2.29 + (package (inherit (make-glibc-utf8-locales glibc-2.29)) + (name "glibc-utf8-locales-2.29"))) ;; These should no longer be needed. (define-public glibc-utf8-locales-2.27 -- cgit v1.2.3 From 23eb368cd384e082c8f166191b32f37217280088 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Apr 2020 00:37:49 +0200 Subject: gnu: Remove obsolete glibc-locales packages. * gnu/packages/base.scm (glibc-utf8-locales-2.27, glibc-locales-2.27): Remove variables. --- gnu/packages/base.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 13971b9f18..9899067544 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1248,12 +1248,6 @@ test environments.") (package (inherit (make-glibc-utf8-locales glibc-2.29)) (name "glibc-utf8-locales-2.29"))) -;; These should no longer be needed. -(define-public glibc-utf8-locales-2.27 - (deprecated-package "glibc-utf8-locales-2.27" glibc-utf8-locales-2.28)) -(define-public glibc-locales-2.27 - (deprecated-package "glibc-locales-2.27" glibc-locales-2.28)) - (define-public which (package (name "which") -- cgit v1.2.3 From 69c2e0103ab64aa6e0beb7651797de9cfd22a6d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Apr 2020 00:39:28 +0200 Subject: news: Add entry for the glibc 2.31 upgrade. * etc/news.scm: Add entry for a33eac038a811603c8b9ed106ae405a5f80a0e9d. --- etc/news.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index 0bdde6aa8b..ab09a1059c 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -11,6 +11,73 @@ (channel-news (version 0) + (entry (commit "a33eac038a811603c8b9ed106ae405a5f80a0e9d") + (title (en "GNU C Library upgraded") + (de "GNU-C-Bibliothek aktualisiert") + (es "Actualización de la biblioteca C de GNU") + (fr "Mise à jour de la bibliothèque C de GNU") + (nl "GNU C-bibliotheek bijgewerkt")) + (body + (en "The GNU C Library (glibc) has been upgraded to version 2.31. To +run previously-installed programs linked against glibc 2.29, you need to +install locale data for version 2.29 in addition to locale data for 2.31: + +@example +guix install glibc-locales glibc-locales-2.29 +@end example + +On Guix System, you can adjust the @code{locale-libcs} field of your +@code{operating-system} form. Run @code{info \"(guix) Locales\"}, for more +info.") + (de "Die GNU-C-Bibliothek (glibc) wurde auf Version 2.31 +aktualisiert. Um zuvor installierte Programme, die an glibc 2.29 gebunden +worden sind, weiter benutzen zu können, müssen Sie Locale-Daten für Version +2.29 zusätzlich zu den Locale-Daten für 2.31 installieren: + +@example +guix install glibc-locales glibc-locales-2.29 +@end example + +Auf Guix System genügt es, das @code{locale-libcs}-Feld Ihrer +@code{operating-system}-Form anzupassen. Führen Sie @code{info \"(guix.de) +Locales\"} aus, um weitere Informationen dazu zu erhalten.") + (es "Se ha actualizado la biblioteca de C de GNU (glibc) a la versión +2.31. Para ejecutar programas instalados previamente que se encuentren +enlazados con glibc 2.29, es necesario que instale los datos de localización +de la versión 2.29 junto a los datos de localización de la versión 2.31: + +@example +guix install glibc-locales glibc-locales-2.29 +@end example + +En el sistema Guix, puede ajustar el campo @code{locale-libcs} de su +declaración @code{operating-system}. Ejecute @code{info \"(guix.es) +Localizaciones\"} para obtener más información.") + (fr "La bibliothèque C de GNU (glibc) a été mise à jour en version +2.31. Pour pouvoir lancer tes programmes déjà installés et liés à glibc 2.29, +tu dois installer les données pour la version 2.29 en plus des données de +régionalisation pour la version 2.31: + +@example +guix install glibc-locales glibc-locales-2.29 +@end example + +Sur le système Guix, tu peux ajuster le champ @code{locale-libcs} de ta forme +@code{operating-system}. Lance @code{info \"(guix.fr) Régionalisation\"} pour +plus de détails.") + (nl "De GNU C-bibliotheek (glibc) werd bijgewerkt naar versie 2.31. +Om gebruik te maken van reeds geïnstalleerde programma's die aan glibc 2.29 +gebonden zijn, moet u de regionale informatie van versie 2.29 naast die van +versie 2.31 installeren: + +@example +guix install glibc-locales glibc-locales-2.29 +@end example + +Op Guix System kunt u het @code{locale-libcs}-veld van uw +@code{operating-system}-vorm aanpassen. Voer @code{info \"(guix) Locales\"} +uit voor verdere uitleg."))) + (entry (commit "e1e6491226347d9fb93ff484d78cef98848a510a") (title (en "Guix Cookbook now available as Info")) ;; TRANSLATORS: Adjust the URL and the 'info' command to refer to the -- cgit v1.2.3 From f568581c2bfb3a7367442c9ccc23613c43f6f1e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Apr 2020 17:43:38 +0200 Subject: gnu: emacs-guix: Add support for Guile 3.0. * gnu/packages/emacs-xyz.scm (emacs-guix)[source](modules, snippet): New fields. --- gnu/packages/emacs-xyz.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2a373e7fb1..0197ee5896 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -68,6 +68,7 @@ ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Jérémy Korwin-Zmijowski ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -2355,7 +2356,15 @@ type, for example: packages, buffers, files, etc.") "releases/emacs-guix-" version ".tar.gz")) (sha256 (base32 - "0yz64c0z4ygi2k4af18k4r1ncgys18jb8icywkp2g5pgmpn5l7ps")))) + "0yz64c0z4ygi2k4af18k4r1ncgys18jb8icywkp2g5pgmpn5l7ps")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Add support for Guile 3.0. Remove for versions > 0.5.2. + (substitute* "configure" + (("\"2\\.2 2\\.0\"") + "\"3.0 2.2 2.0\"")) + #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 4affa9182d93c77505c40e95964b8ab9d436298b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Apr 2020 18:19:02 +0200 Subject: gnu: font-gnu-freefont: Build with an older version of FontForge. Fixes . Reported by Jack Hill . * gnu/packages/fontutils.scm (fontforge-20190801): New public variable. * gnu/packages/fonts.scm (font-gnu-freefont)[native-inputs]: Change from inherited FontForge variant to FONTFORGE-20190801. --- gnu/packages/fonts.scm | 12 +++++------- gnu/packages/fontutils.scm | 29 ++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 21423baefd..6e9b080299 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Dmitry Nikolaev ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner -;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2016 Toni Reina ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 José Miguel Sánchez García @@ -236,6 +236,8 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over (define-public font-gnu-freefont (package (name "font-gnu-freefont") + ;; Note: Remove the special FontForge input and package once the 2020 + ;; release is out. (version "20120503") (source (origin (method url-fetch) @@ -289,12 +291,8 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over (lambda (file) (string-suffix? "woff" file)) (find-files "." ""))))))) #:test-target "tests")) - ;; replace python 3 with python 2 - ;; python 3 support commits aren't yet released in 20120503 - ;; so freefont needs python 2 support in fontforge - (native-inputs `(("fontforge" ,(package (inherit fontforge) - (inputs `(("python-2" ,python-2) - ,@(package-inputs fontforge))))))) + ;; FreeFont anno 2012 requires a FontForge built with Python 2. + (native-inputs `(("fontforge" ,fontforge-20190801))) (home-page "https://www.gnu.org/software/freefont/") (synopsis "Unicode-encoded outline fonts") (description diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index a77cf9ebf0..d78811b2e8 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -60,7 +60,9 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) - #:use-module (guix build-system meson)) + #:use-module (guix build-system meson) + #:use-module (guix utils) + #:use-module (srfi srfi-1)) (define-public freetype (package @@ -640,6 +642,31 @@ generate bitmaps.") (license license:gpl3+) (home-page "https://fontforge.github.io"))) +;; This is the last version that supports Python 2, which is needed for +;; GNU FreeFont. Remove once no longer required. +(define-public fontforge-20190801 + (package + (inherit fontforge) + (version "20190801") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/fontforge/fontforge/releases/download/" + version "/fontforge-" version ".tar.gz")) + (sha256 + (base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r")))) + (build-system gnu-build-system) + (arguments + (substitute-keyword-arguments (package-arguments fontforge) + ((#:configure-flags _) + ''()) + ((#:phases phases) + `(modify-phases ,phases + (delete 'do-not-override-RPATH))))) + (inputs + `(("python" ,python-2) + ,@(alist-delete "python" (package-inputs fontforge)))))) + (define-public python2-ufolib (package (name "python2-ufolib") -- cgit v1.2.3 From 9962b877804b4fc347b60fae8445ddc5d3ad8bbe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Apr 2020 23:24:33 +0200 Subject: gnu: python-aiohttp: Disable tests that fail with Python 3.8. * gnu/packages/python-web.scm (python-aiohttp)[arguments]: Delete failing tests. --- gnu/packages/python-web.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1d99239dbb..5423aa917e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge -;;; Copyright © 2016, 2017 Marius Bakke +;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2016, 2017, 2020 Julien Lepiller @@ -92,7 +92,6 @@ (base32 "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5")) (patches (search-patches "python-aiohttp-3.6.2-no-warning-fail.patch")))) - (build-system python-build-system) (arguments '(#:phases @@ -106,6 +105,17 @@ ;; make sure the timestamp of this file is > 1990, because a few ;; tests like test_static_file_if_modified_since_past_date depend on it (invoke "touch" "-d" "2020-01-01" "tests/data.unknown_mime_type") + + ;; FIXME: These tests are failing due to deprecation warnings + ;; in Python 3.8. Remove this when updating to aiohttp >= 3.7. + ;; https://github.com/aio-libs/aiohttp/issues/4477 + ;; https://github.com/aio-libs/aiohttp/issues/4525 + (with-directory-excursion "tests" + (for-each delete-file '("test_client_session.py" + "test_multipart.py" + "test_web_middleware.py" + "test_web_protocol.py" + "test_web_urldispatcher.py"))) #t))))) (propagated-inputs `(("python-aiodns" ,python-aiodns) -- cgit v1.2.3 From 6ac6c1d28d8a89d0f9b0f15e7df2a011f24aa091 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Apr 2020 00:11:53 +0200 Subject: gnu: python-geventhttpclient: Disable test that fails with Python 3.8. * gnu/packages/python-web.scm (python-geventhttpclient)[arguments]: In the check phase, add pytest flag to filter broken test. While at it, don't reorder the phase, as it now runs after install by default. --- gnu/packages/python-web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5423aa917e..a73128a77c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1978,14 +1978,16 @@ library.") (lambda _ (delete-file "src/geventhttpclient/tests/test_client.py") #t)) - (delete 'check) - (add-after 'install 'check + (replace 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (invoke "py.test" "src/geventhttpclient/tests" "-v" ;; Append the test modules to sys.path to avoid ;; namespace conflict which breaks SSL tests. - "--import-mode=append") + "--import-mode=append" + ;; XXX: Disable test fails with Python 3.8: + ;; https://github.com/gwik/geventhttpclient/issues/119 + "-k" (string-append "not test_cookielib_compatibility")) #t))))) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From d2fc76462e72268ee5b04fe53805efc05c35e139 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 25 Apr 2020 15:20:04 +0200 Subject: services: shepherd: Cross-compilation fix. Fixes . Reported by Jan (janneke) Nieuwenhuizen Fix suggested by Mathieu Othacehe However, still applies; %current-target-system may not be bound. * gnu/services/shepherd.scm (scm->go): Use `with-target' when cross-compiling. --- gnu/services/shepherd.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 2f30c6c907..655a45a936 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2018 Carlo Zancanaro +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ #:use-module (guix store) #:use-module (guix records) #:use-module (guix derivations) ;imported-modules, etc. + #:use-module (guix utils) #:use-module (gnu services) #:use-module (gnu services herd) #:use-module (gnu packages admin) @@ -260,22 +262,27 @@ stored." (define (scm->go file) "Compile FILE, which contains code to be loaded by shepherd's config file, and return the resulting '.go' file." - (with-extensions (list shepherd) - (computed-file (string-append (basename (scheme-file-name file) ".scm") - ".go") - #~(begin - (use-modules (system base compile)) - - ;; Do the same as the Shepherd's 'load-in-user-module'. - (let ((env (make-fresh-user-module))) - (module-use! env (resolve-interface '(oop goops))) - (module-use! env (resolve-interface '(shepherd service))) - (compile-file #$file #:output-file #$output - #:env env))) - - ;; It's faster to build locally than to download. - #:options '(#:local-build? #t - #:substitutable? #f)))) + ;; FIXME: %current-target-system may not be bound + (let ((target (%current-target-system))) + (with-extensions (list shepherd) + (computed-file (string-append (basename (scheme-file-name file) ".scm") + ".go") + #~(begin + (use-modules (system base compile) + (system base target)) + + ;; Do the same as the Shepherd's 'load-in-user-module'. + (let ((env (make-fresh-user-module))) + (module-use! env (resolve-interface '(oop goops))) + (module-use! env (resolve-interface '(shepherd service))) + (with-target #$(or target #~%host-type) + (lambda _ + (compile-file #$file #:output-file #$output + #:env env))))) + + ;; It's faster to build locally than to download. + #:options '(#:local-build? #t + #:substitutable? #f))))) (define (shepherd-configuration-file services) "Return the shepherd configuration file for SERVICES." -- cgit v1.2.3 From 0e72d49ef7cb7463012704b3d107fe38b085a562 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Apr 2020 22:17:07 +0200 Subject: tests: Add 'guile-final' to the installation test GC roots. * gnu/tests/install.scm (run-install): Add GUILE-FINAL to OPERATING-SYSTEM-WITH-GC-ROOTS. --- gnu/tests/install.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 713e03194b..1b113602ed 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -29,6 +29,7 @@ #:use-module ((gnu build vm) #:select (qemu-command)) #:use-module (gnu packages admin) #:use-module (gnu packages bootloaders) + #:use-module (gnu packages commencement) ;for 'guile-final' #:use-module (gnu packages cryptsetup) #:use-module (gnu packages linux) #:use-module (gnu packages ocr) @@ -226,10 +227,11 @@ packages defined in installation-os." ;; Since the installation system has no network access, ;; we cheat a little bit by adding TARGET to its GC ;; roots. This way, we know 'guix system init' will - ;; succeed. + ;; succeed. Also add guile-final, which is pulled in + ;; through provenance.drv and may not always be present. (image (system-disk-image (operating-system-with-gc-roots - os (list target)) + os (list target guile-final)) #:disk-image-size install-size #:file-system-type installation-disk-image-file-system-type -- cgit v1.2.3 From d653e184ec45cedbc3dc6deb18d3f8666f1c2492 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 24 Apr 2020 08:54:43 +0200 Subject: gnu: guix: Do not copy bootstrap-guile when cross-compiling. * gnu/packages/package-management.scm (guix)[arguments]: When cross-compiling, skip copy-bootstrap-guile phase; needed for tests only. --- gnu/packages/package-management.scm | 82 +++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3bfee16832..1b9697b387 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -181,46 +181,48 @@ $(prefix)/etc/init.d\n"))) (invoke "sh" "bootstrap"))) (add-before 'check 'copy-bootstrap-guile - (lambda* (#:key system inputs #:allow-other-keys) - ;; Copy the bootstrap guile tarball in the store used - ;; by the test suite. - (define (intern file recursive?) - ;; Note: don't use 'guix download' here because we - ;; need to set the 'recursive?' argument. - (define base - (strip-store-file-name file)) - - (define code - `(begin - (use-modules (guix)) - (with-store store - (let* ((item (add-to-store store ,base - ,recursive? - "sha256" ,file)) - (root (string-append "/tmp/gc-root-" - (basename item)))) - ;; Register a root so that the GC tests - ;; don't delete those. - (symlink item root) - (add-indirect-root store root))))) - - (invoke "./test-env" "guile" "-c" - (object->string code))) - - (intern (assoc-ref inputs "boot-guile") #f) - - ;; On x86_64 some tests need the i686 Guile. - ,@(if (and (not (%current-target-system)) - (string=? (%current-system) - "x86_64-linux")) - '((intern (assoc-ref inputs "boot-guile/i686") #f)) - '()) - - ;; Copy the bootstrap executables. - (for-each (lambda (input) - (intern (assoc-ref inputs input) #t)) - '("bootstrap/bash" "bootstrap/mkdir" - "bootstrap/tar" "bootstrap/xz")) + (lambda* (#:key system target inputs #:allow-other-keys) + (unless target + (begin + ;; Copy the bootstrap guile tarball in the store + ;; used by the test suite. + (define (intern file recursive?) + ;; Note: don't use 'guix download' here because we + ;; need to set the 'recursive?' argument. + (define base + (strip-store-file-name file)) + + (define code + `(begin + (use-modules (guix)) + (with-store store + (let* ((item (add-to-store store ,base + ,recursive? + "sha256" ,file)) + (root (string-append "/tmp/gc-root-" + (basename item)))) + ;; Register a root so that the GC tests + ;; don't delete those. + (symlink item root) + (add-indirect-root store root))))) + + (invoke "./test-env" "guile" "-c" + (object->string code))) + + (intern (assoc-ref inputs "boot-guile") #f) + + ;; On x86_64 some tests need the i686 Guile. + ,@(if (and (not (%current-target-system)) + (string=? (%current-system) + "x86_64-linux")) + '((intern (assoc-ref inputs "boot-guile/i686") #f)) + '()) + + ;; Copy the bootstrap executables. + (for-each (lambda (input) + (intern (assoc-ref inputs input) #t)) + '("bootstrap/bash" "bootstrap/mkdir" + "bootstrap/tar" "bootstrap/xz")))) #t)) (add-after 'unpack 'disable-failing-tests ;; XXX FIXME: These tests fail within the build container. -- cgit v1.2.3 From 56389433bcbbeb7abb94b4156957d2d2568ff36c Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 24 Apr 2020 11:21:48 +0200 Subject: gnu: guix: Cross-build workaround: Run native guile for version. We need to take some care here, the native guile is not necessarily always the same version as the host guile. * gnu/packages/package-management.scm (guix)[arguments]: Do not attempt to run host guile for getting effective-version; resort to native guile. --- gnu/packages/package-management.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 1b9697b387..fdc570f0f4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -245,11 +245,13 @@ $(prefix)/etc/init.d\n"))) (setenv "SHELL" (which "sh")) #t)) (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) ;; Make sure the 'guix' command finds GnuTLS, ;; Guile-JSON, and Guile-Git automatically. (let* ((out (assoc-ref outputs "out")) - (guile (assoc-ref inputs "guile")) + (guile ,@(if (%current-target-system) + '((assoc-ref native-inputs "guile")) + '((assoc-ref inputs "guile")))) (gcrypt (assoc-ref inputs "guile-gcrypt")) (json (assoc-ref inputs "guile-json")) (sqlite (assoc-ref inputs "guile-sqlite3")) -- cgit v1.2.3 From 569c55bee2a74106b3ab8a07187ea9cd8cce410e Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 10 Apr 2020 21:24:19 +0200 Subject: gnu: guix: Cross-build fix: override compressors. * gnu/packages/package-management.scm (guix)[arguments]: When cross-compiling, add `fixup-compressors' stage. [inputs]: When cross-compiling, add `xz'. --- gnu/packages/package-management.scm | 97 ++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 40 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index fdc570f0f4..ba7d3e1288 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -180,49 +180,63 @@ $(prefix)/etc/init.d\n"))) (invoke "sh" "bootstrap"))) + (add-before 'build 'use-host-compressors + (lambda* (#:key inputs target #:allow-other-keys) + (when target + ;; Use host compressors. + (let ((bzip2 (assoc-ref inputs "bzip2")) + (gzip (assoc-ref inputs "gzip")) + (xz (assoc-ref inputs "xz"))) + (substitute* "guix/config.scm" + (("\"[^\"]*/bin/bzip2") + (string-append "\"" bzip2 "/bin/bzip2")) + (("\"[^\"]*/bin/gzip") gzip + (string-append "\"" gzip "/bin/gzip")) + (("\"[^\"]*/bin//xz") + (string-append "\"" xz "/bin/xz"))))) + #t)) (add-before 'check 'copy-bootstrap-guile (lambda* (#:key system target inputs #:allow-other-keys) + ;; Copy the bootstrap guile tarball in the store + ;; used by the test suite. + (define (intern file recursive?) + ;; Note: don't use 'guix download' here because we + ;; need to set the 'recursive?' argument. + (define base + (strip-store-file-name file)) + + (define code + `(begin + (use-modules (guix)) + (with-store store + (let* ((item (add-to-store store ,base + ,recursive? + "sha256" ,file)) + (root (string-append "/tmp/gc-root-" + (basename item)))) + ;; Register a root so that the GC tests + ;; don't delete those. + (symlink item root) + (add-indirect-root store root))))) + + (invoke "./test-env" "guile" "-c" + (object->string code))) + (unless target - (begin - ;; Copy the bootstrap guile tarball in the store - ;; used by the test suite. - (define (intern file recursive?) - ;; Note: don't use 'guix download' here because we - ;; need to set the 'recursive?' argument. - (define base - (strip-store-file-name file)) - - (define code - `(begin - (use-modules (guix)) - (with-store store - (let* ((item (add-to-store store ,base - ,recursive? - "sha256" ,file)) - (root (string-append "/tmp/gc-root-" - (basename item)))) - ;; Register a root so that the GC tests - ;; don't delete those. - (symlink item root) - (add-indirect-root store root))))) - - (invoke "./test-env" "guile" "-c" - (object->string code))) - - (intern (assoc-ref inputs "boot-guile") #f) - - ;; On x86_64 some tests need the i686 Guile. - ,@(if (and (not (%current-target-system)) - (string=? (%current-system) - "x86_64-linux")) - '((intern (assoc-ref inputs "boot-guile/i686") #f)) - '()) - - ;; Copy the bootstrap executables. - (for-each (lambda (input) - (intern (assoc-ref inputs input) #t)) - '("bootstrap/bash" "bootstrap/mkdir" - "bootstrap/tar" "bootstrap/xz")))) + (intern (assoc-ref inputs "boot-guile") #f) + + ;; On x86_64 some tests need the i686 Guile. + ,@(if (and (not (%current-target-system)) + (string=? (%current-system) + "x86_64-linux")) + '((intern (assoc-ref inputs "boot-guile/i686") #f)) + '()) + + ;; Copy the bootstrap executables. + (for-each (lambda (input) + (intern (assoc-ref inputs input) #t)) + '("bootstrap/bash" "bootstrap/mkdir" + "bootstrap/tar" "bootstrap/xz"))) #t)) (add-after 'unpack 'disable-failing-tests ;; XXX FIXME: These tests fail within the build container. @@ -331,6 +345,9 @@ $(prefix)/etc/init.d\n"))) (string=? (%current-system) "x86_64-linux")) `(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux"))) '()) + ,@(if (%current-target-system) + `(("xz" ,xz)) + '()) ;; Tests also rely on these bootstrap executables. ("bootstrap/bash" ,(bootstrap-executable "bash" (%current-system))) -- cgit v1.2.3 From a7dbb95ca5189382e3bea9de5c97b929da79fc32 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 10 Apr 2020 14:30:35 +0200 Subject: gnu: guix: Update to 569c55bee2. * gnu/packages/package-management.scm (guix): Update to 1.1.0-1.569c55bee2. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ba7d3e1288..85cfae25e0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -112,8 +112,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "7dd05396ef4539165f955d9ab57225091f801ce9") - (revision 1)) + (commit "569c55bee2a74106b3ab8a07187ea9cd8cce410e") + (revision 2)) (package (name "guix") @@ -129,7 +129,7 @@ (commit commit))) (sha256 (base32 - "110fz4qay4iywpynw1cbv6if8ac0pxp21zhzwvnp2jn1f6vbwf64")) + "036lg8qj6hh2093lqwxdmwdir8frck8ap5king8sl4j29yc59jzc")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 706b91ea8ded9118b3f5ef3d0a68ffc6f579f847 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 11 Apr 2020 14:05:32 +0200 Subject: gnu: hurd: Build DDE libraries. * gnu/packages/hurd.scm (hurd)[native-inputs]: Add "dde-sources". [inputs]: Add libpciaccess. [arguments]: Add phase "prepare-dde". --- gnu/packages/hurd.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 90e39a279b..88af75c48e 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages texinfo) + #:use-module (gnu packages xorg) ; libpciaccess #:use-module (guix git-download) #:export (hurd-system? hurd-target? @@ -362,6 +364,19 @@ boot, since this cannot be done from GNU/Linux." (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'prepare-dde + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "Makefile" + (("libbpf ") + "libbpf libmachdev libmachdevdde libddekit")) + (for-each make-file-writable (find-files ".")) + (let ((dde (or (assoc-ref inputs "dde-sources") + (assoc-ref native-inputs "dde-sources")))) + (for-each (lambda (dir) + (copy-recursively + (string-append dde "/" dir ) dir)) + '("libmachdev" "libmachdevdde" "libddekit"))) + #t)) (add-before 'build 'pre-build (lambda _ ;; Don't change the ownership of any file at this time. @@ -471,6 +486,7 @@ fsysopts / --writable\n")) ("libgcrypt" ,libgcrypt) ;for /hurd/random ("libdaemon" ,libdaemon) ;for /bin/console --daemonize ("unifont" ,unifont) + ("libpciaccess" ,libpciaccess) ;; Tools for the /libexec/* scripts. ("bash-minimal" ,bash-minimal) @@ -491,7 +507,20 @@ fsysopts / --writable\n")) (arguments `(#:system "i686-linux"))) mig)) ("perl" ,perl) - ("texinfo" ,texinfo-4))) + ("texinfo" ,texinfo-4) + ("dde-sources" + ;; This is the current tip of the dde branch + ,(let ((commit "ac1c7eb7a8b24b7469bed5365be38a968d59a136")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/incubator.git") + (commit commit))) + (sha256 + (base32 + "1vryinbg75xpydfrv9dbgfnds6knlh8l8bk2rxp32y9dc58z0692")) + (file-name (string-append "dde-checkout-" + (string-take commit 7)))))))) (supported-systems %hurd-systems) (home-page "https://www.gnu.org/software/hurd/hurd.html") (synopsis "The kernel servers for the GNU operating system") -- cgit v1.2.3 From 71b92e1abd015b03ba6ea011ab4129499c1f44c4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 14 Apr 2020 12:45:15 +0200 Subject: gnu: Add dde-sources. * gnu/packages/hurd.scm (dde-sources): New variable. (hurd)[native-inputs]: Add it. --- gnu/packages/hurd.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 88af75c48e..716fd59f75 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -355,6 +355,19 @@ boot, since this cannot be done from GNU/Linux." (with-parameters ((%current-target-system "i586-pc-gnu")) (program-file "rc" rc))) +(define dde-sources + ;; This is the current tip of the dde branch + (let ((commit "ac1c7eb7a8b24b7469bed5365be38a968d59a136")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/incubator.git") + (commit commit))) + (sha256 + (base32 + "1vryinbg75xpydfrv9dbgfnds6knlh8l8bk2rxp32y9dc58z0692")) + (file-name (git-file-name "dde" commit))))) + (define-public hurd (package (name "hurd") @@ -508,19 +521,7 @@ fsysopts / --writable\n")) mig)) ("perl" ,perl) ("texinfo" ,texinfo-4) - ("dde-sources" - ;; This is the current tip of the dde branch - ,(let ((commit "ac1c7eb7a8b24b7469bed5365be38a968d59a136")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/hurd/incubator.git") - (commit commit))) - (sha256 - (base32 - "1vryinbg75xpydfrv9dbgfnds6knlh8l8bk2rxp32y9dc58z0692")) - (file-name (string-append "dde-checkout-" - (string-take commit 7)))))))) + ("dde-sources" ,dde-sources))) (supported-systems %hurd-systems) (home-page "https://www.gnu.org/software/hurd/hurd.html") (synopsis "The kernel servers for the GNU operating system") -- cgit v1.2.3 From d30d3e3f60df511e484adb3e459625b3251b0917 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 14 Apr 2020 12:46:00 +0200 Subject: gnu: Add netdde. * gnu/packages/hurd.scm (netdde): New variable. --- gnu/packages/hurd.scm | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 716fd59f75..bc2d864bf4 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -22,7 +22,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages hurd) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:hide (zlib)) #:use-module (guix download) #:use-module (guix packages) #:use-module (gnu packages) @@ -31,7 +31,9 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages autotools) + #:use-module (gnu packages compression) #:use-module (gnu packages flex) + #:use-module (gnu packages gawk) #:use-module (gnu packages gnupg) #:use-module (gnu packages bison) #:use-module (gnu packages libdaemon) @@ -531,3 +533,87 @@ augmentation of standard Unix kernels. It is a collection of protocols for system interaction (file systems, networks, authentication), and servers implementing them.") (license gpl2+))) + +(define-public netdde + (let ((commit "4a1016f130b6f2065d3f088325e5fb0b2997ae12") + (revision "1")) + (package + (name "netdde") + ;; The version prefix corresponds to the version of Linux from which the + ;; drivers were taken. + (version (git-version "2.6.32.65" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/incubator.git") + (commit commit))) + (sha256 + (base32 + "1njv9dszq4lj05yq4v9j5v247hfghpzvvz4hzy0khjjr35mw7hr8")) + (file-name (git-file-name name commit)))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "SHELL=" (assoc-ref %build-inputs "bash") + "/bin/bash") + "PKGDIR=libdde_linux26" + ,@(if (%current-target-system) + (list "CC=i586-pc-gnu-gcc" + "LINK_PROGRAM=i586-pc-gnu-gcc") + (list "CC=gcc"))) + #:configure-flags + (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'prepare-dde + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each make-file-writable (find-files ".")) + (let ((dde (or (assoc-ref inputs "dde-sources") + (assoc-ref native-inputs "dde-sources")))) + (for-each (lambda (dir) + (copy-recursively + (string-append dde "/" dir ) dir)) + '("libdde_linux26" "libddekit"))) + (substitute* "libdde_linux26/mk/rel2abs.sh" + (("/bin/bash") (which "bash"))) + #t)) + (add-after 'patch-generated-file-shebangs 'build-libdde-linux26 + (lambda* (#:key make-flags #:allow-other-keys) + (with-directory-excursion "libdde_linux26" + (apply invoke "make" + (delete "PKGDIR=libdde_linux26" make-flags))))) + (add-after 'build-libdde-linux26 'convert + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "convert" make-flags))) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + ;; no-common can be dropped with GCC 10+ where this is the + ;; default. + (apply invoke "make" "CFLAGS=-fno-common" make-flags))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "netdde" + (string-append (assoc-ref outputs "out") + "/bin")) + #t))))) + (inputs + `(("hurd" ,hurd) + ("libpciaccess" ,libpciaccess) + ("zlib" ,zlib))) + (native-inputs + `(("coreutils" ,coreutils) + ("gawk" ,gawk) + ("grep" ,grep) + ("perl" ,perl) + ("sed" ,sed) + ("dde-sources" ,dde-sources))) + (supported-systems %hurd-systems) + (home-page "https://www.gnu.org/software/hurd/hurd.html") + (synopsis "Linux network drivers glued by the DDE layer") + (description + "This package provides Linux 2.6 network drivers that can be embedded +in userland processes thanks to the DDE layer.") + ;; Some drivers are dually licensed with the options being GPLv2 or one + ;; of MPL/Expat/BSD-3 (dependent on the driver). + (license gpl2)))) -- cgit v1.2.3 From dc1182751cfd62d2b91f80fed322fd1e016e4b72 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 Apr 2020 22:55:29 +0300 Subject: gnu: vdirsyncer: Fix building man page. * gnu/packages/dav.scm (vdirsyncer)[arguments]: Add custom phase to patch function retrieving the version string. --- gnu/packages/dav.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 5362d3505f..1b837dfe40 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -80,6 +80,11 @@ clients.") (if tests? (invoke "make" "test") #t))) + (add-after 'unpack 'patch-version-call + (lambda _ + (substitute* "docs/conf.py" + (("^release.*") (string-append "release = '" ,version "'\n"))) + #t)) (add-after 'install 'manpage (lambda* (#:key inputs outputs #:allow-other-keys) (invoke "make" "--directory=docs/" "man") -- cgit v1.2.3 From a7a8337b28535f29d3c64453fadb91c7c5dfc741 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Apr 2020 14:45:40 +0200 Subject: gnu: artanis: Use guile2.2-readline. * gnu/packages/guile-xyz.scm (artanis)[propagated-inputs]: Change from GUILE-READLINE to GUILE2.2-READLINE. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 1b3cde693e..3ae7e9ff92 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -153,7 +153,7 @@ ;; TODO: Add guile-dbi and guile-dbd optional dependencies. (propagated-inputs `(("guile-json" ,guile-json-1) - ("guile-readline" ,guile-readline) + ("guile-readline" ,guile2.2-readline) ("guile-redis" ,guile-redis))) (native-inputs `(("bash" ,bash) ;for the `source' builtin -- cgit v1.2.3 From 587398d2a82e0b5966a6827d36a1f1d115181b11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Apr 2020 15:03:01 +0200 Subject: gnu: custom-gcc: Ensure #:modules are not overridden by the inherited GCC. This fixes a regression introduced in 56c833ea287f8f6d3c72f8bddc314960c0164d64 where the #:modules argument became ineffective. Reported by Efraim Flashner in * gnu/packages/gcc.scm (custom-gcc)[arguments]: Add #:modules through SUBSTITUTE-KEYWORD-ARGUMENTS. --- gnu/packages/gcc.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index b69f3cf4b3..65664828cf 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -641,12 +641,12 @@ as the 'native-search-paths' field." (native-search-paths search-paths) (properties (alist-delete 'hidden? (package-properties gcc))) (arguments - (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 regex) - (srfi srfi-1) - (srfi srfi-26)) - ,@(package-arguments gcc)) + (substitute-keyword-arguments (package-arguments gcc) + ((#:modules modules %gnu-build-system-modules) + `(,@modules + (srfi srfi-1) + (srfi srfi-26) + (ice-9 regex))) ((#:configure-flags flags) `(cons (string-append "--enable-languages=" ,(string-join languages ",")) -- cgit v1.2.3 From 2f823fb493051df371f9637b782e6c46e13a8e10 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 27 Apr 2020 09:45:54 +0300 Subject: gnu: libjpeg-turbo: Fix building on powerpc. * gnu/packages/image.scm (libjpeg-turbo)[arguments]: Add configure-flags specific to powerpc to fix building and cross-building. --- gnu/packages/image.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c900bd0eb9..96e207e940 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Amirouche Boubekki ;;; Copyright © 2014, 2017 John Darrington ;;; Copyright © 2016, 2017, 2018, 2020 Leo Famulari -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016, 2017 Arun Isaac @@ -1532,6 +1532,10 @@ is hereby granted.")))) (arguments `(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib" "-DENABLE_STATIC=0" + ;; djpeg-shared-3x2-float-prog-cmp fails on 32-bit PPC. + ,@(if (string=? "powerpc-linux" (%current-system)) + `("-DFLOATTEST=NO") + '()) ;; The build system probes for the current CPU, but ;; that fails when cross-compiling. ,@(let ((target (%current-target-system))) @@ -1545,6 +1549,9 @@ is hereby granted.")))) `("-DCMAKE_SYSTEM_PROCESSOR=x86")) ((string-prefix? "x86_64" target) `("-DCMAKE_SYSTEM_PROCESSOR=x86_64")) + ;; 32-bit and 64-bit + ((string-prefix? "powerpc" target) + `("-DCMAKE_SYSTEM_PROCESSOR=powerpc")) (else '())) '()))) ,@(if (%current-target-system) -- cgit v1.2.3 From 709ca6c9824e4bbb0d81959b885248294fb062ae Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 26 Apr 2020 19:56:17 +0100 Subject: gnu: libgc/static-libs: Mark it as hidden. * gnu/packages/bdw-gc.scm (libgc/static-libs)[properties] Set hidden? to #t. --- gnu/packages/bdw-gc.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 112a161f94..50e4951dc1 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -91,7 +91,8 @@ C or C++ programs, though that is not its primary goal.") libgc (arguments (substitute-keyword-arguments (package-arguments libgc) ((#:configure-flags flags ''()) - `(cons "--enable-static" ,flags)))))) + `(cons "--enable-static" ,flags)))) + (properties '((hidden? . #t))))) (define-public libgc-7 (package -- cgit v1.2.3 From 8fe681b9ffc5c5b0056e3174fade2f9e0b58fb97 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Tue, 28 Apr 2020 11:53:23 +0200 Subject: gnu: Add edid-decode. * gnu/packages/hardware.scm (edid-decode): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/hardware.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 7ee657a75a..114332455e 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -79,6 +79,43 @@ calibrated, and restored when the calibration is applied.") (license (list license:bsd-3 ; FindDDCUtil.cmake license:gpl2+)))) ; everything else +(define-public edid-decode + (let ((commit "74b64180d67bb009d8d9ea1b6f18ad41aaa16396") ; 2020-04-22 + (revision "1")) + (package + (name "edid-decode") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "git://linuxtv.org/edid-decode.git") + (commit commit))) + (sha256 + (base32 "0nirp5bza08zj5d8bjgcm0p869hdg3qg3mwa7999pjdrzmn7s2ah")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No test suite + #:make-flags + (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) + "bindir=/bin" "mandir=/share/man") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cross-compilation + (lambda* (#:key native-inputs target #:allow-other-keys) + (when target + (substitute* "Makefile" + (("\\$\\(CXX\\)") + (string-append target "-g++")))) + #t)) + (delete 'configure)))) + (home-page "https://git.linuxtv.org/edid-decode.git/") + (synopsis "Decode @dfn{EDID} data in human-readable format") + (description "edid-decode decodes @dfn{EDID} monitor description data in +human-readable format and checks if it conforms to the standards.") + (license license:expat)))) + ;; Distinct from memtest86, which is obsolete. (define-public memtest86+ (package -- cgit v1.2.3 From 1228c2abcfd5b426385211e3b27379f27d655b17 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Apr 2020 13:34:22 +0200 Subject: gnu: kaldi-gstreamer-server: Update to 0-2.f68cab4. * gnu/packages/machine-learning.scm (kaldi-gstreamer-server): Update to 0-2.f68cab4. [inputs]: Replace python-2 with python-wrapper, python2-pygobject with python-pygobject, python2-pyyaml with python-pyyaml, and python2-tornado with python-tornado; remove python2-ws4py-for-kaldi-gstreamer-server and python2-futures. --- gnu/packages/machine-learning.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index f979a64d55..425961ee14 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1239,8 +1239,9 @@ automatically.") (license license:asl2.0)))) (define-public kaldi-gstreamer-server - (let ((commit "1735ba49c5dc0ebfc184e45105fc600cd9f1f508") - (revision "1")) + ;; This is the tip of the py3 branch + (let ((commit "f68cab490be7eb0da2af1475fbc16655f50a60cb") + (revision "2")) (package (name "kaldi-gstreamer-server") (version (git-version "0" revision commit)) @@ -1252,7 +1253,7 @@ automatically.") (file-name (git-file-name name version)) (sha256 (base32 - "0j701m7lbwmzqxsfanj882v7881hrbmpqybbczbxqpcbg8q34w0k")))) + "17lh1368vkg8ngrcbn2phvigzlmalrqg6djx2gg61qq1a0nj87dm")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests that can be run automatically @@ -1268,6 +1269,10 @@ automatically.") ;; are reproducible. (setenv "PYTHONHASHSEED" "0") (with-directory-excursion "kaldigstserver" + ;; This is a Python 2 file + (delete-file "decoder_test.py") + (delete-file "test-buffer.py") + (for-each (lambda (file) (apply invoke `("python" @@ -1318,12 +1323,10 @@ exec ~a ~a/~a \"$@\"~%" #t)))))) (inputs `(("gst-kaldi-nnet2-online" ,gst-kaldi-nnet2-online) - ("python2" ,python-2) - ("python2-futures" ,python2-futures) - ("python2-pygobject" ,python2-pygobject) - ("python2-pyyaml" ,python2-pyyaml) - ("python2-tornado" ,python2-tornado) - ("python2-ws4py" ,python2-ws4py-for-kaldi-gstreamer-server))) + ("python" ,python-wrapper) + ("python-pygobject" ,python-pygobject) + ("python-pyyaml" ,python-pyyaml) + ("python-tornado" ,python-tornado))) (home-page "https://github.com/alumae/kaldi-gstreamer-server") (synopsis "Real-time full-duplex speech recognition server") (description "This is a real-time full-duplex speech recognition server, -- cgit v1.2.3 From e979cea9052d45f2a3e703ebe4103f441190d087 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Apr 2020 13:35:51 +0200 Subject: gnu: Remove python2-ws4py-for-kaldi-gstreamer-server. * gnu/packages/python-web.scm (python2-ws4py-for-kaldi-gstreamer-server): Remove variable. --- gnu/packages/python-web.scm | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6b77a9d949..30cd22fddb 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3268,32 +3268,6 @@ such as IoT applications or multi-user database-driven business applications.") Python.") (license license:bsd-3))) -;; kaldi-gstreamer-server does not yet work with python-ws4py > 0.3.2 -(define-public python2-ws4py-for-kaldi-gstreamer-server - (package (inherit python-ws4py) - (name "python2-ws4py") - (version "0.3.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ws4py" version)) - (sha256 - (base32 - "12ys3dv98awhrxd570vla3hqgzq3avjhq4yafhghhq3a942y1928")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - ;; We don't have a package for cherrypy. - (add-after 'unpack 'remove-cherrypy-support - (lambda _ - (delete-file "ws4py/server/cherrypyserver.py") - #t))))) - (propagated-inputs - `(("python-gevent" ,python2-gevent) - ("python-tornado" ,python2-tornado))))) - (define-public python-slugify (package (name "python-slugify") -- cgit v1.2.3 From 27cb52a20b9c697131e3d51e7bf084d6af5b5a62 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 10 Jan 2020 08:49:02 -0500 Subject: gnu: gnome-calendar: Propagate evolution-data-server. * gnu/packages/gnome.scm (gnome-calendar)[inputs]: Move evolution-data-server from here... [propagated-inputs]: ...to here. Fixes . Signed-off-by: Ricardo Wurmus --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d96a5f4643..e6b1942450 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8094,13 +8094,14 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") ("gtk+-bin" ,gtk+ "bin") ; For gtk-update-icon-cache ("pkg-config" ,pkg-config))) (inputs - `(("evolution-data-server" ,evolution-data-server) - ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + `(("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("libdazzle" ,libdazzle) ("libedataserverui" ,evolution-data-server) ("libgweather" ,libgweather) ("geoclue" ,geoclue))) + (propagated-inputs + `(("evolution-data-server" ,evolution-data-server))) (home-page "https://wiki.gnome.org/Apps/Calendar") (synopsis "GNOME's calendar application") (description -- cgit v1.2.3 From 39a96b99fe66c2cf7ff8ff023f3839647332ebd9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 13:37:22 +0200 Subject: gnu: Add python-restructuredtext-lint. * gnu/packages/python-xyz.scm (python-restructuredtext-lint): New variable. --- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 31cafd47d1..45789d7eb5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3212,6 +3212,38 @@ reStructuredText.") (base32 "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji")))))) +(define-public python-restructuredtext-lint + (package + (name "python-restructuredtext-lint") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "restructuredtext-lint" version)) + (sha256 + (base32 + "026rdy5h82ng4vqxk8fnprii9d6qxf7hkygiv0a8afjvdlsxmcwp")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "nosetests" "-v")) + #t))))) + (propagated-inputs + `(("python-docutils" ,python-docutils))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/twolfson/restructuredtext-lint") + (synopsis "reStructuredText linter") + (description "This package provides a linter for the reStructuredText +format.") + (license license:unlicense))) + (define-public python-pygments (package (name "python-pygments") -- cgit v1.2.3 From d08782d16c21998a493e50e2c90a183a3d4a53bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 13:38:22 +0200 Subject: gnu: Add python-port-for. * gnu/packages/python-web.scm (python-port-for): New variable. --- gnu/packages/python-web.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 30cd22fddb..c0be3fa5d1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3595,3 +3595,35 @@ and rendering come directly from GitHub, so you'll know exactly how it will appear. Changes you make to the file will be instantly reflected in the browser without requiring a page refresh.") (license license:expat)))) + +(define-public python-port-for + (package + (name "python-port-for") + (version "0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "port-for" version)) + (sha256 + (base32 + "1pncxlj25ggw99r0ijfbkq70gd7cbhqdx5ivsxy4jdp0z14cpda7")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-urllib3 + (lambda _ + (substitute* "port_for/_download_ranges.py" + (("urllib2") "urllib3")) + #t))))) + (propagated-inputs + `(("python-urllib3" ,python-urllib3))) + (native-inputs + `(("python-mock" ,python-mock))) + (home-page "https://github.com/kmike/port-for/") + (synopsis "TCP localhost port finder and association manager") + (description + "This package provides a utility that helps with local TCP ports +management. It can find an unused TCP localhost port and remember the +association.") + (license license:expat))) -- cgit v1.2.3 From d0e0b865e1e97679f718daf159e766c19bc09c91 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 13:40:54 +0200 Subject: gnu: Add python-livereload. * gnu/packages/python-web.scm (python-livereload): New variable. --- gnu/packages/python-web.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c0be3fa5d1..0dba566a77 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3627,3 +3627,26 @@ without requiring a page refresh.") management. It can find an unused TCP localhost port and remember the association.") (license license:expat))) + +(define-public python-livereload + (package + (name "python-livereload") + (version "2.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "livereload" version)) + (sha256 + (base32 + "0rhggz185bxc3zjnfpmhcvibyzi86i624za1lfh7x7ajsxw4y9c9")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six) + ("python-tornado" ,python-tornado))) + (home-page "https://github.com/lepture/python-livereload") + (synopsis "Python LiveReload") + (description + "Python LiveReload provides a command line utility, @command{livereload}, +for starting a web server in a directory. It can trigger arbitrary commands +and serve updated contents upon changes to the directory.") + (license license:bsd-3))) -- cgit v1.2.3 From ff5ca61d15e979f1a91d77f950af13c76dd9b00a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 13:41:13 +0200 Subject: gnu: Add python-doc8. * gnu/packages/python-xyz.scm (python-doc8): New variable. --- gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 45789d7eb5..decc1ce8a6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3244,6 +3244,45 @@ reStructuredText.") format.") (license license:unlicense))) +(define-public python-doc8 + (package + (name "python-doc8") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "doc8" version)) + (sha256 + (base32 + "0hw5w8mpgsp51qg8nnq28p7y1jiksvz7a0axnn5bkgss3af9zy1d")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v")) + #t))))) + (propagated-inputs + `(("python-chardet" ,python-chardet) + ("python-docutils" ,python-docutils) + ("python-restructuredtext-lint" ,python-restructuredtext-lint) + ("python-six" ,python-six) + ("python-stevedore" ,python-stevedore))) + (native-inputs + `(("python-testtools" ,python-testtools) + ("python-pytest" ,python-pytest))) + (home-page "https://launchpad.net/doc8") + (synopsis + "Style checker for Sphinx (or other) RST documentation") + (description + "Doc8 is an opinionated style checker for reStructured Text and plain +text styles of documentation.") + (license license:asl2.0))) + (define-public python-pygments (package (name "python-pygments") -- cgit v1.2.3 From e9f93cd5f78ffa234263e049e594fc57cd1e94f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 13:41:52 +0200 Subject: gnu: Add python-sphinx-autobuild. * gnu/packages/sphinx.scm (python-sphinx-autobuild): New variable. --- gnu/packages/sphinx.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index ff5d8e5de7..f27f9d0176 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson -;;; Copyright © 2015, 2017, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Leo Famulari ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke @@ -597,3 +597,49 @@ to be able to read and render the Doxygen xml output.") "A utility tool that provides several features that make it easy to translate and to apply translation to Sphinx generated document.") (license license:bsd-2))) + +(define-public python-sphinx-autobuild + (package + (name "python-sphinx-autobuild") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sphinx-autobuild" version)) + (sha256 + (base32 + "0kn753dyh3b1s0h77lbk704niyqc7bamvq6v3s1f6rj6i20qyf36")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; See https://github.com/GaretJax/sphinx-autobuild/pull/72 + (add-after 'unpack 'use-later-port-for + (lambda _ + (substitute* "requirements.txt" + (("port_for==.*") "port_for\n")) + #t)) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v")) + #t))))) + (propagated-inputs + `(("python-argh" ,python-argh) + ("python-livereload" ,python-livereload) + ("python-pathtools" ,python-pathtools) + ("python-port-for" ,python-port-for) + ("python-pyyaml" ,python-pyyaml) + ("python-tornado" ,python-tornado) + ("python-watchdog" ,python-watchdog))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/GaretJax/sphinx-autobuild") + (synopsis "Rebuild Sphinx documentation when a change is detected") + (description + "This package lets you watch a Sphinx directory and rebuild the +documentation when a change is detected. It also includes a livereload +enabled web server.") + (license license:expat))) -- cgit v1.2.3 From c537d2bcb7c652b4776435cd1e2a5119af43dd78 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 29 Apr 2020 15:25:00 +0200 Subject: tests: install: Fix device usage. This is a follow-up of a860eddbbddeae5d3b6fe084e29ac9fafd2d6f02. Guided installation tests are now run from an ISO image. Hence the main block device is vda and not vdb anymore. * gnu/tests/install.scm (installation-target-os-for-gui-tests): Use %minimal-os-on-vda instead of %minimal-os. (%minimal-os-on-vda): Make sure that it replicates the config of %minimal-os. --- gnu/tests/install.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 8650474fbc..019e21fd39 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -387,6 +387,7 @@ per %test-installed-os, this test is expensive in terms of CPU and storage.") (services (cons (service marionette-service-type (marionette-configuration (imported-modules '((gnu services herd) + (guix build utils) (guix combinators))))) %base-services)))) @@ -1058,7 +1059,7 @@ build (current-guix) and then store a couple of full system images.") (define* (installation-target-os-for-gui-tests #:key (encrypted? #f)) (operating-system - (inherit %minimal-os) + (inherit %minimal-os-on-vda) (users (append (list (user-account (name "alice") (comment "Bob's sister") @@ -1076,7 +1077,7 @@ build (current-guix) and then store a couple of full system images.") ;; encryption support. (swap-devices (if encrypted? '() '("/dev/vda2"))) (services (cons (service dhcp-client-service-type) - (operating-system-user-services %minimal-os))))) + (operating-system-user-services %minimal-os-on-vda))))) (define* (installation-target-desktop-os-for-gui-tests #:key (encrypted? #f)) -- cgit v1.2.3 From 373c0dc95ce0dc65f378432d0cb1a29bda2f12e5 Mon Sep 17 00:00:00 2001 From: Masaya Tojo Date: Wed, 29 Apr 2020 16:26:21 +0200 Subject: gnu: Add emacs-twittering-mode. * gnu/packages/emacs-xyz.scm (emacs-twittering-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2c61c4189d..650a573542 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2632,6 +2632,27 @@ Stack Overflow, Super User, and other StackExchange sites.") Tom's Obvious, Minimal Language} data format.") (license license:gpl3+)))) +(define-public emacs-twittering-mode + (package + (name "emacs-twittering-mode") + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/twmode" + "/twittering-mode-" version + "/twittering-mode-" version ".tar.xz")) + (sha256 + (base32 "02imis1gxz90lah0b5n37j2hlsaw5igss11d85vpsm5d1bgw8j28")))) + (build-system emacs-build-system) + (home-page "http://twmode.sourceforge.net") + (synopsis "Emacs major mode for Twitter") + (description + "Twittering mode is an Emacs major mode for Twitter. +You can check timelines, tweet, mark posts as favorites and so on with +Emacs.") + (license license:gpl2+))) + (define-public emacs-f (package (name "emacs-f") -- cgit v1.2.3 From 6d25f29143b8ebe7f627a32418a369a1c5f8625f Mon Sep 17 00:00:00 2001 From: pinoaffe Date: Wed, 29 Apr 2020 16:29:53 +0200 Subject: gnu: Add emacs-ryo-modal. * gnu/packages/emacs-xyz.scm (emacs-ryo-modal): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 650a573542..56cd298c28 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -68,6 +68,7 @@ ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Jérémy Korwin-Zmijowski ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero +;;; Copyright © 2020 pinoaffe ;;; ;;; This file is part of GNU Guix. ;;; @@ -7312,6 +7313,30 @@ of its name.") names, e.g. #0000ff is displayed in white with a blue background.") (license license:gpl3+))) +(define-public emacs-ryo-modal + ;; Package has no release. Version is extracted from "Version:" keyword in + ;; main file. + (let ((commit "3a54312eea7023a86ca3f8eb3c03c872554bff2f") + (revision "0")) + (package + (name "emacs-ryo-modal") + (version (git-version "0.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Kungsgeten/ryo-modal.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cyvp3bi6yhckbdnq98xvghmhdzghya5y9wd7hxjawibs75rza95")))) + (build-system emacs-build-system) + (home-page "http://github.com/Kungsgeten/ryo-modal") + (synopsis "Emacs minor mode for defining modal editing environments") + (description "RYO modal provides a convenient way of defining modal +keybindings in Emacs, and does not come with any predefined bindings.") + (license license:expat)))) + (define-public emacs-visual-fill-column (package (name "emacs-visual-fill-column") -- cgit v1.2.3 From 1cc9947a53adc36d0767c1854f54178d91eb872d Mon Sep 17 00:00:00 2001 From: pinoaffe Date: Wed, 29 Apr 2020 16:33:35 +0200 Subject: gnu: Add emacs-kakoune. * gnu/packages/emacs-xyz.scm (emacs-kakoune): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 56cd298c28..9200122b77 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2479,6 +2479,37 @@ create an Extempore REPL, connect the current @code{extempore-mode} buffer to a running Extempore process, and more.") (license license:bsd-2)))) +(define-public emacs-kakoune + ;; Package has no release. Version is extracted from "Version:" keyword in + ;; main file. + (let ((commit "d73d14e69ea38076af50cc69f846808383ff539d") + (revision "0")) + (package + (name "emacs-kakoune") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jmorag/kakoune.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nk6jdy1y5mc3ryd0smiqghrk6iv34d5grc7f7migmshlbq0np92")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-expand-region" ,emacs-expand-region) + ("emacs-multiple-cursors" ,emacs-multiple-cursors) + ("emacs-ryo-modal" ,emacs-ryo-modal))) + (home-page "https://github.com/jmorag/kakoune.el") + (synopsis "Emacs simple simulation, but not emulation, of Kakoune") + (description "This package provides many, but not all of the editing +primitives in the Kakoune editor. Unlike Evil mode for Vim, this is a very +shallow emulation, which seeks to do as little work as possible, leveraging +Emacs native editing commmands and the work of other packages wherever +possible.") + (license license:expat)))) + (define-public emacs-keyfreq (package (name "emacs-keyfreq") -- cgit v1.2.3 From 587ccf4c793973dcde1abd3ef207a9ee58b9f0e5 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 29 Apr 2020 19:36:30 +0300 Subject: gnu: emacs-vterm: Update to 0-1.e63bd65. * gnu/packages/emacs-xyz.scm (emacs-vterm): Update to 0-1.e63bd65. --- gnu/packages/emacs-xyz.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9200122b77..79f7126ed7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18241,7 +18241,7 @@ stored playlists.") (define-public emacs-vterm (let ((version "0") (revision "1") - (commit "7d7381fa8104b55b70148cf147523d9ab7f01fcd")) + (commit "e63bd65eece7c5de3a534b7e2fdbe58256ec2da0")) (package (name "emacs-vterm") (version (git-version version revision commit)) @@ -18253,7 +18253,7 @@ stored playlists.") (file-name (git-file-name name version)) (sha256 (base32 - "04a2jlhmr20ipgzpnba3yryw3ly7qdxjgaw10dwn9wxy1yqmapz1")))) + "0iq857w54qmazxh23fipz85fb9i6dav3f63g0ghpmi6mybfp6i5v")))) (build-system emacs-build-system) (arguments `(#:modules ((guix build emacs-build-system) @@ -18264,14 +18264,11 @@ stored playlists.") (guix build cmake-build-system)) #:phases (modify-phases %standard-phases - (add-before 'add-source-to-load-path 'remove-vterm-module-make + (add-before 'add-source-to-load-path 'substitute-vterm-module-path (lambda* (#:key outputs #:allow-other-keys) - ;; Remove the Emacs Lisp file. - (delete-file "vterm-module-make.el") - ;; Remove references to the removed file. - (make-file-writable "vterm.el") + (chmod "vterm.el" #o644) (emacs-substitute-sexps "vterm.el" - ("(or (require 'vterm-module nil t)" + ("(require 'vterm-module nil t)" `(module-load ,(string-append (assoc-ref outputs "out") "/lib/vterm-module.so")))) -- cgit v1.2.3 From 19987f5efe0acb65918802681f3a18cbb6a07c2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Apr 2020 16:57:09 +0200 Subject: gnu: foo2zjs: Update to 20200426. * gnu/packages/cups.scm (foo2zjs): Update to 20200426. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 1db2f101f1..f24ea6c02a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -673,14 +673,14 @@ printer/driver specific, but spooler-independent PPD file.") (define-public foo2zjs (package (name "foo2zjs") - (version "20200207") + (version "20200426") (source (origin (method url-fetch) ;; XXX: This is an unversioned URL! (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") (sha256 (base32 - "0pf1sm29gnrhhpyvq95jskvr874h5r4kls9w10gc24z23fjmr5zx")))) + "0wwh29ddd59q18r1jpi3166lgnwr8zn9lry82vahc2g96l97isp7")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From f224a8bb79cc3c9e5960227ffea5524eb666d34a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Apr 2020 15:59:16 -0400 Subject: gnu: OpenLDAP: Update to 2.4.50 [fixes CVE-2019-{13057,13565}]. * gnu/packages/openldap.scm (openldap)[replacement]: Use openldap-2.4.50. (openldap/fixed): Replace with ... (openldap-2.4.50): ... new variable. * gnu/packages/patches/openldap-CVE-2020-12243.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/openldap.scm | 16 ++- gnu/packages/patches/openldap-CVE-2020-12243.patch | 125 --------------------- 3 files changed, 11 insertions(+), 131 deletions(-) delete mode 100644 gnu/packages/patches/openldap-CVE-2020-12243.patch diff --git a/gnu/local.mk b/gnu/local.mk index 67bf04547c..9426ee30a0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1276,7 +1276,6 @@ dist_patch_DATA = \ %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ - %D%/packages/patches/openldap-CVE-2020-12243.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssl-runpath.patch \ diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index aa51520654..53c57e846f 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -58,8 +58,8 @@ (define-public openldap (package - (replacement openldap/fixed) (name "openldap") + (replacement openldap-2.4.50) (version "2.4.47") (source (origin (method url-fetch) @@ -112,12 +112,18 @@ (license openldap2.8) (home-page "https://www.openldap.org/"))) -(define openldap/fixed +(define openldap-2.4.50 (package (inherit openldap) - (source - (origin (inherit (package-source openldap)) - (patches (search-patches "openldap-CVE-2020-12243.patch")))))) + (version "2.4.50") + (source (origin + (method url-fetch) + (uri (string-append "https://www.openldap.org/software/download/" + "OpenLDAP/openldap-release/openldap-" version + ".tgz")) + (sha256 + (base32 + "1f46nlfwmys110j36sifm7ah8m8f3s10c3vaiikmmigmifapvdaw")))))) (define-public nss-pam-ldapd (package diff --git a/gnu/packages/patches/openldap-CVE-2020-12243.patch b/gnu/packages/patches/openldap-CVE-2020-12243.patch deleted file mode 100644 index 6321998198..0000000000 --- a/gnu/packages/patches/openldap-CVE-2020-12243.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 98464c11df8247d6a11b52e294ba5dd4f0380440 Mon Sep 17 00:00:00 2001 -From: Howard Chu -Date: Thu, 16 Apr 2020 01:08:19 +0100 -Subject: [PATCH] ITS#9202 limit depth of nested filters - -Using a hardcoded limit for now; no reasonable apps -should ever run into it. ---- - servers/slapd/filter.c | 41 ++++++++++++++++++++++++++++++++--------- - 1 file changed, 32 insertions(+), 9 deletions(-) - -diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c -index 3252cf2a7..ed57bbd7b 100644 ---- a/servers/slapd/filter.c -+++ b/servers/slapd/filter.c -@@ -37,11 +37,16 @@ - const Filter *slap_filter_objectClass_pres; - const struct berval *slap_filterstr_objectClass_pres; - -+#ifndef SLAPD_MAX_FILTER_DEPTH -+#define SLAPD_MAX_FILTER_DEPTH 5000 -+#endif -+ - static int get_filter_list( - Operation *op, - BerElement *ber, - Filter **f, -- const char **text ); -+ const char **text, -+ int depth ); - - static int get_ssa( - Operation *op, -@@ -80,12 +85,13 @@ filter_destroy( void ) - return; - } - --int --get_filter( -+static int -+get_filter0( - Operation *op, - BerElement *ber, - Filter **filt, -- const char **text ) -+ const char **text, -+ int depth ) - { - ber_tag_t tag; - ber_len_t len; -@@ -126,6 +132,11 @@ get_filter( - * - */ - -+ if( depth > SLAPD_MAX_FILTER_DEPTH ) { -+ *text = "filter nested too deeply"; -+ return SLAPD_DISCONNECT; -+ } -+ - tag = ber_peek_tag( ber, &len ); - - if( tag == LBER_ERROR ) { -@@ -221,7 +232,7 @@ get_filter( - - case LDAP_FILTER_AND: - Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 ); -- err = get_filter_list( op, ber, &f.f_and, text ); -+ err = get_filter_list( op, ber, &f.f_and, text, depth+1 ); - if ( err != LDAP_SUCCESS ) { - break; - } -@@ -234,7 +245,7 @@ get_filter( - - case LDAP_FILTER_OR: - Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 ); -- err = get_filter_list( op, ber, &f.f_or, text ); -+ err = get_filter_list( op, ber, &f.f_or, text, depth+1 ); - if ( err != LDAP_SUCCESS ) { - break; - } -@@ -248,7 +259,7 @@ get_filter( - case LDAP_FILTER_NOT: - Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 ); - (void) ber_skip_tag( ber, &len ); -- err = get_filter( op, ber, &f.f_not, text ); -+ err = get_filter0( op, ber, &f.f_not, text, depth+1 ); - if ( err != LDAP_SUCCESS ) { - break; - } -@@ -311,10 +322,22 @@ get_filter( - return( err ); - } - -+int -+get_filter( -+ Operation *op, -+ BerElement *ber, -+ Filter **filt, -+ const char **text ) -+{ -+ return get_filter0( op, ber, filt, text, 0 ); -+} -+ -+ - static int - get_filter_list( Operation *op, BerElement *ber, - Filter **f, -- const char **text ) -+ const char **text, -+ int depth ) - { - Filter **new; - int err; -@@ -328,7 +351,7 @@ get_filter_list( Operation *op, BerElement *ber, - tag != LBER_DEFAULT; - tag = ber_next_element( ber, &len, last ) ) - { -- err = get_filter( op, ber, new, text ); -+ err = get_filter0( op, ber, new, text, depth ); - if ( err != LDAP_SUCCESS ) - return( err ); - new = &(*new)->f_next; --- -2.26.2 - -- cgit v1.2.3 From 4b800bff8039ca718aa70db814dc51b5de18da8e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 21 Apr 2020 10:34:30 +0200 Subject: gnu: python-aiosqlite: Update to 0.12.0. * gnu/packages/databases.scm (python-aiosqlite): Update to 0.12.0. Signed-off-by: Leo Famulari --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 606594e005..bf5398d87b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2743,14 +2743,14 @@ translate the complete SQLite API into Python.") (define-public python-aiosqlite (package (name "python-aiosqlite") - (version "0.11.0") + (version "0.12.0") (source (origin (method url-fetch) (uri (pypi-uri "aiosqlite" version)) (sha256 (base32 - "1f3zdldp9zgrw6qz5fsp3wa5zw73cjf139pj4vf24ryv895320jg")))) + "1w8248yz85xyzvvh4jaxnc59fqil45aka6h82kn1rcih4rjxbnn1")))) (build-system python-build-system) (native-inputs `(("python-aiounittest" ,python-aiounittest))) -- cgit v1.2.3 From 510472f865a9a21cce4ed8b1f16236ed513dbccc Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 21 Apr 2020 10:35:33 +0200 Subject: gnu: python-pypika: Update to 0.37.2. * gnu/packages/databases.scm (python-pypika): Update to 0.37.2. Signed-off-by: Leo Famulari --- gnu/packages/databases.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index bf5398d87b..57a5128e9e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3074,14 +3074,16 @@ transforms idiomatic python function calls to well-formed SQL queries.") (define-public python-pypika (package (name "python-pypika") - (version "0.36.0") + (version "0.37.2") (source - (origin - (method url-fetch) - (uri (pypi-uri "PyPika" version)) - (sha256 - (base32 - "0qzn5vygirg52dlizm6ayzdc5llq8p2krrx0kymr236lrz89wqp8")))) + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/kayak/pypika.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "089z1c778q1fwhzsc88ws8j5gm2hgxknibabn4wpax8rz2bfs3ck")))) (build-system python-build-system) (native-inputs `(("python-parameterized" ,python-parameterized))) -- cgit v1.2.3 From b9d96ed77343e3f158f7ee1c758270bf4f059a74 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 21 Apr 2020 10:36:29 +0200 Subject: gnu: python-tortoise-orm: Update to 0.16.7 [security fixes]. * gnu/packages/databases.scm (python-tortoise-orm)[source]: Update to 0.16.7. [propagated-inputs]: Propagate python-ciso8601, which is required in setup.py. Signed-off-by: Leo Famulari --- gnu/packages/databases.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 57a5128e9e..23b8f14c54 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2197,24 +2197,24 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") (define-public python-tortoise-orm (package (name "python-tortoise-orm") - (version "0.16.3") + (version "0.16.7") (source (origin (method url-fetch) (uri (pypi-uri "tortoise-orm" version)) (sha256 (base32 - "01hbvfyxs2qd1mjc96aipwsdxxhydw8ww686r4gsf87bl6f98dvz")))) + "0wr7p4v0b16ypm9fcpwpl99kf491m6w3jkd13xcsgq13fy73fbqc")))) (build-system python-build-system) ;; Disable tests for now. They pull in a lot of dependencies. (arguments `(#:tests? #f)) (native-inputs - `(("python-ciso8601" ,python-ciso8601) - ("python-asynctest" ,python-asynctest) + `(("python-asynctest" ,python-asynctest) ("python-nose2" ,python-nose2))) (propagated-inputs `(("python-aiosqlite" ,python-aiosqlite) ("python-pypika" ,python-pypika) + ("python-ciso8601" ,python-ciso8601) ("python-typing-extensions" ,python-typing-extensions))) (home-page -- cgit v1.2.3 From e118837ede3f96bc76c7db22f1fc2cc348099507 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Wed, 29 Apr 2020 16:49:36 +0200 Subject: gnu: Add aspell-dict-pl. * gnu/packages/aspell.scm (aspell-dict-pl): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/aspell.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index b11a2dbe6b..689fe64ec1 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2020 Timotej Lazar +;;; Copyright © 2020 Marcin Karpezo ;;; ;;; This file is part of GNU Guix. ;;; @@ -298,6 +299,13 @@ dictionaries, including personal ones.") (base32 "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"))) +(define-public aspell-dict-pl + (aspell-dictionary "pl" "Polish" + #:version "0.51-0" + #:sha256 + (base32 + "1a3ccji6k5gys7l3ilr2lh5pzxgzb7ipc5vb737svl6nqgdy8757"))) + (define-public aspell-dict-pt-br (aspell-dictionary "pt_BR" "Brazilian Portuguese" #:version "20131030-12-0" -- cgit v1.2.3 From c5c25b39ebe68dd89bf3913d2766df3a8a77dff1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 29 Apr 2020 16:14:55 -0400 Subject: gnu: magic-wormhole-mailbox-server: Update to 0.4.1. * gnu/packages/magic-wormhole.scm (magic-wormhole-mailbox-server): Update to 0.4.1. --- gnu/packages/magic-wormhole.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index bdfc1162b6..85b25bc0e5 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -29,14 +29,14 @@ (define-public magic-wormhole-mailbox-server (package (name "magic-wormhole-mailbox-server") - (version "0.3.1") + (version "0.4.1") (source (origin (method url-fetch) (uri (pypi-uri "magic-wormhole-mailbox-server" version)) (sha256 (base32 - "1q6zhbx8fcpk7rchclm7yqcxdsc1x97hki2ji61sa544r5xvxv55")))) + "1yw8i8jv5iv1kkz1aqimskw7fpichjn6ww0fq0czbalwj290bw8s")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 718c8837f94f792d93b4fe1f8259f02718755f49 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 29 Apr 2020 16:15:19 -0400 Subject: gnu: magic-wormhole-transit-relay: Update to 0.2.1. * gnu/packages/magic-wormhole.scm (magic-wormhole-transit-relay): Update to 0.2.1. --- gnu/packages/magic-wormhole.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index 85b25bc0e5..4456f95d99 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -68,14 +68,14 @@ connection, or through a transit-relay.") (define-public magic-wormhole-transit-relay (package (name "magic-wormhole-transit-relay") - (version "0.1.2") + (version "0.2.1") (source (origin (method url-fetch) (uri (pypi-uri "magic-wormhole-transit-relay" version)) (sha256 (base32 - "11w5gdc6am2ph5rns60x0694sx4zrlzxj540jljhn5cmnbx1ngxi")))) + "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From fb5bb6bd9e451aa672e67573bf2911a5fc7b4d6d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 29 Apr 2020 16:15:40 -0400 Subject: gnu: Magic Wormhole: Update to 0.12.0. * gnu/packages/magic-wormhole.scm (magic-wormhole): Update to 0.12.0. --- gnu/packages/magic-wormhole.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index 4456f95d99..465e6aced6 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -107,14 +107,14 @@ together, allowing them to pretend they have a direct connection.") (define-public magic-wormhole (package (name "magic-wormhole") - (version "0.11.2") + (version "0.12.0") (source (origin (method url-fetch) (uri (pypi-uri "magic-wormhole" version)) (sha256 (base32 - "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf")))) + "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From fd65311cf4ee043290c594900b99ddeb9d8dff3a Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Wed, 29 Apr 2020 14:51:33 +0200 Subject: gnu: Add sbcl-stumpwm-pass. * gnu/packages/wm.scm (sbcl-stumpwm-pass): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4d1b6b3fd4..9f64f206af 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Boris A. Dekshteyn +;;; Copyright © 2020 Marcin Karpezo ;;; ;;; This file is part of GNU Guix. ;;; @@ -1730,6 +1731,36 @@ productive, customizable lisp based systems.") rendering.") (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) +(define-public sbcl-stumpwm-pass + (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") + (revision "1")) + (package + (name "sbcl-pass") + (version (git-version "0.0.1" revision commit)) ;no upstream release + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stumpwm/stumpwm-contrib.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (inputs + `(("stumpwm" ,stumpwm "lib"))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "util/pass")))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "Integrate @code{pass} wih StumpWM") + (description "This package provides an interface which integrates +password-store into StumpWM.") + (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) + (define-public sbcl-stumpwm-globalwindows (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") (revision "1")) -- cgit v1.2.3 From 145df67b25dbabc31fba8a152bee639c34f1a44f Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Wed, 29 Apr 2020 15:26:11 +0200 Subject: doc: cookbook: Rename stumpwm package to current state. * doc/guix-cookbook.texi (StumpWM): Rename STUMPWM package to current state. Signed-off-by: Oleg Pykhalov --- doc/guix-cookbook.texi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 82700a48ad..f58d18d47c 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -13,6 +13,7 @@ Copyright @copyright{} 2019 Efraim Flashner@* Copyright @copyright{} 2019 Pierre Neidhardt@* Copyright @copyright{} 2020 Oleg Pykhalov@* Copyright @copyright{} 2020 Matthew Brooks@* +Copyright @copyright{} 2020 Marcin Karpezo@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -1575,7 +1576,7 @@ available for inclusion into the initrd. @cindex stumpwm You could install StumpWM with a Guix system by adding -@code{stumpwm-checkout} and optionally @code{`(,stumpwm-checkout "lib")} +@code{stumpwm} and optionally @code{`(,stumpwm "lib")} packages to a system configuration file, e.g.@: @file{/etc/config.scm}. An example configuration can look like this: @@ -1586,7 +1587,7 @@ An example configuration can look like this: (operating-system ;; … - (packages (append (list sbcl stumpwm-checkout `(,stumpwm-checkout "lib")) + (packages (append (list sbcl stumpwm `(,stumpwm "lib")) %base-packages))) @end lisp @@ -1601,7 +1602,7 @@ module @code{sbcl-stumpwm-ttf-fonts}, adding it to Guix system packages: (operating-system ;; … - (packages (append (list sbcl stumpwm-checkout `(,stumpwm-checkout "lib")) + (packages (append (list sbcl stumpwm `(,stumpwm "lib")) sbcl-stumpwm-ttf-fonts font-dejavu %base-packages))) @end lisp -- cgit v1.2.3 From ad2736717a475fa696b4fe637d722f31ed520a8d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Apr 2020 13:41:38 +0200 Subject: gnu: python-psutil: Update to 5.7.0. * gnu/packages/python-xyz.scm (python-psutil): Update to 5.7.0. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index decc1ce8a6..6f881161fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -412,16 +412,17 @@ data for video and audio files.") (define-public python-psutil (package (name "python-psutil") - (version "5.6.5") + (version "5.7.0") (source (origin (method url-fetch) (uri (pypi-uri "psutil" version)) (sha256 - (base32 "0isil5jxwwd8awz54qk28rpgjg43i5l6yl70g40vxwa4r4m56lfh")))) + (base32 "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8")))) (build-system python-build-system) (arguments - ;; FIXME: some tests does not return and times out. + ;; FIXME: some tests do not return and time out. Some tests fail because + ;; some processes survive kill(). '(#:tests? #f)) (home-page "https://www.github.com/giampaolo/psutil") (synopsis "Library for retrieving information on running processes") -- cgit v1.2.3 From 88f8a7c6100302e66e9a0058ae018042cdd27b62 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 14:12:37 +0200 Subject: gnu: Add python-voluptuous. * gnu/packages/python-xyz.scm (python-voluptuous): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6f881161fd..e6088bd6ce 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19660,3 +19660,24 @@ workspace...") dependencies. It implements the @uref{http://opensoundcontrol.org/spec-1_0, Open Sound Control 1.0} specification.") (license license:unlicense))) + +(define-public python-voluptuous + (package + (name "python-voluptuous") + (version "0.11.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "voluptuous" version)) + (sha256 + (base32 + "0mplkcpb5d8wjf8vk195fys4y6a3wbibiyf708imw33lphfk9g1a")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/alecthomas/voluptuous") + (synopsis "Python data validation library") + (description + "Voluptuous is a Python data validation library. It is primarily +intended for validating data coming into Python as JSON, YAML, etc.") + (license license:bsd-3))) -- cgit v1.2.3 From 7e3ddb6904e27b18f364b7c3b161f2927017155c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 14:12:49 +0200 Subject: gnu: Add python-cmd2. * gnu/packages/python-xyz.scm (python-cmd2): New variable. --- gnu/packages/python-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e6088bd6ce..c37ed2bfa0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19681,3 +19681,49 @@ Open Sound Control 1.0} specification.") "Voluptuous is a Python data validation library. It is primarily intended for validating data coming into Python as JSON, YAML, etc.") (license license:bsd-3))) + +(define-public python-cmd2 + (package + (name "python-cmd2") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cmd2" version)) + (sha256 + (base32 + "1f18plbc9yyvhn0js3d2bii9yld8zfl775gxsaw9jza5pmlg9ss2")))) + (build-system python-build-system) + (propagated-inputs + `(("python-attrs" ,python-attrs) + ("python-colorama" ,python-colorama) + ("python-pyperclip" ,python-pyperclip) + ("python-wcwidth" ,python-wcwidth))) + (native-inputs + `(("python-codecov" ,python-codecov) + ("python-coverage" ,python-coverage) + ("python-doc8" ,python-doc8) + ("python-flake8" ,python-flake8) + ("python-invoke" ,python-invoke) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-mock" ,python-pytest-mock) + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-sphinx" ,python-sphinx) + ("python-sphinx-autobuild" ,python-sphinx-autobuild) + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) + ("python-tox" ,python-tox) + ("python-twine" ,python-twine) + ("which" ,which))) + (home-page "https://github.com/python-cmd2/cmd2") + (synopsis "Tool for building interactive command line applications") + (description + "Cmd2 is a tool for building interactive command line applications in +Python. Its goal is to make it quick and easy for developers to build +feature-rich and user-friendly interactive command line applications. It +provides a simple API which is an extension of Python's built-in @code{cmd} +module. @code{cmd2} provides a wealth of features on top of @code{cmd} to +make your life easier and eliminates much of the boilerplate code which would +be necessary when using @code{cmd}.") + (license license:expat))) -- cgit v1.2.3 From 37130eccd23eccfdc6653c3e73321fea4000d51d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 22:16:31 +0200 Subject: gnu: Remove python2-pyflakes-0.8.1. * gnu/packages/python-xyz.scm (python2-pyflakes-0.8.1): Remove variable. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c37ed2bfa0..c6c6bf2c3e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7454,9 +7454,6 @@ complexity of Python source code.") ;; XXX Tests not compatible with Python 3.5. '(#:tests? #f)))) -(define-public python2-pyflakes-0.8.1 - (package-with-python2 python-pyflakes-0.8.1)) - (define-public python-flake8 (package (name "python-flake8") -- cgit v1.2.3 From a6559240098d8b8ff7f799f57aecf96a53a88401 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 22:19:25 +0200 Subject: gnu: Replace python-pyflakes-0.8.1 with python-pyflakes-1.2. * gnu/packages/python-xyz.scm (python-pyflakes-0.8.1): Remove variable. (python-pyflakes-1.2): New variable. * gnu/packages/openstack.scm (python-hacking)[propagated-inputs]: Replace python-pyflakes-0.8.1 with python-pyflakes-1.2. --- gnu/packages/openstack.scm | 2 +- gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 8dd8c1907c..6c81454150 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -144,7 +144,7 @@ manner.") ("python-mccabe-0.2.1" ,python-mccabe-0.2.1) ("python-pbr" ,python-pbr) ("python-pep8-1.5.7" ,python-pep8-1.5.7) - ("python-pyflakes-0.8.1" ,python-pyflakes-0.8.1) + ("python-pyflakes-1.2" ,python-pyflakes-1.2) ("python-six" ,python-six))) (native-inputs `( ;; Tests diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c6c6bf2c3e..80185f49e0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7380,6 +7380,27 @@ PEP 8.") (define-public python2-pyflakes (package-with-python2 python-pyflakes)) +;; Flake8 2.6 requires an older version of pyflakes. +;; This should be removed ASAP. +(define-public python-pyflakes-1.2 + (package (inherit python-pyflakes) + (version "1.2.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyflakes" version)) + (sha256 + (base32 + "17hkw8yd44cr8fz13phy4aih3r5j2p7ild4zlvqdh2c8dmiinjif")))) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; This one test fails. + (replace 'check + (lambda _ (invoke "pytest" "-vv" "-k" "not test_f_string")))))) + (native-inputs + `(("python-pytest" ,python-pytest))))) + (define-public python-mccabe (package (name "python-mccabe") @@ -7438,22 +7459,6 @@ complexity of Python source code.") (define-public python2-pep8-1.5.7 (package-with-python2 python-pep8-1.5.7)) -;; Flake8 2.4.1 requires an older version of pyflakes. -;; This should be removed ASAP. -(define-public python-pyflakes-0.8.1 - (package (inherit python-pyflakes) - (version "0.8.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyflakes" version)) - (sha256 - (base32 - "0sbpq6pqm1i9wqi41mlfrsc5rk92jv4mskvlyxmnhlbdnc80ma1z")))) - (arguments - ;; XXX Tests not compatible with Python 3.5. - '(#:tests? #f)))) - (define-public python-flake8 (package (name "python-flake8") -- cgit v1.2.3 From 7fea8e076fd2405c0d53d7ee5d7a36936215ffcc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 22:23:19 +0200 Subject: gnu: Remove python2-flake8-2.5. * gnu/packages/python-xyz.scm (python2-flake8-2.5): Remove variable. (python-flake8-2.5)[properties]: Remove. --- gnu/packages/python-xyz.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 80185f49e0..1110360afd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7519,18 +7519,7 @@ complexity of Python source code.") "1snylqwbmrylbx3r1wpz8ggk98f6bcag4441ag8mm2l7wyn58sij")))) (propagated-inputs `(("python-pep8" ,python-pep8) - ,@(package-propagated-inputs python-flake8))) - (properties `((python2-variant . ,(delay python2-flake8-2.5)))))) - -(define-public python2-flake8-2.5 - (package - (inherit python2-flake8) - (version (package-version python-flake8-2.5)) - (source (origin - (inherit (package-source python-flake8-2.5)))) - (propagated-inputs - `(("python2-pep8" ,python2-pep8) - ,@(package-propagated-inputs python2-flake8))))) + ,@(package-propagated-inputs python-flake8))))) (define-public python-flake8-polyfill (package -- cgit v1.2.3 From 7b0e0fd5a2f963758d4c9161e9f2844e56289dad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 22:24:49 +0200 Subject: gnu: python-flake8-2.5: Update to 2.6.2. * gnu/packages/python-xyz.scm (python-flake8-2.5): Update to 2.6.2; rename it... (python-flake8-2.6): ...to this. [arguments]: Add phase "use-later-pycodestyles", and move "check" phase after "install". [propagated-inputs]: Explicitly list python-pycodestyle, python-entrypoints, python-pyflakes-1.2, and python-mccabe. --- gnu/packages/python-xyz.scm | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1110360afd..0f4351d152 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7506,20 +7506,39 @@ complexity of Python source code.") ("python2-typing" ,python2-typing) ,@(package-propagated-inputs base)))))) -;; python-hacking requires flake8 <2.6.0. -(define-public python-flake8-2.5 +;; python-hacking requires flake8 <2.7.0. +(define-public python-flake8-2.6 (package (inherit python-flake8) - (version "2.5.5") + (version "2.6.2") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "1snylqwbmrylbx3r1wpz8ggk98f6bcag4441ag8mm2l7wyn58sij")))) + "0y57hzal0j84dh9i1g1g6dc4aywvrnhy2fjmmbglpv5ajihxh713")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-later-pycodestyles + (lambda __ + (substitute* '("flake8.egg-info/requires.txt" + "setup.py") + (("pycodestyle >= 2.0, < 2.1") + "pycodestyle >= 2.0")) + #t)) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v") + #t))))) (propagated-inputs `(("python-pep8" ,python-pep8) - ,@(package-propagated-inputs python-flake8))))) + ("python-pycodestyle" ,python-pycodestyle) + ("python-entrypoints" ,python-entrypoints) + ("python-pyflakes" ,python-pyflakes-1.2) + ("python-mccabe" ,python-mccabe))))) (define-public python-flake8-polyfill (package -- cgit v1.2.3 From 851a3a779a7173807683e0a3c4e118ef4d8eb0b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Apr 2020 22:28:07 +0200 Subject: gnu: python-hacking: Update to 1.1.0. * gnu/packages/openstack.scm (python-hacking): Update to 1.1.0. [arguments]: Add "delete-broken-test" phase. [propagated-inputs]: Replace python-flake8-2.5 with python-flake8-2.6. --- gnu/packages/openstack.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 6c81454150..a1e21d8872 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017, 2019 Clément Lassieur ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -130,17 +131,27 @@ manner.") (define-public python-hacking (package (name "python-hacking") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "hacking" version)) (sha256 (base32 - "0s9l99s64jsyvm28fa4hzllbdi21sb7jn4gzdf1pd5ckvy7p4b0k")))) + "1vlgh81v4vsw3q3cf7qggsp043vq16knp203lrll82h7l7rhd8r3")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-broken-test + (lambda _ + ;; TODO: Just one test fails: + ;; hacking.tests.test_doctest.HackingTestCase.test_pycodestyle + ;; (H403-hacking_docstring_multiline_end-line-5) + (delete-file "hacking/tests/test_doctest.py") + #t))))) (propagated-inputs - `(("python-flake8" ,python-flake8-2.5) + `(("python-flake8" ,python-flake8-2.6) ("python-mccabe-0.2.1" ,python-mccabe-0.2.1) ("python-pbr" ,python-pbr) ("python-pep8-1.5.7" ,python-pep8-1.5.7) -- cgit v1.2.3 From 5bc78570b28806b12485dc9863cd7d2c06d5883a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 29 Apr 2020 22:12:10 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.119. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.119. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 12cb39ff9b..b5400d8a83 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,10 +385,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.118") +(define-public linux-libre-4.19-version "4.19.119") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "15lcq3xky59v88vb8vvnmgcsmm1fadz0m4jyrii6rynsz5jr6x49"))) + (hash (base32 "1klvdzz8sndg2zsr1anfy9p5fc1aapjqvc249myrbndyf55bk91b"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 09b87e503d3af1db309fdb3ea5617986013751f3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 29 Apr 2020 22:13:15 -0400 Subject: gnu: linux-libre@5.6: Update to 5.6.8. * gnu/packages/linux.scm (linux-libre-5.6-version): Update to 5.6.8. (linux-libre-5.6-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b5400d8a83..dd16cdc17d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,10 +369,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.7") +(define-public linux-libre-5.6-version "5.6.8") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "1jljcva3gxg1yc2kw3jjgmhzzdm16nylzxl63zbndjza547l5813"))) + (hash (base32 "1pw2q9509jzp84b6qasaais2ws25v2wrjh072q0x3j520zzl5q8r"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -- cgit v1.2.3 From 89ea0415b33bc3382ead3755fc2fc27c11920878 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 29 Apr 2020 22:13:56 -0400 Subject: gnu: linux-libre: Update to 5.4.36. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.36. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dd16cdc17d..70d2163fee 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -377,10 +377,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.35") +(define-public linux-libre-5.4-version "5.4.36") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1m06k19pbb3wz8z2dgf03jvzbbdh6q8jwwdz509s902a53vxasz1"))) + (hash (base32 "13avfvimjyg4lhj9micgib9bb5qpx11cja5liypid0rf2acfmymr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From f03e5ca59f2f099693def2c8e6ff409e5b4ed40a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 30 Apr 2020 10:09:15 +0200 Subject: gnu: gnuradio: Fix runtime python environment for plugins. * gnu/packages/radio.scm (gnuradio)[native-search-paths]: Add PYTHONPATH. [native-inputs]: Move python ... [inputs]: ... here. --- gnu/packages/radio.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 935880780f..30567431bf 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -26,6 +26,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix utils) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -266,7 +267,6 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") ("ghostscript" ,ghostscript) ("orc" ,orc) ("pkg-config" ,pkg-config) - ("python" ,python) ("python-cheetah" ,python-cheetah) ("python-mako" ,python-mako) ("python-pyzmq" ,python-pyzmq) @@ -293,6 +293,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") ("log4cpp" ,log4cpp) ("pango" ,pango) ("portaudio" ,portaudio) + ("python" ,python) ("python-click" ,python-click) ("python-click-plugins" ,python-click-plugins) ("python-lxml" ,python-lxml) @@ -364,9 +365,16 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") `("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths)))) #t))))) (native-search-paths + ;; Variables required to find third-party plugins at runtime. (list (search-path-specification (variable "GRC_BLOCKS_PATH") - (files '("/share/gnuradio/grc/blocks"))))) + (files '("share/gnuradio/grc/blocks"))) + (search-path-specification + (variable "PYTHONPATH") + (files (list (string-append "lib/python" + (version-major+minor + (package-version python)) + "/site-packages")))))) (synopsis "Toolkit for software-defined radios") (description "GNU Radio is a development toolkit that provides signal processing blocks -- cgit v1.2.3 From 1b73fbdf5e3be0d1a90432b63c5eea2cde8c456d Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Wed, 22 Apr 2020 06:04:59 -0500 Subject: gnu: Add r-rserve. * gnu/packages/cran.scm (r-rserve): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index baf1e0c18a..18829537e8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21633,3 +21633,40 @@ infinite-precision rational arithmetic.") Archive Toolkit. Rxnat uses the XNAT REST API to perform data queries and download images.") (license license:gpl2))) + +(define-public r-rserve + (package + (name "r-rserve") + (version "1.8-6") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.rforge.net/Rserve/snapshot/Rserve_" + version ".tar.gz")) + (sha256 + (base32 + "017kkzv9lxlz9qhg3gprrf1wcyflxrif6wjk27x9b4bdzylw6bsx")))) + (build-system r-build-system) + (propagated-inputs + `(("r-checkmate" ,r-checkmate) + ("r-mime" ,r-mime) + ("r-jsonlite" ,r-jsonlite) + ("r-knitr" ,r-knitr) + ("r-r6" ,r-r6) + ("r-rcpp" ,r-rcpp) + ("r-uuid" ,r-uuid))) + (inputs + `(("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://github.com/s-u/Rserve") + (synopsis + "Server providing access to R from many languages and systems") + (description + "Rserve acts as a socket server (TCP/IP or local sockets) which allows +binary requests to be sent to R. Every connection has a separate workspace +and working directory. Client-side implementations are available for popular +languages such as C/C++ and Java, allowing any application to use facilities +of R without the need of linking to R code. Rserve supports remote +connection, user authentication and file transfer. A simple R client is +included in this package as well.") + (license license:gpl2))) -- cgit v1.2.3 From ed33317893812715bf37005fb0ba5192b651b14f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 13:00:40 +0200 Subject: gnu: Add python2-weave. * gnu/packages/python-science.scm (python2-weave): New variable. --- gnu/packages/python-science.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 530a2478f3..2f7516b9f6 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2020 Ricardo Wurmus ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Hartmut Goebel @@ -162,6 +162,39 @@ routines such as routines for numerical integration and optimization.") (base32 "1cgvgin8fvckv96hjh3ikmwkra5rif51bdb75ifzf7xbil5iwcx4")))))) +(define-public python2-weave + (package + (name "python2-weave") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "weave" version)) + (sha256 + (base32 "0jnm3584mfichgwgrd1gk5i42ll9c08nkw9716n947n4338f6ghs")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "nosetests" "-v" + "--exclude" + "test_(user|incorrect_ownership|char_fail|obj_fail)")))))) + (propagated-inputs + `(("python-numpy" ,python2-numpy))) + (native-inputs + `(("python-nose" ,python2-nose))) + (home-page "https://www.scipy.org/") + (synopsis "Tools for including C/C++ code within Python code") + (description "Weave is the stand-alone version of the obsolete Scipy +submodule @code{scipy.weave}. It is Python 2.x only, and is provided for +users that need new versions of Scipy but have existing code that still +depends on @code{scipy.weave}. For new code, users are recommended to use +Cython.") + (license license:bsd-3))) + (define-public python-scikit-image (package (name "python-scikit-image") -- cgit v1.2.3 From 4a148c6da37b55b22842ddbf0ec0ba56132c44ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 13:00:50 +0200 Subject: gnu: python2-warpedlmm: Fix build. * gnu/packages/bioinformatics.scm (python2-warpedlmm)[propagated-inputs]: Add python2-weave. [arguments]: Disable tests and add "use-weave" phase. --- gnu/packages/bioinformatics.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f90a0bf90c..740ed66972 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4942,14 +4942,24 @@ files and writing bioinformatics applications.") "1agfz6zqa8nc6cw47yh0s3y14gkpa9wqazwcj7mwwj3ffnw39p3j")))) (build-system python-build-system) (arguments - `(#:python ,python-2)) ; requires Python 2.7 + `(#:python ,python-2 ; requires Python 2.7 + #:tests? #f ; test data are not included + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-weave + (lambda _ + (substitute* "warpedlmm/util/linalg.py" + (("from scipy import linalg, weave") + "from scipy import linalg\nimport weave")) + #t))))) (propagated-inputs `(("python-scipy" ,python2-scipy) ("python-numpy" ,python2-numpy) ("python-matplotlib" ,python2-matplotlib) ("python-fastlmm" ,python2-fastlmm) ("python-pandas" ,python2-pandas) - ("python-pysnptools" ,python2-pysnptools))) + ("python-pysnptools" ,python2-pysnptools) + ("python-weave" ,python2-weave))) (native-inputs `(("python-mock" ,python2-mock) ("python-nose" ,python2-nose) -- cgit v1.2.3 From 7395047017a6c210a47e9d0144fd3ebabf156da1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 13:03:52 +0200 Subject: gnu: Add python-tornado-6. * gnu/packages/python-web.scm (python-tornado-6): New variable. --- gnu/packages/python-web.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 0dba566a77..76a2c57701 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -869,6 +869,37 @@ connection to each user.") (license license:asl2.0) (properties `((python2-variant . ,(delay python2-tornado)))))) +(define-public python-tornado-6 + (package + (name "python-tornado") + (version "6.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tornado" version)) + (sha256 + (base32 + "1p5n7sw4580pkybywg93p8ddqdj9lhhy72rzswfa801vlidx9qhg")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "-m" "tornado.test.runtests") + #t))))) + (native-inputs + `(("python-certifi" ,python-certifi))) + (home-page "https://www.tornadoweb.org/") + (synopsis "Python web framework and asynchronous networking library") + (description + "Tornado is a Python web framework and asynchronous networking library, +originally developed at FriendFeed. By using non-blocking network I/O, +Tornado can scale to tens of thousands of open connections, making it ideal +for long polling, WebSockets, and other applications that require a long-lived +connection to each user.") + (license license:asl2.0))) + (define-public python2-tornado (let ((tornado (package-with-python2 (strip-python2-variant python-tornado)))) (package (inherit tornado) -- cgit v1.2.3 From cb44af24c8308dd7e17e991ed6ee803f3cb8a1c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 13:03:59 +0200 Subject: gnu: kaldi-gstreamer-server: Use Tornado 6. * gnu/packages/machine-learning.scm (kaldi-gstreamer-server)[inputs]: Replace python-tornado with python-tornado-6. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 425961ee14..df2943167d 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1326,7 +1326,7 @@ exec ~a ~a/~a \"$@\"~%" ("python" ,python-wrapper) ("python-pygobject" ,python-pygobject) ("python-pyyaml" ,python-pyyaml) - ("python-tornado" ,python-tornado))) + ("python-tornado" ,python-tornado-6))) (home-page "https://github.com/alumae/kaldi-gstreamer-server") (synopsis "Real-time full-duplex speech recognition server") (description "This is a real-time full-duplex speech recognition server, -- cgit v1.2.3 From 46d07f8472f09813be287fa5a10afb50c959dcb1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 13:04:55 +0200 Subject: gnu: kaldi-gstreamer-server: Fix bug. * gnu/packages/machine-learning.scm (kaldi-gstreamer-server)[arguments]: Patch master_server.py before build. --- gnu/packages/machine-learning.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index df2943167d..8c817d3e3b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1269,6 +1269,10 @@ automatically.") ;; are reproducible. (setenv "PYTHONHASHSEED" "0") (with-directory-excursion "kaldigstserver" + ;; See https://github.com/alumae/kaldi-gstreamer-server/issues/232 + (substitute* "master_server.py" + (("\\.replace\\('\\\\.*") ")")) + ;; This is a Python 2 file (delete-file "decoder_test.py") (delete-file "test-buffer.py") -- cgit v1.2.3 From cf1ae793753e9da0d774f4a5495648f15d400b49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 13:06:01 +0200 Subject: gnu: python2-pysnptools: Update to 0.4.11. * gnu/packages/python-xyz.scm (python2-pysnptools): Update to 0.4.11; implement in terms of... (python-pysnptools): ...this new variable. [propagated-inputs]: Add python-dill, python-h5py, and python-psutil. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0f4351d152..74280befea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4876,27 +4876,38 @@ toolkits.") three-way Venn diagrams in @code{matplotlib}.") (license license:expat))) -(define-public python2-pysnptools +(define-public python-pysnptools (package - (name "python2-pysnptools") - (version "0.3.13") + (name "python-pysnptools") + (version "0.4.11") (source (origin (method url-fetch) (uri (pypi-uri "pysnptools" version)) (sha256 (base32 - "0lnis5xsl7bi0hz4f7gbicahzi5zlxkc21nk3g374xv8fb5hb3qm")))) + "0gxr0bjix307wvk0qh7vkafbxbzfpdmq0wlswpxyyaymy0fwcypv")))) (build-system python-build-system) (arguments - `(#:python ,python-2 ; only Python 2.7 is supported - #:tests? #f)) ; test files (e.g. examples/toydata.bim) not included + `(#:tests? #f ; no test data are included + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (if tests? + (begin + (add-installed-pythonpath inputs outputs) + (invoke "python3" "pysnptools/test.py")) + #t)))))) (propagated-inputs - `(("python2-numpy" ,python2-numpy) - ("python2-scipy" ,python2-scipy) - ("python2-pandas" ,python2-pandas))) + `(("python-dill" ,python-dill) + ("python-h5py" ,python-h5py) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-psutil" ,python-psutil) + ("python-scipy" ,python-scipy))) (native-inputs - `(("python2-cython" ,python2-cython))) + `(("python-cython" ,python-cython))) (home-page "http://microsoftgenomics.github.io/PySnpTools/") (synopsis "Library for reading and manipulating genetic data") (description @@ -4906,6 +4917,9 @@ those files. It can also efficiently manipulate ranges of integers using set operators such as union, intersection, and difference.") (license license:asl2.0))) +(define-public python2-pysnptools + (package-with-python2 python-pysnptools)) + (define-public python-socksipy-branch (package (name "python-socksipy-branch") -- cgit v1.2.3 From 61fc72d3ac949d0c65690ee25bb1daf01f39bb42 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 10 Apr 2020 14:58:47 +0200 Subject: gnu: Add zbackup. * gnu/packages/backup.scm (zbackup): New variable. --- gnu/packages/backup.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index d80359f8f1..23860ec821 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Alex Vong ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -976,6 +977,42 @@ precious backup space. @end itemize") (license license:bsd-2))) +(define-public zbackup + (package + (name "zbackup") + (version "1.4.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zbackup/zbackup.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14l1kyxg7pccpax3d6qcpmdycb70kn3fxp1a59w64hqy2493hngl")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ;no test + (inputs + `(("lzo" ,lzo) + ("libressl" ,libressl) + ("protobuf" ,protobuf) + ("xz" ,xz) + ("zlib" ,zlib))) + (home-page "http://zbackup.org") + (synopsis "Versatile deduplicating backup tool") + (description + "ZBackup is a globally-deduplicating backup tool, based on the +ideas found in Rsync. Feed a large @file{.tar} into it, and it will +store duplicate regions of it only once, then compress and optionally +encrypt the result. Feed another @file{.tar} file, and it will also +re-use any data found in any previous backups. This way only new +changes are stored, and as long as the files are not very different, +the amount of storage required is very low. Any of the backup files +stored previously can be read back in full at any time. The program +is format-agnostic, so you can feed virtually any files to it.") + (license license:gpl2+))) + (define-public burp (package (name "burp") -- cgit v1.2.3 From 4ac399603616b1fa5e2639ba2c587219f366ef6e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 14:41:53 +0200 Subject: gnu: Add missing module import. This is a follow-up to commit 61fc72d3ac949d0c65690ee25bb1daf01f39bb42. * gnu/packages/backup.scm: Add missing import of (guix build-system cmake). --- gnu/packages/backup.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 23860ec821..692795ce11 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2019 Alex Vong ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2020 Nicolas Goaziou @@ -37,6 +37,7 @@ #:use-module (guix git-download) #:use-module (guix download) #:use-module (guix utils) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) -- cgit v1.2.3 From e17423186323829dff925d2f0fdbd8f494206a6e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 14:44:45 +0200 Subject: gnu: Add one more missing module import. This is a follow-up to commit 61fc72d3ac949d0c65690ee25bb1daf01f39bb42. * gnu/packages/backup.scm: Add missing import of (gnu packages protobuf). --- gnu/packages/backup.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 692795ce11..00986a328d 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -65,6 +65,7 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) -- cgit v1.2.3 From eca648b65b51d1154363dd63dd602ebb9797d478 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Thu, 30 Apr 2020 15:30:16 +0200 Subject: gnu: Add miniasm. * gnu/packages/bioinformatics.scm (miniasm): New variable. --- gnu/packages/bioinformatics.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 740ed66972..65b44568e0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13312,6 +13312,42 @@ cases include: @end enumerate\n") (license license:expat))) +(define-public miniasm + (package + (name "miniasm") + (version "0.3") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/lh3/miniasm/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0g89pa98dvh34idv7w1zv12bsbyr3a11c4qb1cdcz68gyda88s4v")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib))) + (arguments + `(#:tests? #f ; There are no tests. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "miniasm" bin) + (install-file "minidot" bin))))))) + (home-page "https://github.com/lh3/miniasm") + (synopsis "Ultrafast de novo assembly for long noisy reads") + (description "Miniasm is a very fast OLC-based de novo assembler for noisy +long reads. It takes all-vs-all read self-mappings (typically by minimap) as +input and outputs an assembly graph in the GFA format. Different from +mainstream assemblers, miniasm does not have a consensus step. It simply +concatenates pieces of read sequences to generate the final unitig sequences. +Thus the per-base error rate is similar to the raw input reads.") + (license license:expat))) + (define-public r-circus (package (name "r-circus") -- cgit v1.2.3 From 0590673090d5fd76074977451a7f7e800e1698c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:25:32 +0200 Subject: gnu: r-pkgbuild: Update to 1.0.7. * gnu/packages/cran.scm (r-pkgbuild): Update to 1.0.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 18829537e8..94bb1aa4bc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1771,13 +1771,13 @@ processes. Most of its code is based on the @code{psutil} Python package.") (define-public r-pkgbuild (package (name "r-pkgbuild") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (cran-uri "pkgbuild" version)) (sha256 - (base32 "0xnlz6ivhkbmncg9hfw5p69lm4rjy3wn5lyxmygxyf4rrfnnqwxx")))) + (base32 "0wd9678yp6yi73n92f58wi9jc19gdq5cmbj65l6pifh2haikifr9")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) -- cgit v1.2.3 From 0ec790f82d0afe1baab5d24a0c94fbd77dc006ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:25:45 +0200 Subject: gnu: r-proxy: Update to 0.4-24. * gnu/packages/cran.scm (r-proxy): Update to 0.4-24. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 94bb1aa4bc..f581cf462b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2272,14 +2272,14 @@ plot networks.") (define-public r-proxy (package (name "r-proxy") - (version "0.4-23") + (version "0.4-24") (source (origin (method url-fetch) (uri (cran-uri "proxy" version)) (sha256 (base32 - "17b6qfllqrhzrxqgx7dccffgybnkcria5a68ap5ly3plg04ypm4x")))) + "0z4wdnpv5x135nssxnmkkba7fivd5xgbpaabqjkl2na76vq9pzwc")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/proxy") (synopsis "Distance and similarity measures") -- cgit v1.2.3 From 78b686824d8b5605a6203d0da760288f601b8f37 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:25:50 +0200 Subject: gnu: r-rootsolve: Update to 1.8.2.1. * gnu/packages/cran.scm (r-rootsolve): Update to 1.8.2.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f581cf462b..ddab6c9830 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7084,14 +7084,14 @@ bootstrap. Confidence intervals can be computed for (p)AUC or ROC curves.") (define-public r-rootsolve (package (name "r-rootsolve") - (version "1.8.2") + (version "1.8.2.1") (source (origin (method url-fetch) (uri (cran-uri "rootSolve" version)) (sha256 (base32 - "0rj7c4zcrzgz7sb0vgvh7swpfafnw4040cxp7ypas3s8fnihn54l")))) + "0c9hhgq1pgqdg80a6n2ssfbj5nyaf97y4iiya7j7l6b34qc53128")))) (properties `((upstream-name . "rootSolve"))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From b5ea7affcfd6bfaa7a9f62862f5379f6f1bbda0e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:25:57 +0200 Subject: gnu: r-usethis: Update to 1.6.1. * gnu/packages/cran.scm (r-usethis): Update to 1.6.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ddab6c9830..99d1c416d1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8920,14 +8920,14 @@ terminals that do not support Unicode.") (define-public r-usethis (package (name "r-usethis") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (cran-uri "usethis" version)) (sha256 (base32 - "12iyimqyza752anj29wpfisl8nz5r25kfcqbssybg24nb4wyy146")))) + "0vwxsnq615mwc706a4a71gyy0hmvnllbh249gzm7vl3ym5cr0cv0")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit v1.2.3 From 1514fa85e49f3a31a75e7174a34678cb799efb8d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:26:03 +0200 Subject: gnu: r-arm: Update to 1.11-1. * gnu/packages/cran.scm (r-arm): Update to 1.11-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 99d1c416d1..304cddca83 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9655,14 +9655,14 @@ features (e.g. local modes).") (define-public r-arm (package (name "r-arm") - (version "1.10-1") + (version "1.11-1") (source (origin (method url-fetch) (uri (cran-uri "arm" version)) (sha256 (base32 - "0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg")))) + "0i2lnm09bqy1qw0ms5pw0rzw196xmnk5dxha3g8lc58lqpldp0kv")))) (build-system r-build-system) (propagated-inputs `(("r-abind" ,r-abind) -- cgit v1.2.3 From 7d1e02c872fe5dd6dc3180dc50b0bd8288f033b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:26:07 +0200 Subject: gnu: r-dalex: Update to 1.2.1. * gnu/packages/cran.scm (r-dalex): Update to 1.2.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 304cddca83..a0ee26e8b5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15435,14 +15435,14 @@ classification and regression models.") (define-public r-dalex (package (name "r-dalex") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "DALEX" version)) (sha256 (base32 - "0mfcci54622gnk8al9fl2jhs9i2vfly7lam04y5rdacbyiam49j6")))) + "0lx8nasm1zgh1ckz8nw3ysp6xjv3dsj39hzhr6k3xhh6i8pm9rxk")))) (properties `((upstream-name . "DALEX"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8dfa9ab05a4fe4bde615d569486396a1c0d3a8fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:26:13 +0200 Subject: gnu: r-ggfortify: Update to 0.4.10. * gnu/packages/cran.scm (r-ggfortify): Update to 0.4.10. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a0ee26e8b5..55ffb2787a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15510,14 +15510,14 @@ includes data sets from oceanography.") (define-public r-ggfortify (package (name "r-ggfortify") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (cran-uri "ggfortify" version)) (sha256 (base32 - "1p6knrbyaynaqwd939w09hpf1zz1gn95cb46sfgppl8l98krb2h5")))) + "0wmcwp63h90v3f00ixszvis4z28im621jickvc0wgi6qvjvnayq0")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From aa180e9e031a001228c74c34fe6516e75bcb719f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:26:18 +0200 Subject: gnu: r-systemfonts: Update to 0.2.1. * gnu/packages/cran.scm (r-systemfonts): Update to 0.2.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 55ffb2787a..1eddb459fe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16026,14 +16026,14 @@ both R code and compiled C/C++/FORTRAN code.") (define-public r-systemfonts (package (name "r-systemfonts") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "systemfonts" version)) (sha256 (base32 - "1aba07djvxqdmnsdbwvzcsbm2fddnhrssa54xyrlviiwsv2c1qsd")))) + "0dna00xai0pw76b4830yy4r5j1hq7f7kla67v0iz39cjm4rq4ygq")))) (properties `((upstream-name . "systemfonts"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From d7a29bd586bf4d8f7af926ef9287f4e88890ff2e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:26:24 +0200 Subject: gnu: r-graphlayouts: Update to 0.7.0. * gnu/packages/cran.scm (r-graphlayouts): Update to 0.7.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1eddb459fe..92902d0a73 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16055,14 +16055,14 @@ be used further by e.g. graphic devices.") (define-public r-graphlayouts (package (name "r-graphlayouts") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "graphlayouts" version)) (sha256 (base32 - "1la016m37kp79zk8p1yx9kaha8y6d4w52w39h0mzv1mfsi6d75w0")))) + "17lc75k8i3c696hfj44zj7j1a5sb0nap8spc5r98v7vd6xh4nii0")))) (properties `((upstream-name . "graphlayouts"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2a749c859633c314a5b29f75b1d96836cda2fa2f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:26:30 +0200 Subject: gnu: r-univoutl: Update to 0.2. * gnu/packages/cran.scm (r-univoutl): Update to 0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 92902d0a73..6d1cc8dbfe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18795,14 +18795,14 @@ functions.") (define-public r-univoutl (package (name "r-univoutl") - (version "0.1-5") + (version "0.2") (source (origin (method url-fetch) (uri (cran-uri "univOutl" version)) (sha256 (base32 - "193wrpkvgmlrx43nag8w3ivrlqm37nm6g86wcvd3bgw3hchs70gi")))) + "0rlc3w7cx2hfxacpjs9kmjzv5p8v9wxnlpxi3rh276wiy5zdr91v")))) (properties `((upstream-name . "univOutl"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From c54b41093dd02254517df5b12cd059ab4ebad510 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:26:35 +0200 Subject: gnu: r-kutils: Update to 1.70. * gnu/packages/cran.scm (r-kutils): Update to 1.70. [propagated-inputs]: Remove r-lavaan. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6d1cc8dbfe..965ab2949d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20219,19 +20219,18 @@ estimate parameters given observed data.") (define-public r-kutils (package (name "r-kutils") - (version "1.69") + (version "1.70") (source (origin (method url-fetch) (uri (cran-uri "kutils" version)) (sha256 (base32 - "12pg26a85h0jxlfcyai68dbh4bq1gnq8v1ngi8k9qvafbrpc6gx8")))) + "06jk66wbq3jmdf2jdhqns6r3yk36l2x7c907x977zv80sqxa1l37")))) (properties `((upstream-name . "kutils"))) (build-system r-build-system) (propagated-inputs `(("r-foreign" ,r-foreign) - ("r-lavaan" ,r-lavaan) ("r-openxlsx" ,r-openxlsx) ("r-plyr" ,r-plyr) ("r-runit" ,r-runit) -- cgit v1.2.3 From 1b6434a324f7ad8fca4d63107b28fa95de6017a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:26:52 +0200 Subject: gnu: r-boot: Update to 1.3-25. * gnu/packages/statistics.scm (r-boot): Update to 1.3-25. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6bf952734c..a599e2f432 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -407,14 +407,14 @@ available, greatly increasing its breadth and scope.") (define-public r-boot (package (name "r-boot") - (version "1.3-24") + (version "1.3-25") (source (origin (method url-fetch) (uri (cran-uri "boot" version)) (sha256 (base32 - "0yv0l55kjmlfdx1xhgyjdi0bskxhfal74wr5jxaib1qj99nmkm49")))) + "1gpvi1h3nqhnnsfy96rlhakdpj84iqqsxr29rr3261sknky3aj26")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/boot") (synopsis "Bootstrap functions for R") -- cgit v1.2.3 From b2c95239e0d7ebb61b3bf5b056556517308ef99b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:27:01 +0200 Subject: gnu: r-mass: Update to 7.3-51.6. * gnu/packages/statistics.scm (r-mass): Update to 7.3-51.6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a599e2f432..d8be4fbade 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -428,14 +428,14 @@ D.V. Hinkley (1997, CUP), originally written by Angelo Canty for S.") (define-public r-mass (package (name "r-mass") - (version "7.3-51.5") + (version "7.3-51.6") (source (origin (method url-fetch) (uri (cran-uri "MASS" version)) (sha256 (base32 - "1k0m7pa4gb5apzrrkb5kx5d7bmkm2pl5g15vwb6j067hrqahck26")))) + "1viyxy22qp8abzzzlbck55b0i81rrdygim1dq2pm52s2v13mq0z2")))) (properties `((upstream-name . "MASS"))) (build-system r-build-system) (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") -- cgit v1.2.3 From 175ec5eff4cdb92c01213de45c600eb5f2fd1742 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:27:09 +0200 Subject: gnu: r-class: Update to 7.3-17. * gnu/packages/statistics.scm (r-class): Update to 7.3-17. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index d8be4fbade..059747d031 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -449,14 +449,14 @@ Applied Statistics with S\" (4th edition, 2002) by Venables and Ripley.") (define-public r-class (package (name "r-class") - (version "7.3-16") + (version "7.3-17") (source (origin (method url-fetch) (uri (cran-uri "class" version)) (sha256 (base32 - "1jpdgj0lsi60q0mqbhfw809w8d66whix27y6wpdzll6775g3j3ll")))) + "04qk8qia0qr8893fizmkbd5hsqn6m8383c0cyn9xnmkmvyv8a7xy")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) -- cgit v1.2.3 From 1cf9a5cd759bed08b65d40e9cbdbe406c6565430 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:27:15 +0200 Subject: gnu: r-foreign: Update to 0.8-79. * gnu/packages/statistics.scm (r-foreign): Update to 0.8-79. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 059747d031..e749afd4b3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -512,14 +512,14 @@ code for possible problems.") (define-public r-foreign (package (name "r-foreign") - (version "0.8-78") + (version "0.8-79") (source (origin (method url-fetch) (uri (cran-uri "foreign" version)) (sha256 (base32 - "01anirfbfa3ip5pyqv72cg4x7p0jsppmbvxrllw7bm28fl1hgiyq")))) + "1d5rk4k3khjrir1b4ciridd6vdpcgzi35r7p7ra4ky7vbaabcdmg")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/foreign") (synopsis "Read data stored by other statistics software") -- cgit v1.2.3 From 9c313889f10b8f877fbf12a743a940e825c27ffe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:27:19 +0200 Subject: gnu: r-kernsmooth: Update to 2.23-17. * gnu/packages/statistics.scm (r-kernsmooth): Update to 2.23-17. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e749afd4b3..8d8e2dacbb 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -532,14 +532,14 @@ for reading and writing some dBase files.") (define-public r-kernsmooth (package (name "r-kernsmooth") - (version "2.23-16") + (version "2.23-17") (source (origin (method url-fetch) (uri (cran-uri "KernSmooth" version)) (sha256 (base32 - "1acrkbdn3a74y4dndkcdl1njnpfqz7gk3bsz03g8lfj8l7z53hmq")))) + "11g6b0q67vasxag6v9m4px33qqxpmnx47c73yv1dninv2pz76g9b")))) (properties `((upstream-name . "KernSmooth"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From aad9233c1dded6618c10228e8c21fa6ca550b4b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:27:24 +0200 Subject: gnu: r-nnet: Update to 7.3-14. * gnu/packages/statistics.scm (r-nnet): Update to 7.3-14. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8d8e2dacbb..15098331e0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -643,14 +643,14 @@ distributions beyond the exponential family.") (define-public r-nnet (package (name "r-nnet") - (version "7.3-13") + (version "7.3-14") (source (origin (method url-fetch) (uri (cran-uri "nnet" version)) (sha256 (base32 - "1z0rj5cm4ycw1y0gd5wwwg8c2298v90iybgqdqh17967jbi2125f")))) + "1bzl62p5awva5kxcncs6lrdrkqp9ljd993zia731ckfpcjbrw6sx")))) (build-system r-build-system) (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") (synopsis "Feed-forward neural networks and multinomial log-linear models") -- cgit v1.2.3 From 599f2b50dee740af8cbc37f59726ba1ecf14b0ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:27:30 +0200 Subject: gnu: r-spatial: Update to 7.3-12. * gnu/packages/statistics.scm (r-spatial): Update to 7.3-12. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 15098331e0..030701a22f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -681,14 +681,14 @@ classification, regression and survival trees.") (define-public r-spatial (package (name "r-spatial") - (version "7.3-11") + (version "7.3-12") (source (origin (method url-fetch) (uri (cran-uri "spatial" version)) (sha256 (base32 - "04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32")))) + "0qrdhzd5r78iwi46nk8jr56dzz5l5imkflxjw64d0ys0wyg06fbn")))) (build-system r-build-system) (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") (synopsis "Functions for kriging and point pattern analysis") -- cgit v1.2.3 From 0ffd9701f583a05db92e7cc883a20d1c4b3a1c17 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:27:40 +0200 Subject: gnu: r-rcpparmadillo: Update to 0.9.870.2.0. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.9.870.2.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 030701a22f..18eb38ff29 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2588,13 +2588,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.9.860.2.0") + (version "0.9.870.2.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "1rg9ak0zbv8d9cyj10jq52nrcbk1pvfz28kbkhpx79mpjhrl7pb5")))) + "1r7iajxvbyvslsy16rqacc95azmjciw9lvcq31xl97fl09kmsq5v")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 24599740e7e0910fdc2b859d2e0eff0411abbc3a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 15:27:45 +0200 Subject: gnu: r-vgam: Update to 1.1-3. * gnu/packages/statistics.scm (r-vgam): Update to 1.1-3. [inputs]: Move gfortran from here... [native-inputs]: ...to here. --- gnu/packages/statistics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 18eb38ff29..00b648a54c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4957,16 +4957,16 @@ groupings.") (define-public r-vgam (package (name "r-vgam") - (version "1.1-2") + (version "1.1-3") (source (origin (method url-fetch) (uri (cran-uri "VGAM" version)) (sha256 - (base32 "0kyan3a4ys2xbg9kf167cyf1gk7g963id62cjm2ij4i7y4wi61zq")))) + (base32 "1hwlrdx3nhdp83pvy1h23i16vbbhi4kizdhr58c8nvg7kqdzb7qc")))) (properties `((upstream-name . "VGAM"))) (build-system r-build-system) - (inputs + (native-inputs `(("gfortran" ,gfortran))) (home-page "https://www.stat.auckland.ac.nz/~yee/VGAM") (synopsis "Vector generalized linear and additive models") -- cgit v1.2.3 From 192177b04974f456a081e7cb9177e7d9147f822c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 30 Apr 2020 16:56:44 +0200 Subject: gnu: sbcl-osicat: Fix library path. * gnu/packages/lisp-xyz.scm (sbcl-osicat)[arguments]: Replace 'cleanup phase to preserve the location of libosicat.so so that it can be found when loading the system. --- gnu/packages/lisp-xyz.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c2029d940e..b032346a30 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11533,21 +11533,19 @@ MOP easier to use.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'validate-runpath 'cleanup-files + ;; The cleanup phase moves files around but we need to keep the + ;; directory structure for the grovel-generated library. + (replace 'cleanup (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib/sbcl"))) - (for-each - delete-file - (filter (lambda (file) - (not (member (basename file) - '("basic-unixint__grovel" - "libosicat.so" - "osicat--system.fasl" - "osicat.asd" - "unixint__grovel")))) - (find-files lib ".*"))) - #t)))))) + (lib (string-append out "/lib/sbcl/"))) + (delete-file-recursively (string-append lib "src")) + (delete-file-recursively (string-append lib "tests")) + (for-each delete-file + (filter (lambda (file) + (not (member (basename file) '("libosicat.so")))) + (find-files (string-append lib "posix") ".*")))) + #t))))) (inputs `(("alexandria" ,sbcl-alexandria) ("cffi" ,sbcl-cffi) -- cgit v1.2.3 From 194cb75d85a2d282419b2a618c8e124f140859f3 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Thu, 30 Apr 2020 11:02:08 +0200 Subject: gnu: libntlm: Update to 1.6 [fixes CVE-2019-17455]. * gnu/packages/gsasl.scm (libntlm): Update to 1.6. Signed-off-by: Leo Famulari --- gnu/packages/gsasl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index a796f9aa82..98acc3c756 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -35,14 +35,14 @@ (define-public libntlm (package (name "libntlm") - (version "1.5") + (version "1.6") (source (origin (method url-fetch) (uri (string-append "https://www.nongnu.org/libntlm/releases/" "libntlm-" version ".tar.gz")) (sha256 (base32 - "1gcvv7f9rggpxay81qv6kw5hr6gd4qiyzkbwhzz02fx9jvv9kmsk")))) + "08b83nss16jsn213j326yhn1vnrz10k15fwq6jm5b1vdn23nndzj")))) (build-system gnu-build-system) (synopsis "Library that implements NTLM authentication") (description -- cgit v1.2.3 From 2a94f72adef710af481a5abefdddb6cde04b5526 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Apr 2020 14:17:32 -0400 Subject: gnu: MPD: Update to 0.21.23. * gnu/packages/mpd.scm (mpd): Update to 0.21.23. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 303af32983..755fa5d482 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -92,7 +92,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.21.22") + (version "0.21.23") (source (origin (method url-fetch) (uri @@ -101,7 +101,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "18lvyv3crijki5nxjdhf1byayyavdvj07dk6rm856n4vi78qfmjn")))) + "18q72b9baj5cdpq0yn60qm7q4g8vwqqyqndl9xg3f3w0m4n557s3")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... -- cgit v1.2.3 From ac4fefb2983aff5e5972b4279aee5296a08aab6a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 30 Apr 2020 18:46:30 +0000 Subject: gnu: diffoscope: Update to 143. * gnu/packages/diffoscope (diffoscope): Update to 143. [native-inputs]: Add openssl and python-h5py. [arguments] Add openssl to add-known-tools phase. [arguments] Remove hdf5 from add-known-tools phase, added upstream. --- gnu/packages/diffoscope.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 71c0039dfb..1df8552a30 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages ssh) #:use-module (gnu packages statistics) #:use-module (gnu packages textutils) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages vim) #:use-module (gnu packages web) @@ -69,7 +70,7 @@ #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "141")) + (let ((version "143")) (package (name "diffoscope") (version version) @@ -81,7 +82,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0pls2jryx394ysaz0g8h959lhrsdqak9bkxjd5r6sdckgiikplkj")))) + "0j58dqdk8ln8y0bcnfy37ljs37nkl56lzxqns396300ysln0qiwm")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -96,8 +97,8 @@ (add-after 'unpack 'add-known-tools (lambda _ (substitute* "diffoscope/external_tools.py" - (("'debian': 'hdf5-tools'") - "'debian': 'hdf5-tools', 'guix': 'hdf5'")))) + (("'debian': 'openssl'") + "'debian': 'openssl', 'guix': 'openssl'")))) ;; This test is broken because our `file` package has a ;; bug in berkeley-db file type detection. (add-after 'unpack 'remove-berkeley-test @@ -161,6 +162,7 @@ (native-inputs `(("python-pytest" ,python-pytest) ("python-chardet" ,python-chardet) ("python-binwalk" ,python-binwalk) + ("python-h5py" ,python-h5py) ("python-pypdf2" ,python-pypdf2) ("python-progressbar33" ,python-progressbar33) ;; test suite skips tests when tool is missing @@ -205,6 +207,7 @@ ("ocaml" ,ocaml) ("odt2txt" ,odt2txt) ("openssh" ,openssh) + ("openssl" ,openssl) ("pgpdump" ,pgpdump) ("poppler" ,poppler) ("python-jsbeautifier" ,python-jsbeautifier) -- cgit v1.2.3 From 5d9e2187929ed7e8d46ec3cb3174fd78c1846360 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Apr 2020 22:23:44 +0200 Subject: gnu: guile-json: Update to 3.5.0. * gnu/packages/patches/guile-json-cross.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/guile.scm (guile-json-3): Update to 3.5.0. [source](patches): Remove. [native-inputs]: Remove AUTOCONF and AUTOMAKE. [arguments]: Remove. --- gnu/local.mk | 1 - gnu/packages/guile.scm | 17 +++------ gnu/packages/patches/guile-json-cross.patch | 54 ----------------------------- 3 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 gnu/packages/patches/guile-json-cross.patch diff --git a/gnu/local.mk b/gnu/local.mk index b3d6054b50..57346cc2ef 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1027,7 +1027,6 @@ dist_patch_DATA = \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ - %D%/packages/patches/guile-json-cross.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-relocatable.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a262553ba1..8665e2ef79 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -532,26 +532,17 @@ specification. These are the main features: (package (inherit guile-json-1) (name "guile-json") - (version "3.2.0") + (version "3.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/guile-json/guile-json-" version ".tar.gz")) - (patches (search-patches "guile-json-cross.patch")) (sha256 (base32 - "14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz")))) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) + "0nj0684qgh6ppkbdyxqfyjwsv2qbyairxpi8fzrhsi3xnc7jn4im")))) + (native-inputs `(("pkg-config" ,pkg-config) ("guile" ,guile-3.0))) - (inputs `(("guile" ,guile-3.0))) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-configure - (lambda _ - (delete-file "configure") - #t))))))) + (inputs `(("guile" ,guile-3.0))))) (define-public guile2.2-json (package-for-guile-2.2 guile-json-3)) diff --git a/gnu/packages/patches/guile-json-cross.patch b/gnu/packages/patches/guile-json-cross.patch deleted file mode 100644 index b9081f3df2..0000000000 --- a/gnu/packages/patches/guile-json-cross.patch +++ /dev/null @@ -1,54 +0,0 @@ -Patch accepted upstream. - -From 9bbe0d78391c6dbe0316aa56a105d1966fddc9f0 Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Wed, 4 Mar 2020 11:17:02 +0100 -Subject: [PATCH] build: Support cross building. - -* configure.ac: Add AC_CANONICAL_HOST to get host. -* Makefile.am (.scm.go): Set it as target. -* json/Makefile.am (.scm.go): Likewise. ---- - Makefile.am | 2 +- - configure.ac | 1 + - json/Makefile.am | 2 +- - 3 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 996f18b..1823a3f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -42,7 +42,7 @@ nobase_nodist_obj_DATA = $(GOBJECTS) - GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat - SUFFIXES = .scm .go - .scm.go: -- $(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<" -+ $(top_builddir)/env $(GUILD) compile --target="$(host)" $(GUILE_WARNINGS) -o "$@" "$<" - - SOURCES = json.scm - -diff --git a/configure.ac b/configure.ac -index fbc1aff..937dcf7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,6 +25,7 @@ AC_CONFIG_SRCDIR(json.scm) - AC_CONFIG_AUX_DIR([build-aux]) - AM_INIT_AUTOMAKE([color-tests -Wall -Wno-portability]) - AM_SILENT_RULES([yes]) -+AC_CANONICAL_HOST - - dnl We require pkg.m4 (from pkg-config) and guile.m4. - dnl Make sure they are available. -diff --git a/json/Makefile.am b/json/Makefile.am -index adf5972..103b867 100644 ---- a/json/Makefile.am -+++ b/json/Makefile.am -@@ -36,4 +36,4 @@ CLEANFILES = $(GOBJECTS) - GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat - SUFFIXES = .scm .go - .scm.go: -- $(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<" -+ $(top_builddir)/env $(GUILD) compile --target="$(host)" $(GUILE_WARNINGS) -o "$@" "$<" --- -2.26.0 - -- cgit v1.2.3 From 6c7a39c45e8b31279e0dc9d85f0af71f9a225f85 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Apr 2020 17:17:46 -0400 Subject: doc: Bootloader Configuration: Fix an obsolete example. Reported by rawmat on #guix. * doc/guix.texi (Bootloader Configuration): Replace 'grub-configuration' with 'bootloader-configuration'. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index d0592220a7..26b4652f67 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26599,7 +26599,7 @@ like @lisp (bootloader - (grub-configuration + (bootloader-configuration ;; @dots{} (theme (grub-theme (inherit %default-theme) -- cgit v1.2.3 From 229f4fa9522fb56b014ee9c0d8111e8fb6da764d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Apr 2020 23:31:53 +0200 Subject: gnu: emacs-toml-mode: Fix syntax error in description. * gnu/packages/emacs-xyz.scm (emacs-toml-mode)[description]: Replace usage of @acronym with @dfn to work around a Guile Texinfo limitation. --- gnu/packages/emacs-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 79f7126ed7..776dcbb897 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2660,8 +2660,11 @@ Stack Overflow, Super User, and other StackExchange sites.") (home-page "https://github.com/dryman/toml-mode.el") (synopsis "Emacs major mode for editing TOML files") (description - "This package provides a major mode for editing files in @acronym{TOML, -Tom's Obvious, Minimal Language} data format.") + ;; XXX: Ideally we'd use @acronym for "TOML", but Guile's Texinfo + ;; parser does not currently support @comma{}, making it impossible + ;; to use commas in the @acronym arguments. + "This package provides a major mode for editing files in @dfn{TOML} +(Tom's Obvious, Minimal Language) data format.") (license license:gpl3+)))) (define-public emacs-twittering-mode -- cgit v1.2.3 From 69de98391d720b92206d5e45072ecd3944d95774 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 1 May 2020 00:40:23 +0200 Subject: profiles: Mark manual database as non-substitutable. Fixes . Reported by pkill9 . * guix/profiles.scm (manual-database): Pass #:substitutable? #f. --- guix/profiles.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/profiles.scm b/guix/profiles.scm index ab265cce62..b3a3db0e84 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1487,6 +1487,7 @@ the entries in MANIFEST." ;; . #:env-vars `(("MALLOC_PERTURB_" . "1")) + #:substitutable? #f #:local-build? #t #:properties `((type . profile-hook) -- cgit v1.2.3 From 7ff2159b10774fc9a3cb99adcd778aa4693ca9ee Mon Sep 17 00:00:00 2001 From: Rene Saavedra Date: Mon, 27 Apr 2020 23:59:18 -0500 Subject: gnu: balsa: Update to 2.6.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (balsa): Update to 2.6.0. [inputs]: Replace gmime-2.6 with gmime; add libical and libsecret. Signed-off-by: Ludovic Courtès --- gnu/packages/mail.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index cb5e23bcea..2a6286fb16 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Kyle Meyer ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2017, 2018 Rene Saavedra +;;; Copyright © 2017, 2018, 2020 Rene Saavedra ;;; Copyright © 2018, 2019, 2020 Pierre Langlois ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Gábor Boskovits @@ -2755,14 +2755,14 @@ tools and applications: (define-public balsa (package (name "balsa") - (version "2.5.7") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "https://pawsa.fedorapeople.org/balsa/" name "-" version ".tar.bz2")) (sha256 - (base32 "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx")))) + (base32 "0ycidvgy9npd6avxk88sf2ca609m7zb0hzrk1yajrgwb1rfqx68a")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -2780,7 +2780,7 @@ tools and applications: `(("cyrus-sasl" ,cyrus-sasl) ("enchant" ,enchant) ("gdk-pixbuf" ,gdk-pixbuf) - ("gmime" ,gmime-2.6) + ("gmime" ,gmime) ("gnutls" ,gnutls) ("gpgme" ,gpgme) ("gtk+" ,gtk+) @@ -2788,7 +2788,9 @@ tools and applications: ("gtkspell3" ,gtkspell3) ("libcanberra" ,libcanberra) ("libesmtp" ,libesmtp) + ("libical" ,libical) ("libnotify" ,libnotify) + ("libsecret" ,libsecret) ("openldap" ,openldap) ("sqlite" ,sqlite) ("webkitgtk" ,webkitgtk))) -- cgit v1.2.3 From 524e5fe56b602d2ccb1dd2bf5a50a0e6ca397759 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Note Date: Sun, 26 Apr 2020 05:59:48 -0400 Subject: gnu: Add apt-mirror. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/debian.scm (apt-mirror): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/debian.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index ff4cccb03d..a3bbd2b907 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gnupg) + #:use-module (gnu packages wget) #:use-module (gnu packages perl)) (define-public debian-archive-keyring @@ -190,3 +191,40 @@ scratch, without requiring the availability of @code{dpkg} or @code{apt}. It does this by downloading .deb files from a mirror site, and carefully unpacking them into a directory which can eventually be chrooted into.") (license license:gpl2))) + + +(define-public apt-mirror + (let ((commit "e664486a5d8947c2579e16dd793d762ea3de4202") + (revision "1")) + (package + (name "apt-mirror") + (version (git-version "0.5.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apt-mirror/apt-mirror/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qj6b7gldwcqyfs2kp6amya3ja7s4vrljs08y4zadryfzxf35nqq")))) + (build-system gnu-build-system) + (outputs '("out")) + (arguments + `(#:tests? #f + ;; sysconfdir is not PREFIXed in the makefile but DESTDIR is + ;; honored correctly; we therefore use DESTDIR for our + ;; needs. A more correct fix would involve patching. + #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) + "PREFIX=/") + #:phases (modify-phases %standard-phases (delete 'configure)))) + (inputs + `(("wget" ,wget) + ("perl" ,perl))) + (home-page "http://apt-mirror.github.io/") + (synopsis "Script for mirroring a Debian repository") + (description + "apt-mirror is a small tool that provides the ability to +selectively mirror Debian and Ubuntu GNU/Linux distributions or any +other apt sources typically provided by open source developers.") + (license license:gpl2)))) -- cgit v1.2.3 From 135c1e0e433edc8258b1a7d018258e3ef5919122 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 23 Apr 2020 15:55:31 +0200 Subject: gnu: umockdev: Fix test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/check.scm (umockdev)[inputs]: Remove 'gobject-introspection'. [arguments]: Replace phase 'skip-broken-test' by 'fix-test'. Signed-off-by: Ludovic Courtès --- gnu/packages/check.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5f3073d556..427607e6de 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Chris Marusich ;;; Copyright © 2020 Lars-Dominik Braun +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -2436,11 +2437,10 @@ provides a simple way to achieve this.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-broken-test + (add-after 'unpack 'fix-test (lambda _ (substitute* "tests/test-umockdev.c" - (("/\\* sys/ in other dir") - (string-append "return; // "))) + (("/run") "/tmp")) #t))))) (native-inputs `(("vala" ,vala) @@ -2453,8 +2453,7 @@ provides a simple way to achieve this.") (inputs `(("glib" ,glib) ("eudev" ,eudev) - ("libgudev" ,libgudev) - ("gobject-introspection" ,gobject-introspection))) + ("libgudev" ,libgudev))) (home-page "https://github.com/martinpitt/umockdev/") (synopsis "Mock hardware devices for creating unit tests") (description "umockdev mocks hardware devices for creating integration -- cgit v1.2.3 From 22df0a1f59e97e4ece7219b12dedabfc8a9a983c Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 23 Apr 2020 15:55:32 +0200 Subject: gnu: Add libqb. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/hardware.scm (libqb): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/hardware.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 114332455e..28ebc8c75e 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module (guix download) @@ -344,3 +346,31 @@ supported by the Linux kernel.") "Rkdeveloptool can read from and write to RockChip devices over USB, such as the Pinebook Pro.") (license license:gpl2+)))) + +(define-public libqb + (package + (name "libqb") + ;; NOTE: We are using a Release Candidate version (for 2.0) here because + ;; of the linker issues with the previous release. + (version "1.9.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ClusterLabs/libqb/releases/download/v" + version "/libqb-" version ".tar.xz")) + (sha256 + (base32 + "008vvw504kh40br5v2xkqavnp9vpmjvf768faqzv1d00fd53ingn")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) + (home-page "https://clusterlabs.github.io/libqb/") + (synopsis "Library providing high performance logging, tracing, ipc, and poll") + (description "Libqb is a library with the primary purpose of providing +high-performance, reusable features for client-server architecture, such as +logging, tracing, inter-process communication (IPC), and polling. Libqb is +not intended to be an all-encompassing library, but instead provide focused +APIs that are highly tuned for maximum performance for client-server +applications.") + (license license:lgpl2.1))) -- cgit v1.2.3 From 02ee43e48637dd6308858a4ca4c7a1e91e39c9f1 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 23 Apr 2020 15:55:33 +0200 Subject: gnu: Add usbguard. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/hardware.scm (usbguard): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/hardware.scm | 88 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 28ebc8c75e..ce3f396d0a 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -19,14 +19,22 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages hardware) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages check) + #:use-module (gnu packages crypto) + #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) + #:use-module (gnu packages openldap) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages polkit) + #:use-module (gnu packages protobuf) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -374,3 +382,83 @@ not intended to be an all-encompassing library, but instead provide focused APIs that are highly tuned for maximum performance for client-server applications.") (license license:lgpl2.1))) + +(define-public usbguard + (package + (name "usbguard") + (version "0.7.6") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/USBGuard/usbguard/releases/download/usbguard-" + version "/usbguard-" version ".tar.gz")) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-makefile + (lambda _ + ;; Do not create log directory. + (substitute* "Makefile" ((".*/log/usbguard.*") "")) + ;; Disable LDAP tests: they use 'sudo'. + (substitute* "src/Tests/Makefile.am" + (("WITH_LDAP") "FALSE")) + #t)) + (add-after 'install 'delete-static-library + (lambda* (#:key outputs #:allow-other-keys) + ;; It can't be direclty disabled since it's needed for the tests. + (delete-file (string-append (assoc-ref outputs "out") + "/lib/libusbguard.a")) + #t)) + (add-after 'install 'install-zsh-completion + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (site-functions + (string-append out "/share/zsh/site-functions"))) + (mkdir-p site-functions) + (copy-file "scripts/usbguard-zsh-completion" + (string-append site-functions "/_usbguard")) + #t)))) + #:make-flags + (list (string-append "BASH_COMPLETION_DIR=" + (assoc-ref %outputs "out") + "/etc/bash_completion.d")) + #:configure-flags + (list + "--localstatedir=/var" + "--with-bundled-pegtl" + "--enable-systemd=no" + "--with-ldap" + "--with-dbus" + "--with-polkit"))) + (inputs + `(("audit" ,audit) + ("catch" ,catch-framework) + ("dbus-glib" ,dbus-glib) + ("ldap" ,openldap) + ("libcap-ng" ,libcap-ng) + ("libseccomp" ,libseccomp) + ("libsodium" ,libsodium) + ("polkit" ,polkit) + ("protobuf" ,protobuf) + ("libqb" ,libqb))) + (native-inputs + `(("asciidoc" ,asciidoc) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("bash-completion" ,bash-completion) + ("gdbus-codegen" ,glib "bin") + ("umockdev" ,umockdev) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt) + ("pkg-config" ,pkg-config))) + (home-page "https://usbguard.github.io") + (synopsis "Helps to protect your computer against rogue USB devices (a.k.a. BadUSB)") + (description "USBGuard is a software framework for implementing USB device +authorization policies (what kind of USB devices are authorized) as well as +method of use policies (how a USB device may interact with the system). +Simply put, it is a USB device whitelisting tool.") + (license license:gpl2))) -- cgit v1.2.3 From 65fd3f0ac367747086abb6997f1aa27957c9b65b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Apr 2020 18:46:56 -0400 Subject: gnu: libmicrodns: Update to 0.1.2 [security fixes]. This fixes CVE-2020-6071, CVE-2020-6072, CVE-2020-6073, CVE-2020-6077, CVE-2020-6078, and CVE-2020-6079. * gnu/packages/dns.scm (libmicrodns): Update to 0.1.2. [source]: Build from a tarball. [build-system]: Use the meson-build-system. [native-inputs]: Remove field. --- gnu/packages/dns.scm | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 86569b5493..15c6c23d70 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2020 Arun Isaac +;;; Copyright © 2020 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -878,22 +879,16 @@ System (HNS) peer-to-peer network.") (define-public libmicrodns (package (name "libmicrodns") - (version "0.0.10") + (version "0.1.2") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/videolabs/libmicrodns") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://github.com/videolabs/libmicrodns/" + "releases/download/" version "/microdns-" + version ".tar.xz")) (sha256 (base32 - "1xvl9k49ng35wbsqmnjnyqvkyjf8dcq2ywsq3jp3wh0rgmxhq2fh")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + "0p4va18zxgmzcdwhlbg2mmjwswlbgqy4ay5vaxrw7cxmhsflnv36")))) + (build-system meson-build-system) (home-page "https://github.com/videolabs/libmicrodns") (synopsis "Minimal mDNS resolver library") (description "@code{libmicrodns} provides a minimal implementation of a -- cgit v1.2.3 From 5af110868cf3460da705242370eeb652bd1c5646 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Apr 2020 17:50:16 -0400 Subject: gnu: VLC: Update to 3.0.10. * gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/video.scm (vlc): Update to 3.0.10. [source]: Remove obsolete patch. [arguments]: Remove obsolete workarounds for libssh and fribidi compatibility issues in 'patch-source' phase. --- gnu/local.mk | 1 - .../patches/vlc-fix-test_libvlc_slaves.patch | 35 ---------------------- gnu/packages/video.scm | 24 ++------------- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9426ee30a0..26d26ee215 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1519,7 +1519,6 @@ dist_patch_DATA = \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ - %D%/packages/patches/vlc-fix-test_libvlc_slaves.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \ %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \ diff --git a/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch b/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch deleted file mode 100644 index 9bc6d35f18..0000000000 --- a/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4186c94104ee528abd6860611b49515f3e6ec644 Mon Sep 17 00:00:00 2001 -From: Thomas Guillem -Date: Fri, 18 Oct 2019 10:34:07 +0200 -Subject: [PATCH] input/item: sort before attaching slaves - -The order of readdir() is completely filesystem dependent. - -Slaves should be attached using the same order across multiple OSses/access -modules. - -This fixes the test_libvlc_slaves on some system when the entry order from -readdir() is different. - -This patch need to be backported to VLC 3.0. ---- - src/input/item.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/input/item.c b/src/input/item.c -index e8db39ca28..fbd74cc95f 100644 ---- a/src/input/item.c -+++ b/src/input/item.c -@@ -1809,8 +1809,8 @@ void vlc_readdir_helper_finish(struct vlc_readdir_helper *p_rdh, bool b_success) - { - if (b_success) - { -- rdh_attach_slaves(p_rdh, p_rdh->p_node); - rdh_sort(p_rdh->p_node); -+ rdh_attach_slaves(p_rdh, p_rdh->p_node); - } - free(p_rdh->psz_ignored_exts); - --- -2.20.1 - diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e3d145a840..dbea0afcf6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1191,7 +1191,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.8") + (version "3.0.10") (source (origin (method url-fetch) (uri (string-append @@ -1200,13 +1200,7 @@ videoformats depend on the configuration flags of ffmpeg.") "/vlc-" version ".tar.xz")) (sha256 (base32 - "1xmxjpyzdhabchwncz6lvx3kzvl7fz9c42bkv3nbj68albs9w570")) - (patches - (search-patches - ;; TODO: The test "libvlc_slaves" fails. Applied upstream as - ;; . - ;; Try removing it in 3.0.9. - "vlc-fix-test_libvlc_slaves.patch")))) + "0cackl1084hcmg4myf3kvjvd6sjxmzn0c0qkmanz6brvgzyanrm9")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) @@ -1311,20 +1305,6 @@ videoformats depend on the configuration flags of ffmpeg.") ;; which fails in our sandboxed build system (substitute* "test/run_vlc.sh" (("./vlc --ignore-config") "echo")) - - ;; modules/text_renderer/freetype/text_layout.c uses a - ;; now-deprecated interface 'fribidi_get_par_embedding_levels' - ;; from fribidi.h, so for now we enable the use of deprecated - ;; fribidi interfaces from this file. - ;; FIXME: Try removing this for vlc >= 3.0.3. - (substitute* "modules/text_renderer/freetype/text_layout.c" - (("# define FRIBIDI_NO_DEPRECATED 1") "")) - - ;; Fix build with libssh2 > 1.8.0: - ;; - ;; - (substitute* "modules/access/sftp.c" - (("010801") "010900")) #t))) (add-after 'strip 'regenerate-plugin-cache (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 2676579dc8a930a3bc77d46dd642993cfd870bc6 Mon Sep 17 00:00:00 2001 From: Rene Saavedra Date: Sun, 12 Apr 2020 22:33:08 -0500 Subject: gnu: hurd: Fix references to /bin/w. * gnu/packages/hurd.scm (hurd): Use '/bin/w' from hurd package. --- gnu/packages/hurd.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index bc2d864bf4..398de07df4 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020 Rene Saavedra ;;; ;;; This file is part of GNU Guix. ;;; @@ -413,6 +414,9 @@ boot, since this cannot be done from GNU/Linux." (substitute* '("startup/startup.c" "init/init.c" "config/ttys") (("/libexec/") (string-append out "/libexec/"))) + (substitute* '("utils/uptime.sh") + (("/bin/w") + (string-append out "/bin/w"))) (substitute* "daemons/console-run.c" (("/hurd/") (string-append out "/hurd/"))) -- cgit v1.2.3 From 9a554a7082b69eaf474e2d19998a482d29035db0 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 12 Apr 2020 13:53:04 +0200 Subject: gnu: hurd: Use default QEMU guest IP: 10.0.2.15. Specifying 10.0.2.77 also works -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:2228-10.0.2.77:22 but using this default allows us to use the widely advertised -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:2228-:22 * gnu/packages/hurd.scm (hurd-rc-script): Used from (hurd)[inputs]: Use 10.0.2.15; the default QEMU guest IP. --- gnu/packages/hurd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 398de07df4..afb9cf5496 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -319,7 +319,7 @@ boot, since this cannot be done from GNU/Linux." ("/servers/password" ("/hurd/password")) ("/servers/socket/1" ("/hurd/pflocal")) ("/servers/socket/2" ("/hurd/pfinet" "--interface" "eth0" - "--address" "10.0.2.77" + "--address" "10.0.2.15" ;the default QEMU guest IP "--netmask" "255.255.255.0" "--gateway" "10.0.2.2" "--ipv6" "/servers/socket/16")))) -- cgit v1.2.3 From 2e463d6e2cb2bc468926e8ed1a6ed77d9ca01441 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 12 Apr 2020 23:06:30 +0200 Subject: gnu: hurd: Add NFS support. * gnu/packages/hurd.scm (hurd)[inputs]: Add libtirpc/hurd. [arguments]: Add configure flags to use libtirpc; add phase "find-tirpc" to find the RPC headers; add phase "fix-rpc-headers" to include missing headers. --- gnu/packages/hurd.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index afb9cf5496..55c40710fa 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages texinfo) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages xorg) ; libpciaccess #:use-module (guix git-download) #:export (hurd-system? @@ -393,6 +394,30 @@ boot, since this cannot be done from GNU/Linux." (string-append dde "/" dir ) dir)) '("libmachdev" "libmachdevdde" "libddekit"))) #t)) + (add-after 'unpack 'find-tirpc + (lambda* (#:key inputs #:allow-other-keys) + (for-each (lambda (var) + (setenv var + (string-append (assoc-ref inputs "libtirpc") + "/include/tirpc:" + (or (getenv var) "")))) + '("CROSS_C_INCLUDE_PATH" "C_INCLUDE_PATH" + "CROSS_CPATH" "CPATH")) + #t)) + (add-after 'unpack 'fix-rpc-headers + (lambda _ + (substitute* "nfs/mount.c" + (("#undef (TRUE|FALSE)") "") + (("#include " m) + (string-append "#include \n" m))) + (substitute* '("nfsd/cache.c") + (("#undef (TRUE|FALSE)") "")) + (substitute* '("nfsd/loop.c" + "nfsd/main.c" + "nfsd/ops.c") + (("#include " m) + (string-append "#include \n#include \n" m))) + #t)) (add-before 'build 'pre-build (lambda _ ;; Don't change the ownership of any file at this time. @@ -496,7 +521,11 @@ fsysopts / --writable\n")) "--disable-ncursesw" "--without-libbz2" "--without-libz" - "--without-parted"))) + "--without-parted" + ;; This is needed to pass the configure check for + ;; clnt_create + "ac_func_search_save_LIBS=-ltirpc" + "ac_cv_search_clnt_create=false"))) (build-system gnu-build-system) (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers) @@ -507,6 +536,9 @@ fsysopts / --writable\n")) ("unifont" ,unifont) ("libpciaccess" ,libpciaccess) + ;; For NFS support + ("libtirpc" ,libtirpc/hurd) + ;; Tools for the /libexec/* scripts. ("bash-minimal" ,bash-minimal) ("coreutils" ,coreutils) -- cgit v1.2.3 From 3dbfab479f3eb4aa4f751f9365b7fe1f14254b3c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 12 Apr 2020 23:04:49 +0200 Subject: gnu: Add libtirpc/hurd. * gnu/packages/onc-rpc.scm (libtirpc/hurd): New variable. * gnu/packages/patches/libtirpc-hurd-client.patch, gnu/packages/patches/libtirpc-hurd.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 2 + gnu/packages/onc-rpc.scm | 19 ++- gnu/packages/patches/libtirpc-hurd-client.patch | 50 +++++++ gnu/packages/patches/libtirpc-hurd.patch | 172 ++++++++++++++++++++++++ 4 files changed, 242 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libtirpc-hurd-client.patch create mode 100644 gnu/packages/patches/libtirpc-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index ca6ccb2463..38e1d85b7b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1176,6 +1176,8 @@ dist_patch_DATA = \ %D%/packages/patches/libtgvoip-disable-sse2.patch \ %D%/packages/patches/libtgvoip-disable-webrtc.patch \ %D%/packages/patches/libtheora-config-guess.patch \ + %D%/packages/patches/libtirpc-hurd.patch \ + %D%/packages/patches/libtirpc-hurd-client.patch \ %D%/packages/patches/libtommath-fix-linkage.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \ diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 5849b8deb4..cd31dfd910 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +31,8 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages kerberos) #:use-module (gnu packages pkg-config) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix utils)) (define-public libtirpc (package @@ -72,6 +74,21 @@ procedure calls) protocol in a transport-independent manner. It supports both IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") (license bsd-3))) +(define-public libtirpc/hurd + (package + (inherit libtirpc) + (name "libtirpc-hurd") + (source (origin (inherit (package-source libtirpc)) + (patches (search-patches "libtirpc-hurd.patch" + "libtirpc-hurd-client.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments libtirpc) + ((#:configure-flags flags ''()) + ;; When cross-building the target system's krb5-config should be used. + `(list (string-append "ac_cv_prog_KRB5_CONFIG=" + (assoc-ref %build-inputs "mit-krb5") + "/bin/krb5-config"))))))) + (define-public rpcbind (package (name "rpcbind") diff --git a/gnu/packages/patches/libtirpc-hurd-client.patch b/gnu/packages/patches/libtirpc-hurd-client.patch new file mode 100644 index 0000000000..526ad262d2 --- /dev/null +++ b/gnu/packages/patches/libtirpc-hurd-client.patch @@ -0,0 +1,50 @@ +Taken from https://salsa.debian.org/debian/libtirpc/-/raw/master/debian/patches/06-hurd-client-port.diff + +Description: Fix client code for hurd, avoiding malloc overflow + When trying to setup a inet connection, it happens the following: + - in libtirp, src/clnt_vc.c, clnt_vc_create gets called + - when trying to allocate vc_fd_locks, __rpc_dtbsize() is used as size + for that array of fd locks + - __rpc_dtbsize(), in src/rpc_generic.c, queries using rlimit the + maximum (rlim_max) number of file descriptors (RLIMIT_NOFILE): + - on Linux, the default is { rlim_cur = 1024, rlim_max = 4096 } + - on kFreeBSD, the default is { rlim_cur = 1024, rlim_max = 1024 } + - on Hurd, the default is { rlim_cur = 1024, rlim_max = RLIM_INFINITY } + meaning that on Hurd the memory allocation fails (as + __rpc_dtbsize() * sizeof(int) overflows and is negative) + + Change libtiprc so __rpc_dtbsize falls back on rlim_cur if rlim_max + is unlimited. + + This patch fixes the client connection using inet sockets; local unix + sockets are not working, for two reasons so far: + - getpeername on them gives EOPNOTSUPP + - SO_REUSEADDR is not implemented for them +Author: Pino Toscano + +Bug-Debian: http://bugs.debian.org/739674 +Forwarded: no +Reviewed-By: Petter Reinholdtsen +Last-Update: 2014-03-03 + +--- a/src/rpc_generic.c ++++ b/src/rpc_generic.c +@@ -107,12 +107,17 @@ + { + static int tbsize; + struct rlimit rl; ++ rlim_t lim; + + if (tbsize) { + return (tbsize); + } + if (getrlimit(RLIMIT_NOFILE, &rl) == 0) { +- return (tbsize = (int)rl.rlim_max); ++ lim = rl.rlim_max; ++ if (lim == RLIM_INFINITY) { ++ lim = rl.rlim_cur; ++ } ++ return (tbsize = (int)lim); + } + /* + * Something wrong. I'll try to save face by returning a diff --git a/gnu/packages/patches/libtirpc-hurd.patch b/gnu/packages/patches/libtirpc-hurd.patch new file mode 100644 index 0000000000..cd625d696f --- /dev/null +++ b/gnu/packages/patches/libtirpc-hurd.patch @@ -0,0 +1,172 @@ +This is a combination of two patches: + +1) Taken from https://salsa.debian.org/debian/libtirpc/-/raw/master/debian/patches/03-kfreebsd.diff + +Description: Fix build on non Linux architectures +Author: Andreas Beckmann +Last-Update: 2019-09-01 + +2) Taken from https://salsa.debian.org/debian/libtirpc/-/raw/master/debian/patches/05-hurd-port.diff + +Description: Get source building on Hurd + - Look for before using it. + - Define MAXHOSTNAMELEN to 64 if missing. + - Bind sockets on Hurd like on Linux. +Author: Petter Reinholdtsen + +--- a/src/svc_dg.c ++++ b/src/svc_dg.c +@@ -648,6 +648,7 @@ + void + svc_dg_enable_pktinfo(int fd, const struct __rpc_sockinfo *si) + { ++#ifdef __linux__ + int val = 1; + + switch (si->si_af) { +@@ -660,6 +661,7 @@ + break; + #endif + } ++#endif + } + + /* +@@ -670,6 +672,7 @@ + int + svc_dg_valid_pktinfo(struct msghdr *msg) + { ++#ifdef __linux__ + struct cmsghdr *cmsg; + + if (!msg->msg_name) +@@ -716,4 +719,7 @@ + } + + return 1; ++#else ++ return 0; ++#endif + } +--- a/src/clnt_vc.c ++++ b/src/clnt_vc.c +@@ -71,10 +71,12 @@ + #define MCALL_MSG_SIZE 24 + + #define CMGROUP_MAX 16 +-#define SCM_CREDS 0x03 /* process creds (struct cmsgcred) */ + + #undef rpc_createerr /* make it clear it is a thread safe variable */ + ++#ifndef SCM_CREDS ++#define SCM_CREDS 0x03 /* process creds (struct cmsgcred) */ ++ + /* + * Credentials structure, used to verify the identity of a peer + * process that has sent us a message. This is allocated by the +@@ -90,6 +92,7 @@ + short cmcred_ngroups; /* number or groups */ + gid_t cmcred_groups[CMGROUP_MAX]; /* groups */ + }; ++#endif + + struct cmessage { + struct cmsghdr cmsg; +--- a/src/getpeereid.c ++++ b/src/getpeereid.c +@@ -25,9 +25,14 @@ + */ + + ++#include "config.h" ++ + #include + #include + #include ++#ifdef HAVE_SYS_USER_H ++# include ++#endif /* HAVE_SYS_USER_H */ + + #include + #include +--- a/src/getpeereid.c ++++ b/src/getpeereid.c +@@ -35,12 +36,25 @@ + int + getpeereid(int s, uid_t *euid, gid_t *egid) + { ++#ifndef HAVE_SYS_USER_H ++ return(-1); ++#else ++#ifdef XUCRED_VERSION ++ struct xucred uc; ++#define uid cr_uid ++#define gid cr_gid ++#else + struct ucred uc; ++#endif + socklen_t uclen; + int error; + + uclen = sizeof(uc); ++#ifdef XUCRED_VERSION ++ error = getsockopt(s, 0, LOCAL_PEERCRED, &uc, &uclen); ++#else + error = getsockopt(s, SOL_SOCKET, SO_PEERCRED, &uc, &uclen); /* SCM_CREDENTIALS */ ++#endif + if (error != 0) + return (error); + // if (uc.cr_version != XUCRED_VERSION) +@@ -59,4 +66,5 @@ + *euid = uc.uid; + *egid = uc.gid; + return (0); ++#endif /* HAVE_SYS_USER_H */ + } +--- a/tirpc/reentrant.h ++++ b/tirpc/reentrant.h +@@ -36,7 +36,7 @@ + * These definitions are only guaranteed to be valid on Linux. + */ + +-#if defined(__linux__) ++#if defined(__linux__) || defined(__GLIBC__) + + #include + +--- a/configure.ac ++++ b/configure.ac +@@ -93,7 +93,7 @@ + AC_PROG_LIBTOOL + AC_HEADER_DIRENT + AC_PREFIX_DEFAULT(/usr) +-AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h features.h gssapi/gssapi_ext.h]) ++AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h features.h gssapi/gssapi_ext.h sys/user.h]) + AC_CHECK_LIB([pthread], [pthread_create]) + AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent]) + +--- a/src/auth_unix.c ++++ b/src/auth_unix.c +@@ -56,6 +56,11 @@ + #include + #include + ++/* Workaround for Hurd */ ++#ifndef MAXHOSTNAMELEN ++# define MAXHOSTNAMELEN 64 ++#endif ++ + /* auth_unix.c */ + static void authunix_nextverf (AUTH *); + static bool_t authunix_marshal (AUTH *, XDR *); +--- a/src/bindresvport.c ++++ b/src/bindresvport.c +@@ -64,7 +64,7 @@ + return bindresvport_sa(sd, (struct sockaddr *)sin); + } + +-#ifdef __linux__ ++#if defined(__linux__) || defined(__GNU__) + + #define STARTPORT 600 + #define LOWPORT 512 -- cgit v1.2.3 From 0c5d974fa1c5cb636b0a362b84ddf61185888226 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 10 Apr 2020 09:54:02 +0200 Subject: gnu: guix: Use gnutls-3.6.13 when cross-compiling. * gnu/packages/package-management.scm (guix)[propagated-inputs]: When cross-compiling, use patched gnutls-3.6.13. --- gnu/packages/package-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4f3508109f..d0e607a8d8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -357,7 +357,7 @@ $(prefix)/etc/init.d\n"))) ("glibc-utf8-locales" ,glibc-utf8-locales))) (propagated-inputs - `(("gnutls" ,guile3.0-gnutls) + `(("gnutls" ,(if (%current-target-system) gnutls-3.6.13 guile3.0-gnutls)) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-3) ("guile-sqlite3" ,guile-sqlite3) -- cgit v1.2.3 From 38b9af7c92344a17b6680ebd2aeea14171f84a1c Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 8 Apr 2020 09:43:51 +0200 Subject: gnu: guix: Cross-build fixup for wrap-program. This allows running: guix build hello * gnu/packages/package-management.scm (guix)[arguments]: When cross-compiling, fixup the shebang generated by wrap-program. [inputs]: When cross-compiling, include bash-minimal. --- gnu/packages/package-management.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d0e607a8d8..3360a3b21b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages bison) #:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin' @@ -259,7 +260,8 @@ $(prefix)/etc/init.d\n"))) (setenv "SHELL" (which "sh")) #t)) (add-after 'install 'wrap-program - (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs outputs target + #:allow-other-keys) ;; Make sure the 'guix' command finds GnuTLS, ;; Guile-JSON, and Guile-Git automatically. (let* ((out (assoc-ref outputs "out")) @@ -301,6 +303,11 @@ $(prefix)/etc/init.d\n"))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)) `("GUIX_LOCPATH" ":" suffix (,locpath))) + (when target + ;; XXX Touching wrap-program rebuilds world + (let ((bash (assoc-ref inputs "bash"))) + (substitute* (string-append out "/bin/guix") + (("^#!.*/bash") (string-append "#! " bash "/bin/bash"))))) #t)))))) (native-inputs `(("pkg-config" ,pkg-config) @@ -346,7 +353,8 @@ $(prefix)/etc/init.d\n"))) `(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux"))) '()) ,@(if (%current-target-system) - `(("xz" ,xz)) + `(("bash" ,bash-minimal) + ("xz" ,xz)) '()) ;; Tests also rely on these bootstrap executables. -- cgit v1.2.3 From 52b01cb7007b793c5b21456ac8cdd9f9df5b8b16 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 7 Apr 2020 08:07:02 +0200 Subject: gnu: guix: Apply courage for the Hurd. * gnu/packages/package-management.scm (guix)[arguments]: When hurd-target? is true, configure --with-courage. --- gnu/packages/package-management.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3360a3b21b..558e15a769 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages hurd) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) @@ -150,7 +151,8 @@ ;; To avoid problems with the length of shebangs, ;; choose a fixed-width and short directory name ;; for tests. - "ac_cv_guix_test_root=/tmp/guix-tests") + "ac_cv_guix_test_root=/tmp/guix-tests" + ,@(if (hurd-target?) '("--with-courage") '())) #:parallel-tests? #f ;work around #:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 37d21a2d5099533ae963b5543bc4ae4d35f61c7a Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 10 Apr 2020 14:30:35 +0200 Subject: gnu: guix: Update to 52b01cb700. * gnu/packages/package-management.scm (guix): Update to 1.1.0-1.52b01cb700. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 558e15a769..9acc2adb79 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -114,8 +114,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "619f9181a363576894a433206008b139255062dd") - (revision 2)) + (commit "52b01cb7007b793c5b21456ac8cdd9f9df5b8b16") + (revision 3)) (package (name "guix") @@ -131,7 +131,7 @@ (commit commit))) (sha256 (base32 - "1lk0h9zgry7m78nv70gxwb57pw1d5yzay477gxsc43v1aa7zg8sp")) + "0rz5vnqvcrccbnrirhrsx3iw4jj75znh3ma9g7szjn313ii3hl1d")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 9b0c047c53ce064451717eeae4cc95c8ab213e57 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Apr 2020 11:16:21 +0300 Subject: system: hurd: Add less, which to %base-packages/hurd. * gnu/system/hurd.scm (%base-packages/hurd): Add less, which. --- gnu/system/hurd.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 2583ff00fa..f691d96e9d 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages hurd) + #:use-module (gnu packages less) #:use-module (gnu system vm) #:export (cross-hurd-image)) @@ -52,7 +53,7 @@ (define %base-packages/hurd (list hurd bash coreutils file findutils grep sed guile-3.0 guile-colorized guile-readline - net-base inetutils)) + net-base inetutils less which)) (define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach)) "Return a cross-built GNU/Hurd image." -- cgit v1.2.3 From 3eb4b466fcbe35cbc51e97d088cdcc2ba1853350 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 8 Apr 2020 09:46:40 +0200 Subject: system: hurd: Add /etc/group. This allows download to run. * gnu/system/hurd.scm (cross-hurd-image): Add /etc/group with guixbuilder. --- gnu/system/hurd.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index f691d96e9d..58bfdf88f6 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Ludovic Courtès +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -109,6 +110,12 @@ menuentry \"GNU\" { (define passwd (plain-file "passwd" "root:x:0:0:root:/root:/bin/sh +guixbuilder:x:1:1:guixbuilder:/var/empty:/bin/no-sh +")) + + (define group + (plain-file "group" + "guixbuild:x:1:guixbuilder ")) (define shadow @@ -163,6 +170,7 @@ fi\n")) ("/run/current-system/profile" -> ,system-profile) ("/etc/profile" -> ,etc-profile) ("/etc/fstab" -> ,fstab) + ("/etc/group" -> ,group) ("/etc/passwd" -> ,passwd) ("/etc/shadow" -> ,shadow) (file "/etc/hostname" "guixygnu") @@ -203,6 +211,7 @@ fi\n")) ("grub.cfg" ,grub.cfg) ("fstab" ,fstab) ("passwd" ,passwd) + ("group" ,group) ("etc-profile" ,etc-profile) ("shadow" ,shadow)) #:copy-inputs? #t -- cgit v1.2.3 From 73ddcab6075f60ef9b3cd72a35fbf7f5d622b6ef Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Wed, 29 Apr 2020 18:22:48 +0200 Subject: Revert "install: Pass "modprobe.blacklist=radeon"." This reverts commit 785919121066a10b291d783b6903b5e368e992a8, which is no longer needed since uvesafb was added in 557e6820a77b24f8f3f03f28ee473137b1caeb64. --- gnu/system/install.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index d31ed9a197..8804585215 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -471,12 +471,6 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (label (string-append "GNU Guix installation " (package-version guix))) - ;; XXX: The AMD Radeon driver is reportedly broken, which makes kmscon - ;; non-functional: - ;; . - ;; Thus, blacklist it. - (kernel-arguments '("quiet" "modprobe.blacklist=radeon")) - (file-systems ;; Note: the disk image build code overrides this root file system with ;; the appropriate one. -- cgit v1.2.3 From e06664da02a829c7fa8fd084aac47c837451d57a Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Wed, 29 Apr 2020 17:17:55 +0200 Subject: system: Blacklist usbmouse kernel module in default kernel-arguments. This avoids a race with the bcm5974 kernel module. Fixes . * gnu/system.scm (%default-modprobe-blacklist): New variable. ()[kernel-arguments]: Default to ... (%default-kernel-arguments): ... this new variable. * doc/guix.texi (operating-system Reference): Document the change. --- doc/guix.texi | 2 +- gnu/system.scm | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 26b4652f67..bdae451875 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11274,7 +11274,7 @@ possible to use the GNU@tie{}Hurd.}. A list of objects (usually packages) to collect loadable kernel modules from--e.g. @code{(list ddcci-driver-linux)}. -@item @code{kernel-arguments} (default: @code{'("quiet")}) +@item @code{kernel-arguments} (default: @code{%default-kernel-arguments}) List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., @code{("console=ttyS0")}. diff --git a/gnu/system.scm b/gnu/system.scm index 3c511f4089..ab6982ef5e 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -148,7 +149,8 @@ %base-packages-linux %base-packages-networking %base-packages-utils - %base-firmware)) + %base-firmware + %default-kernel-arguments)) ;;; Commentary: ;;; @@ -179,7 +181,7 @@ (kernel-loadable-modules operating-system-kernel-loadable-modules (default '())) ; list of packages (kernel-arguments operating-system-user-kernel-arguments - (default '("quiet"))) ; list of gexps/strings + (default %default-kernel-arguments)) ; list of gexps/strings (bootloader operating-system-bootloader) ; (label operating-system-label ; string (thunked) @@ -488,6 +490,16 @@ possible (that is if there's a LINUX keyword argument in the build system)." ((#:linux kernel #f) target-kernel))))) +(define %default-modprobe-blacklist + ;; List of kernel modules to blacklist by default. + '("usbmouse")) ;see + +(define %default-kernel-arguments + ;; Default arguments passed to the kernel. + (list (string-append "modprobe.blacklist=" + (string-join %default-modprobe-blacklist ",")) + "quiet")) + (define* (operating-system-directory-base-entries os) "Return the basic entries of the 'system' directory of OS for use as the value of the SYSTEM-SERVICE-TYPE service." -- cgit v1.2.3 From 53e8b852e90ec91e66172ad49f019955d7137eb1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 30 Apr 2020 09:44:32 -0400 Subject: gnu: spacefm: Fix privilege and disk management. * gnu/packages/lxde.scm (spacefm)[inputs]: Remove dbus. Add ktsuss. [arguments]<#:phases>[patch-source-files]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxde.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 9de96a21cb..a52e403106 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -27,6 +27,7 @@ (define-module (gnu packages lxde) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages disk) @@ -279,7 +280,6 @@ with freedesktop.org standard.") `(("bash" ,bash) ("cairo" ,cairo) ("curlftpfs" ,curlftpfs) - ("dbus" ,dbus) ("eudev" ,eudev) ("fakeroot" ,fakeroot) ("ffmpegthumbnailer" ,ffmpegthumbnailer) @@ -288,6 +288,7 @@ with freedesktop.org standard.") ("gtk+" ,gtk+) ("ifuse" ,ifuse) ("jmtpfs" ,jmtpfs) + ("ktsuss" ,ktsuss) ("libx11" ,libx11) ("lsof" ,lsof) ("pango" ,pango) @@ -297,12 +298,31 @@ with freedesktop.org standard.") ("util-linux" ,util-linux) ("wget" ,wget))) (arguments - `(#:configure-flags (list (string-append "--with-bash-path=" - (assoc-ref %build-inputs "bash") - "/bin/bash") - (string-append "--sysconfdir=" - (assoc-ref %outputs "out") - "/etc")))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source-files + (lambda* (#:key inputs #:allow-other-keys) + ;; Patch config file to load programs correctly. + (substitute* "etc/spacefm.conf" + (("#terminal_su=/bin/su") + "terminal_su=/run/setuid-programs/sudo") + (("#graphical_su=/usr/bin/gksu") + (string-append "graphical_su=" + (string-append (assoc-ref inputs "ktsuss") + "/bin/ktsuss")))) + ;; SpaceFM expects udevil to have uid set to root. + ;; User has to manually add udevil to setuid-programs. + (substitute* "src/settings.c" + (("/usr/bin/udevil") + "/run/setuid-programs/udevil")) + #t))) + #:configure-flags (list + (string-append "--with-bash-path=" + (assoc-ref %build-inputs "bash") + "/bin/bash") + (string-append "--sysconfdir=" + (assoc-ref %outputs "out") + "/etc")))) (home-page "https://ignorantguru.github.io/spacefm/") (synopsis "Multi-panel tabbed file manager") (description "SpaceFM is a graphical, multi-panel, tabbed file manager -- cgit v1.2.3 From fd31731b9dd704e5182655783551b94fa80afd88 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Fri, 1 May 2020 11:08:07 +0200 Subject: system: Blacklist usbkbd kernel module in default kernel-arguments. This is said to avoid a race with the usbhid kernel module. See . * gnu/system.scm (%default-modprobe-blacklist): Blacklist it. --- gnu/system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index ab6982ef5e..107b93db31 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -492,7 +492,8 @@ possible (that is if there's a LINUX keyword argument in the build system)." (define %default-modprobe-blacklist ;; List of kernel modules to blacklist by default. - '("usbmouse")) ;see + '("usbmouse" ;races with bcm5974, see + "usbkbd")) ;races with usbhid, see (define %default-kernel-arguments ;; Default arguments passed to the kernel. -- cgit v1.2.3 From 0f9331e486f645a841e9780a588763fef8f5153c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 1 May 2020 16:10:15 +0200 Subject: gnu: Update emacs-modus-themes. * gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme): (emacs-modus-vivendi-theme): Update to 0.8.0. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 776dcbb897..52e0b576a5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21116,14 +21116,14 @@ Emacs that integrate with major modes like Org-mode.") (define-public emacs-modus-operandi-theme (package (name "emacs-modus-operandi-theme") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "modus-operandi-theme-" version ".el")) (sha256 - (base32 "17zvcqplbl3rk39k61v43ganzv06j49rlyickanwll5m1a3iibw2")))) + (base32 "09lw556jphrxrmwxkwzfgd4r7ylz99m8awxka4sfj5sa8fbjb3g8")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Accessible light theme (WCAG AAA)") @@ -21137,14 +21137,14 @@ standard. This is the highest standard of its kind.") (define-public emacs-modus-vivendi-theme (package (name "emacs-modus-vivendi-theme") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "modus-vivendi-theme-" version ".el")) (sha256 - (base32 "1w4vrg39dghghkvll3h4kmzykc3zpp6pbychb39gcc13z2b06v8g")))) + (base32 "0hwkzbx7a9scdr589sb7hw90lsm8yxcn3y5xr3bpyxf8rkr2zl4c")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Accessible dark theme (WCAG AAA)") -- cgit v1.2.3 From a978840cb262b66f61693f9ca32dd86bfa871f57 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 1 May 2020 16:14:58 +0200 Subject: gnu: emacs-web-mode: Update to 17. * gnu/packages/emacs-xyz.scm (emacs-web-mode): Update to 17. [description]: "web-mode" -> "web mode". --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 52e0b576a5..6c09610ce7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7519,21 +7519,21 @@ via @code{gitlab-ci-lint}.") (define-public emacs-web-mode (package (name "emacs-web-mode") - (version "16") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/fxbois/web-mode.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17dw6a8d0p304f2sa4f9zwd8r48w2wbkc3fvbmxwlg4w12h7cwf0")))) + (version "17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fxbois/web-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jr5a1nzp8nbdng0k2fcaymiiv9ngrbknbrqaswgqn3akvx793jk")))) (build-system emacs-build-system) (synopsis "Major mode for editing web templates") - (description "Web-mode is an Emacs major mode for editing web templates + (description "Web mode is an Emacs major mode for editing web templates aka HTML files embedding parts (CSS/JavaScript) and blocks (pre rendered by -client/server side engines). Web-mode is compatible with many template +client/server side engines). Web mode is compatible with many template engines: PHP, JSP, ASP, Django, Twig, Jinja, Mustache, ERB, FreeMarker, Velocity, Cheetah, Smarty, CTemplate, Mustache, Blade, ErlyDTL, Go Template, Dust.js, React/JSX, Angularjs, ejs, etc.") -- cgit v1.2.3 From a5e4713015f0444951124d88cbd759dec0a43307 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 1 May 2020 16:23:52 +0200 Subject: gnu: fet: Update to 5.44.4. * gnu/packages/education.scm (fet): Update to 5.44.4. [description]: Remove uninformative part. --- gnu/packages/education.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index a1fee29c4e..d6c2cd02c3 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -606,14 +606,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.44.0") + (version "5.44.4") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "13q3b0g1zz885g15gir8fbalvix8sy42v1p429h0751490wq5c3h")))) + (base32 "1bji4910v6adhngdh5ajz5bxam9z3yqnh8d1h1xajy6npm6qq3nx")))) (build-system gnu-build-system) (arguments `(#:phases @@ -632,14 +632,14 @@ Portuguese, Spanish and Italian.") `(("qtbase" ,qtbase))) (home-page "https://www.lalescu.ro/liviu/fet/") (synopsis "Timetabling software") - (description "FET is a program for automatically scheduling the -timetable of a school, high-school or university. It uses a fast and -efficient timetabling algorithm. + (description + "FET is a program for automatically scheduling the timetable of a school, +high-school or university. It uses a fast and efficient timetabling +algorithm. -Usually, FET is able to solve a complicated timetable in maximum 5-20 -minutes. For simpler timetables, it may take a shorter time, under -5 minutes (in some cases, a matter of seconds). For extremely -difficult timetables, it may take a longer time, a matter of hours.") +Usually, FET is able to solve a complicated timetable in maximum 5-20 minutes. +For extremely difficult timetables, it may take a longer time, a matter of +hours.") (license license:agpl3+))) (define-public klavaro -- cgit v1.2.3 From 88c586f324114e4c3fa532e4561e12878daed04f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 1 May 2020 16:37:07 +0200 Subject: gnu: frescobaldi: Update to 3.1.2. * gnu/packages/music.scm (frescobaldi): Update to 3.1.2. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 589f158afe..8e644288d5 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2035,7 +2035,7 @@ using a system-independent interface.") (define-public frescobaldi (package (name "frescobaldi") - (version "3.1.1") + (version "3.1.2") (source (origin (method url-fetch) @@ -2043,7 +2043,7 @@ using a system-independent interface.") "https://github.com/wbsoft/frescobaldi/releases/download/v" version "/frescobaldi-" version ".tar.gz")) (sha256 - (base32 "0kfwvgygx2ds01w8g7vzykfrajglmr2brchk9d67ahzijpgvfkj5")))) + (base32 "084vxzvxnxl5rrhllincnh6krsyi03c8p0452ppzmn9c52wgyb2w")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;no tests included -- cgit v1.2.3 From 3e2d65aecbace2e23cc84f72dda9c007d745f291 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 1 May 2020 16:37:32 +0200 Subject: gnu: frescobaldi: Use HTTPS home page URI. * gnu/packages/music.scm (frescobaldi)[home-page]: Use HTTPS URI. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8e644288d5..7e8f5e581e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2056,7 +2056,7 @@ using a system-independent interface.") ("python-pyportmidi" ,python-pyportmidi) ("python-pyqt" ,python-pyqt) ("python-sip" ,python-sip))) - (home-page "http://www.frescobaldi.org/") + (home-page "https://www.frescobaldi.org/") (synopsis "LilyPond sheet music text editor") (description "Frescobaldi is a LilyPond sheet music text editor with syntax -- cgit v1.2.3 From 8546f4da5b3677001dbda6b3a116f5bdc44ea5c0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 28 Apr 2020 02:29:36 -0400 Subject: gnu: udevil: Fix loading of setuid-programs. * gnu/packages/disk.scm (udevil)[arguments]<#:configure-flags>: Add "--with-mount-prog", "--with-umount-prog", "--with-losetup-prog", "--with-setfacl-prog". [arguments]<#:phases>[patch-udevil-reference]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/disk.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index b7d3b9d954..2b9ba8e38d 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -103,16 +103,34 @@ (build-system gnu-build-system) (arguments `(#:configure-flags - (list "--disable-systemd" - (string-append "--sysconfdir=" - (assoc-ref %outputs "out") - "/etc")) + (list + "--disable-systemd" + (string-append "--sysconfdir=" + (assoc-ref %outputs "out") + "/etc") + ;; udevil expects these programs to be run with uid set as root. + ;; user has to manually add these programs to setuid-programs. + ;; mount and umount are default setuid-programs in guix system. + "--with-mount-prog=/run/setuid-programs/mount" + "--with-umount-prog=/run/setuid-programs/umount" + "--with-losetup-prog=/run/setuid-programs/losetup" + "--with-setfacl-prog=/run/setuid-programs/setfacl") #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-root-reference (lambda _ (substitute* "src/Makefile.in" (("-o root -g root") "")) + #t)) + (add-after 'unpack 'patch-udevil-reference + ;; udevil expects itself to be run with uid set as root. + ;; devmon also expects udevil to be run with uid set as root. + ;; user has to manually add udevil to setuid-programs. + (lambda _ + (substitute* "src/udevil.c" + (("/usr/bin/udevil") "/run/setuid-programs/udevil")) + (substitute* "src/devmon" + (("`which udevil 2>/dev/null`") "/run/setuid-programs/udevil")) #t))))) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From c316b8569229fd03b571214493c3f12f754e3ac8 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 1 May 2020 16:22:54 +0200 Subject: doc: Replace section 'Early OOM service' by 'Linux Services'. * doc/guix.texi (Linux Services): Changed from 'subsubheading' to 'subsection'. (Early OOM Service, Kernel Module Loader Service): Moved under 'Linux Services'. Signed-off-by: Mathieu Othacehe --- doc/guix.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index bdae451875..4868cf479e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25491,13 +25491,13 @@ Extra command line options for @code{guix-data-service-process-jobs}. @end deftp @node Linux Services -@subsubheading Linux Services +@subsection Linux Services @cindex oom @cindex out of memory killer @cindex earlyoom @cindex early out of memory daemon -@subsection Early OOM Service +@subsubheading Early OOM Service @uref{https://github.com/rfjakob/earlyoom,Early OOM}, also known as Earlyoom, is a minimalist out of memory (OOM) daemon that runs in user @@ -25557,7 +25557,7 @@ notifications. @cindex modprobe @cindex kernel module loader -@subsubsection Kernel Module Loader Service +@subsubheading Kernel Module Loader Service The kernel module loader service allows one to load loadable kernel modules at boot. This is especially useful for modules that don't -- cgit v1.2.3 From dc6eec77a55a69a4fb1947978a0e4afc6e8205c7 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 1 May 2020 16:22:55 +0200 Subject: doc: Move 'Dictionary Service' under 'Miscellaneous Services'. * doc/guix.texi (Dictionary Service): Renamed to singular and changed from 'subsubsection' to 'subheading'. Signed-off-by: Mathieu Othacehe --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4868cf479e..c571010bc8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25733,7 +25733,7 @@ If true, this must be the name of a file to log messages to. @end table @end deftp -@subsection Dictionary Services +@subsubheading Dictionary Service @cindex dictionary The @code{(gnu services dict)} module provides the following service: -- cgit v1.2.3 From 5bd2d42e8e864e067e4b0e5c16812eb6edb5f74a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 1 May 2020 16:42:53 +0200 Subject: gnu: scintilla: Update to 4.3.3. * gnu/packages/text-editors.scm (scintilla): Update to 4.3.3. --- gnu/packages/text-editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index f2f675d148..072760ee10 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -757,14 +757,14 @@ and Octave. TeXmacs is completely extensible via Guile.") (define-public scintilla (package (name "scintilla") - (version "4.3.2") + (version "4.3.3") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) (string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 - (base32 "0d8ssl0d8r6bslbzd507l9c5g8mwn1zriak3fnf85936pdmkhq9h")))) + (base32 "0zh8c19r1zd4kr9jg2ws0n2n5ic2siz5zbns6cvylyfbpf69ghy2")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") -- cgit v1.2.3 From ee75b46fb441bdce88cdd38fad390840207948d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 May 2020 14:02:27 +0200 Subject: gnu: five-or-more: Update to 3.32.2. * gnu/packages/gnome.scm (five-or-more): Update to 3.32.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e6b1942450..2f581870bf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3799,7 +3799,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") (define-public five-or-more (package (name "five-or-more") - (version "3.32.1") + (version "3.32.2") (source (origin (method url-fetch) @@ -3807,7 +3807,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") (version-major+minor version) "/" "five-or-more-" version ".tar.xz")) (sha256 - (base32 "0xw05dd2dwi9vsph9h158b4n89s5k07xrh6bjz1icm0pdmjwhpgk")))) + (base32 "19pf8wzbf3ciqf2k4bj9sddvyhckfd62x86pnqr6s8h4vn9jc6ii")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 4b50aaade4ef34327dbfd4412ee36ee5cc23bc10 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 May 2020 14:02:43 +0200 Subject: gnu: crispy-doom: Update to 5.8.0. * gnu/packages/games.scm (crispy-doom): Update to 5.8.0. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 10b3a072b9..62fb167b70 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6191,7 +6191,7 @@ affect gameplay).") (package (inherit chocolate-doom) (name "crispy-doom") - (version "5.7.2") + (version "5.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -6199,7 +6199,7 @@ affect gameplay).") (commit (string-append "crispy-doom-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "002aqbgsksrgzqridwdlkrjincaxh0dkvwlrbb8d2f3kwk7lj4fq")))) + (base32 "1b6gn0dysv631jynh769whww9xcss1gms78sz3nrn855q1dsvcb4")))) (native-inputs (append (package-native-inputs chocolate-doom) -- cgit v1.2.3 From 53b9cdd58eb1a098dce4fec0161d54f22f1c500a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 May 2020 14:18:52 +0200 Subject: gnu: teeworlds: Update to 0.7.5. * gnu/packages/games.scm (teeworlds): Update to 0.7.5. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 62fb167b70..7fed4dee6c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4865,7 +4865,7 @@ small robot living in the nano world, repair its maker.") (define-public teeworlds (package (name "teeworlds") - (version "0.7.4") + (version "0.7.5") (source (origin (method git-fetch) (uri (git-reference @@ -4874,7 +4874,7 @@ small robot living in the nano world, repair its maker.") (file-name (git-file-name name version)) (sha256 (base32 - "1lxdb1k2cdj2421vyz1z0ximzfnpkh2y4y84zpn2gqsa1nzwbryb")) + "169dl83q08zl4h813az8hjs4rs3dms9yjn6bnsld4fjcj0imvvc6")) (modules '((guix build utils) (ice-9 ftw) (ice-9 regex) -- cgit v1.2.3 From ebf6431b9b3957b68c77d510f73bd3853e6623c0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 May 2020 14:19:03 +0200 Subject: gnu: scummvm: Update to 2.1.2. * gnu/packages/emulators.scm (scummvm): Update to 2.1.2. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 58d6c73ee2..85e2016e49 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1204,14 +1204,14 @@ multi-system game/emulator system.") (define-public scummvm (package (name "scummvm") - (version "2.1.1") + (version "2.1.2") (source (origin (method url-fetch) (uri (string-append "http://www.scummvm.org/frs/scummvm/" version "/scummvm-" version ".tar.xz")) (sha256 - (base32 "1a6waf1ybp91nwva8g650cljlfb1di4l0jv13vg6yfgkas9pclsp")))) + (base32 "1c4fz1nfg0nqnqx9iipayhzcsiqdmfxm2i95nw9dbhshhsdnrhf4")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;require "git" -- cgit v1.2.3 From eeec9973bca4ce79e848a30979223f920dbfc7d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 May 2020 16:31:57 +0200 Subject: gnu: quazip: Update to 0.9. * gnu/packages/compression.scm (quazip): Update to 0.9. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 85f802a069..a1c5bbf8c2 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1947,7 +1947,7 @@ download times, and other distribution and storage costs.") (define-public quazip (package (name "quazip") - (version "0.8.1") + (version "0.9") (source (origin (method git-fetch) (uri (git-reference @@ -1956,7 +1956,7 @@ download times, and other distribution and storage costs.") (file-name (git-file-name name version)) (sha256 (base32 - "1g473gnsbkvxpsv8lbsmhspn7jnq86b05zzgqh11r581v8ndvz5s")))) + "0psvf3d9akyyx3bckc9325nmbp97xiagf8la4vhca5xn2f430fbn")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no test -- cgit v1.2.3 From 7e5c7677056610fa45dde7415ccbf07525d00e79 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 May 2020 16:19:24 +0200 Subject: gnu: serd: Update to 0.30.4. * gnu/packages/rdf.scm (serd): Update to 0.30.4. --- gnu/packages/rdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 089e31b252..df15593d5d 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -267,14 +267,14 @@ and triple stores.") (define-public serd (package (name "serd") - (version "0.30.2") + (version "0.30.4") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/serd-" version ".tar.bz2")) (sha256 (base32 - "00kjjgs5a8r72khgpya14scvl3n58wqwl5927y14z03j25q04ccx")))) + "168rn3m32c59qbar120f83ibcnnd987ij9p053kybgl7cmm6358c")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 7dfc7c5398c16bdf27acf260c71f905d13bb3a9c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 1 May 2020 12:45:03 -0400 Subject: gnu: xfe: Fix configuration and icons. * gnu/packages/disk.scm (xfe)[arguments]<#:make-flags>: Remove BASH_COMPLETION_DIR. [arguments]<#:phases>[patch-xferc-path]: Remove phase. [arguments]<#:phases>[patch-xfe-paths]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/disk.scm | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 2b9ba8e38d..f557c57749 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -936,8 +936,7 @@ since they are better handled by external tools.") (method url-fetch) (uri (string-append "https://sourceforge.net/projects/xfe/files/xfe/" - version - "/xfe-" version ".tar.gz")) + version "/xfe-" version ".tar.gz")) (sha256 (base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs")))) (build-system gnu-build-system) @@ -955,20 +954,32 @@ since they are better handled by external tools.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-xferc-path + (add-after 'unpack 'patch-xfe-paths (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (xferc (string-append out "/share/xfe/xferc"))) + (let* + ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (xferc (string-append out "/share/xfe/xferc")) + (xfe-theme (string-append out "/share/xfe/icons/xfe-theme"))) + ;; Correct path for xfe registry. + (substitute* "src/foxhacks.cpp" + (("/etc:/usr/share:/usr/local/share") share)) + ;; Correct path for xfe configuration. (substitute* "src/XFileExplorer.cpp" - (("/usr/share/xfe/xferc") xferc)) - #t)))) - #:make-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "BASH_COMPLETION_DIR=" out - "/share/bash-completion/completions"))))) + (("/usr/share/xfe/xferc") xferc) + (("/usr/local/share/xfe/xferc") xferc) + (("/opt/local/share/xfe/xferc") xferc)) + ;; Correct path for xfe icons. + (substitute* "src/xfedefs.h" + (((string-append + "~/.config/xfe/icons/xfe-theme:" + "/usr/local/share/xfe/icons/xfe-theme:" + "/usr/share/xfe/icons/xfe-theme")) + xfe-theme)) + #t)))))) (synopsis "File Manager for X-Based Graphical Systems") (description"XFE (X File Explorer) is a file manager for X. It is based on the popular but discontinued, X Win Commander. It aims to be the file manager of choice for all light thinking Unix addicts!") (home-page "http://roland65.free.fr/xfe/") - (license license:gpl2+))) + (license license:gpl2+))) \ No newline at end of file -- cgit v1.2.3 From db7c73f53a0b2470392e29d818ed4ea17ddcc505 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Apr 2020 19:44:54 +0200 Subject: gnu: %guile-static: Rewrite in terms of 'make-guile-static'. The derivation remains unchanged. * gnu/packages/make-bootstrap.scm (make-guile-static): New procedure. (%guile-static): Adjust accordingly. --- gnu/packages/make-bootstrap.scm | 124 +++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 60 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 5716ed3886..f4d7fd6a2a 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -676,70 +676,74 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))) (inputs `(("mes" ,%mes-minimal))))) +(define* (make-guile-static guile patches) + (package-with-relocatable-glibc + (static-package + (package + (inherit guile) + (source + (origin (inherit (package-source guile)) + (patches (append (map search-patch patches) + (origin-patches (package-source guile)))))) + (name (string-append (package-name guile) "-static")) + (synopsis "Statically-linked and relocatable Guile") + + ;; Remove the 'debug' output (see above for the reason.) + (outputs (delete "debug" (package-outputs guile))) + + (inputs + `(("libunistring:static" ,libunistring "static") + ,@(package-inputs guile))) + + (propagated-inputs + `(("bdw-gc" ,libgc/static-libs) + ,@(alist-delete "bdw-gc" + (package-propagated-inputs guile)))) + (arguments + (substitute-keyword-arguments (package-arguments guile) + ((#:configure-flags flags '()) + ;; When `configure' checks for ltdl availability, it + ;; doesn't try to link using libtool, and thus fails + ;; because of a missing -ldl. Work around that. + ''("LDFLAGS=-ldl")) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + + ;; Do not record the absolute file name of 'sh' in + ;; (ice-9 popen). This makes 'open-pipe' unusable in + ;; a build chroot ('open-pipe*' is fine) but avoids + ;; keeping a reference to Bash. + (delete 'pre-configure) + + (add-before 'configure 'static-guile + (lambda _ + (substitute* "libguile/Makefile.in" + ;; Create a statically-linked `guile' + ;; executable. + (("^guile_LDFLAGS =") + "guile_LDFLAGS = -all-static") + + ;; Add `-ldl' *after* libguile-2.0.la. + (("^guile_LDADD =(.*)$" _ ldadd) + (string-append "guile_LDADD = " + (string-trim-right ldadd) + " -ldl\n"))))))) + ((#:tests? _ #f) + ;; There are uses of `dynamic-link' in + ;; {foreign,coverage}.test that don't fly here. + #f) + ((#:parallel-build? _ #f) + ;; Work around the fact that the Guile build system is + ;; not deterministic when parallel-build is enabled. + #f))))))) + (define %guile-static ;; A statically-linked Guile that is relocatable--i.e., it can search ;; .scm and .go files relative to its installation directory, rather ;; than in hard-coded configure-time paths. - (let* ((patches (cons* (search-patch "guile-relocatable.patch") - (search-patch "guile-default-utf8.patch") - (search-patch "guile-linux-syscalls.patch") - (origin-patches (package-source guile-2.0)))) - (source (origin (inherit (package-source guile-2.0)) - (patches patches))) - (guile (package (inherit guile-2.0) - (name (string-append (package-name guile-2.0) "-static")) - (source source) - (synopsis "Statically-linked and relocatable Guile") - - ;; Remove the 'debug' output (see above for the reason.) - (outputs (delete "debug" (package-outputs guile-2.0))) - - (inputs - `(("libunistring:static" ,libunistring "static") - ,@(package-inputs guile-2.2))) - - (propagated-inputs - `(("bdw-gc" ,libgc/static-libs) - ,@(alist-delete "bdw-gc" - (package-propagated-inputs guile-2.0)))) - (arguments - (substitute-keyword-arguments (package-arguments guile-2.0) - ((#:configure-flags flags '()) - ;; When `configure' checks for ltdl availability, it - ;; doesn't try to link using libtool, and thus fails - ;; because of a missing -ldl. Work around that. - ''("LDFLAGS=-ldl")) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - - ;; Do not record the absolute file name of 'sh' in - ;; (ice-9 popen). This makes 'open-pipe' unusable in - ;; a build chroot ('open-pipe*' is fine) but avoids - ;; keeping a reference to Bash. - (delete 'pre-configure) - - (add-before 'configure 'static-guile - (lambda _ - (substitute* "libguile/Makefile.in" - ;; Create a statically-linked `guile' - ;; executable. - (("^guile_LDFLAGS =") - "guile_LDFLAGS = -all-static") - - ;; Add `-ldl' *after* libguile-2.0.la. - (("^guile_LDADD =(.*)$" _ ldadd) - (string-append "guile_LDADD = " - (string-trim-right ldadd) - " -ldl\n"))))))) - ((#:tests? _ #f) - ;; There are uses of `dynamic-link' in - ;; {foreign,coverage}.test that don't fly here. - #f) - ((#:parallel-build? _ #f) - ;; Work around the fact that the Guile build system is - ;; not deterministic when parallel-build is enabled. - #f)))))) - (package-with-relocatable-glibc (static-package guile)))) + (make-guile-static guile-2.0 '("guile-relocatable.patch" + "guile-default-utf8.patch" + "guile-linux-syscalls.patch"))) (define %guile-static-stripped ;; A stripped static Guile binary, for use during bootstrap. -- cgit v1.2.3 From e66bbd4201566cdc388f9b02d59da17beb8eb47d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Apr 2020 19:47:23 +0200 Subject: gnu: %guile-static-stripped: Rewrite in terms of 'make-guile-static-stripped'. The derivation changes slightly, but the end result is bit-identical. * gnu/packages/make-bootstrap.scm (make-guile-static-stripped): New procedure. (%guile-static-stripped): Adjust accordingly. --- gnu/packages/make-bootstrap.scm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index f4d7fd6a2a..d336818299 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -745,30 +745,30 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "guile-default-utf8.patch" "guile-linux-syscalls.patch"))) -(define %guile-static-stripped - ;; A stripped static Guile binary, for use during bootstrap. - (package (inherit %guile-static) - (name "guile-static-stripped") +(define* (make-guile-static-stripped static-guile) + (package + (inherit static-guile) + (name (string-append (package-name static-guile) "-stripped")) (build-system trivial-build-system) (arguments ;; The end result should depend on nothing but itself. `(#:allowed-references ("out") #:modules ((guix build utils)) #:builder - (let () + (let ((version ,(version-major+minor (package-version static-guile)))) (use-modules (guix build utils)) (let* ((in (assoc-ref %build-inputs "guile")) (out (assoc-ref %outputs "out")) (guile1 (string-append in "/bin/guile")) (guile2 (string-append out "/bin/guile"))) - (mkdir-p (string-append out "/share/guile/2.0")) - (copy-recursively (string-append in "/share/guile/2.0") - (string-append out "/share/guile/2.0")) + (mkdir-p (string-append out "/share/guile/" version)) + (copy-recursively (string-append in "/share/guile/" version) + (string-append out "/share/guile/" version)) - (mkdir-p (string-append out "/lib/guile/2.0/ccache")) - (copy-recursively (string-append in "/lib/guile/2.0/ccache") - (string-append out "/lib/guile/2.0/ccache")) + (mkdir-p (string-append out "/lib/guile/" version "/ccache")) + (copy-recursively (string-append in "/lib/guile/" version "/ccache") + (string-append out "/lib/guile/" version "/ccache")) (mkdir (string-append out "/bin")) (copy-file guile1 guile2) @@ -789,10 +789,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." '((invoke guile2 "--version"))) #t)))) - (inputs `(("guile" ,%guile-static))) + (inputs `(("guile" ,static-guile))) (outputs '("out")) (synopsis "Minimal statically-linked and relocatable Guile"))) +(define %guile-static-stripped + ;; A stripped static Guile binary, for use during bootstrap. + (make-guile-static-stripped %guile-static)) + (define (tarball-package pkg) "Return a package containing a tarball of PKG." (package (inherit pkg) -- cgit v1.2.3 From 3ba23f0582a432dfc04bfbf58f375f6643caae19 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Apr 2020 19:54:03 +0200 Subject: gnu: Add relocatable static Guile 3.0 variant. * gnu/packages/patches/guile-2.2-default-utf8.patch: New file, extracted from commit 2acfe022a740f79b593348cc6362cc4ee8f33bb4. * gnu/packages/patches/guile-3.0-linux-syscalls.patch, gnu/packages/patches/guile-3.0-relocatable.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Move all Guile patches together while at it. * gnu/packages/make-bootstrap.scm (%guile-3.0-static-stripped): New public variable. --- gnu/local.mk | 7 +- gnu/packages/make-bootstrap.scm | 11 +- gnu/packages/patches/guile-2.2-default-utf8.patch | 82 +++++ .../patches/guile-3.0-linux-syscalls.patch | 345 +++++++++++++++++++++ gnu/packages/patches/guile-3.0-relocatable.patch | 69 +++++ 5 files changed, 511 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/guile-2.2-default-utf8.patch create mode 100644 gnu/packages/patches/guile-3.0-linux-syscalls.patch create mode 100644 gnu/packages/patches/guile-3.0-relocatable.patch diff --git a/gnu/local.mk b/gnu/local.mk index 38e1d85b7b..0111ae2161 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1027,10 +1027,13 @@ dist_patch_DATA = \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-default-utf8.patch \ - %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ + %D%/packages/patches/guile-2.2-default-utf8.patch \ + %D%/packages/patches/guile-relocatable.patch \ + %D%/packages/patches/guile-3.0-relocatable.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ + %D%/packages/patches/guile-3.0-linux-syscalls.patch \ + %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-present-coding.patch \ - %D%/packages/patches/guile-relocatable.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ %D%/packages/patches/guile-sqlite3-fix-cross-compilation.patch \ diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d336818299..fe86f810bf 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -55,7 +55,8 @@ %mes-bootstrap-tarball %bootstrap-tarballs - %guile-static-stripped)) + %guile-static-stripped + %guile-3.0-static-stripped)) ;;; Commentary: ;;; @@ -797,6 +798,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; A stripped static Guile binary, for use during bootstrap. (make-guile-static-stripped %guile-static)) +(define %guile-3.0-static-stripped + ;; A stripped static Guile 3.0 binary, for use in initrds. + (make-guile-static-stripped + (make-guile-static guile-3.0 + '("guile-2.2-default-utf8.patch" + "guile-3.0-linux-syscalls.patch" + "guile-3.0-relocatable.patch")))) + (define (tarball-package pkg) "Return a package containing a tarball of PKG." (package (inherit pkg) diff --git a/gnu/packages/patches/guile-2.2-default-utf8.patch b/gnu/packages/patches/guile-2.2-default-utf8.patch new file mode 100644 index 0000000000..f55a6430c1 --- /dev/null +++ b/gnu/packages/patches/guile-2.2-default-utf8.patch @@ -0,0 +1,82 @@ +This hack makes Guile default to UTF-8. This avoids calls to +`iconv_open'; `iconv_open' tries to open shared objects that aren't +available during bootstrap, so using UTF-8 avoids that (and UTF-8 has +built-in conversions in glibc, too.) + +diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c +index 0ac5ea6a6..f73301e2f 100644 +--- a/libguile/bytevectors.c ++++ b/libguile/bytevectors.c +@@ -1931,7 +1931,7 @@ utf_encoding_name (char *name, size_t utf_width, SCM endianness) + if (scm_i_is_narrow_string (str)) \ + { \ + err = mem_iconveh (scm_i_string_chars (str), c_strlen, \ +- "ISO-8859-1", c_utf_name, \ ++ "UTF-8", c_utf_name, \ + iconveh_question_mark, NULL, \ + &c_utf, &c_utf_len); \ + if (SCM_UNLIKELY (err)) \ +diff --git a/libguile/ports.c b/libguile/ports.c +index 45e62f4e4..42012f3aa 100644 +--- a/libguile/ports.c ++++ b/libguile/ports.c +@@ -974,7 +974,9 @@ canonicalize_encoding (const char *enc) + char *ret; + int i; + +- if (!enc || encoding_matches (enc, sym_ISO_8859_1)) ++ if (enc == NULL) ++ return sym_UTF_8; ++ if (encoding_matches (enc, sym_ISO_8859_1)) + return sym_ISO_8859_1; + if (encoding_matches (enc, sym_UTF_8)) + return sym_UTF_8; +@@ -4198,7 +4200,7 @@ scm_init_ports (void) + scm_c_define ("%default-port-conversion-strategy", + scm_make_fluid_with_default (sym_substitute)); + /* Use the locale as the default port encoding. */ +- scm_i_set_default_port_encoding (locale_charset ()); ++ scm_i_set_default_port_encoding ("UTF-8"); + + scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, + "scm_init_ice_9_ports", +diff --git a/libguile/strings.c b/libguile/strings.c +index 056b4c99f..63a6c050d 100644 +--- a/libguile/strings.c ++++ b/libguile/strings.c +@@ -1579,7 +1579,7 @@ scm_i_default_string_failed_conversion_handler (void) + SCM + scm_from_locale_stringn (const char *str, size_t len) + { +- return scm_from_stringn (str, len, locale_charset (), ++ return scm_from_stringn (str, len, "UTF-8", + scm_i_default_string_failed_conversion_handler ()); + } + +@@ -1907,7 +1907,7 @@ char * + scm_to_locale_stringn (SCM str, size_t *lenp) + { + return scm_to_stringn (str, lenp, +- locale_charset (), ++ "UTF-8", + scm_i_default_string_failed_conversion_handler ()); + } + +@@ -2195,7 +2195,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, + scm_wrong_type_arg_msg (NULL, 0, str, "string"); + + if (encoding == NULL) +- encoding = "ISO-8859-1"; ++ encoding = "UTF-8"; + + if (c_strcasecmp (encoding, "UTF-8") == 0) + /* This is the most common case--e.g., when calling libc bindings +@@ -2247,7 +2247,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, + if (scm_i_is_narrow_string (str)) + { + ret = mem_iconveh (scm_i_string_chars (str), ilen, +- "ISO-8859-1", encoding, ++ "UTF-8", encoding, + (enum iconv_ilseq_handler) handler, NULL, + &buf, &len); + diff --git a/gnu/packages/patches/guile-3.0-linux-syscalls.patch b/gnu/packages/patches/guile-3.0-linux-syscalls.patch new file mode 100644 index 0000000000..0d27f77ee2 --- /dev/null +++ b/gnu/packages/patches/guile-3.0-linux-syscalls.patch @@ -0,0 +1,345 @@ +This patch adds bindings to Linux syscalls for which glibc has symbols. + +Using the FFI would have been nice, but that's not an option when using +a statically-linked Guile in an initrd that doesn't have libc.so around. + +diff --git a/libguile/posix.c b/libguile/posix.c +--- a/libguile/posix.c ++++ b/libguile/posix.c +@@ -2375,6 +2375,336 @@ scm_init_popen (void) + } + #endif /* HAVE_START_CHILD */ + ++ ++/* Linux! */ ++#ifdef __linux__ ++ ++#include ++#include ++ ++#include "libguile/foreign.h" ++#include "libguile/bytevectors.h" ++#include ++ ++SCM_DEFINE (scm_mount, "mount", 3, 2, 0, ++ (SCM source, SCM target, SCM type, SCM flags, SCM data), ++ "Mount file system of @var{type} specified by @var{source} " ++ "on @var{target}.") ++#define FUNC_NAME s_scm_mount ++{ ++ int err; ++ char *c_source, *c_target, *c_type, *c_data; ++ unsigned long c_flags; ++ ++ c_source = scm_to_locale_string (source); ++ c_target = scm_to_locale_string (target); ++ c_type = scm_to_locale_string (type); ++ c_flags = SCM_UNBNDP (flags) ? 0 : scm_to_ulong (flags); ++ ++ if (SCM_UNBNDP (data) || scm_is_false (data)) ++ c_data = NULL; ++ else ++ c_data = scm_to_locale_string (data); ++ ++ err = mount (c_source, c_target, c_type, c_flags, c_data); ++ if (err != 0) ++ err = errno; ++ ++ free (c_source); ++ free (c_target); ++ free (c_type); ++ ++ if (c_data != NULL) ++ free (c_data); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++SCM_DEFINE (scm_umount, "umount", 1, 0, 0, ++ (SCM target), ++ "Unmount the file system on @var{target}.") ++#define FUNC_NAME s_scm_umount ++{ ++ int err; ++ char *c_target; ++ ++ c_target = scm_to_locale_string (target); ++ ++ err = umount (c_target); ++ if (err != 0) ++ err = errno; ++ ++ free (c_target); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++/* Linux's module installation syscall. See `kernel/module.c' in Linux; ++ the function itself is part of the GNU libc. ++ ++ Load the LEN bytes at MODULE as a kernel module, with arguments from ++ ARGS, a space-separated list of options. */ ++extern long init_module (void *module, unsigned long len, const char *args); ++ ++/* Load a kernel module from FD. FLAGS must be a bitwise or of ++ MODULE_INIT_* constants. The GNU libc doesn't provide a wrapper for ++ this one so we use 'syscall'. */ ++static int ++finit_module (int fd, const char *args, int flags) ++{ ++ return syscall (SYS_finit_module, fd, args, flags); ++} ++ ++ ++SCM_DEFINE (scm_load_linux_module, "load-linux-module", 1, 1, 0, ++ (SCM data, SCM options), ++ "Load the Linux kernel module whose contents are in bytevector " ++ "DATA (the contents of a @code{.ko} file), with the arguments " ++ "from the OPTIONS string.") ++#define FUNC_NAME s_scm_load_linux_module ++{ ++ long err; ++ void *c_data; ++ unsigned long c_len; ++ char *c_options; ++ ++ SCM_VALIDATE_BYTEVECTOR (SCM_ARG1, data); ++ ++ c_data = SCM_BYTEVECTOR_CONTENTS (data); ++ c_len = SCM_BYTEVECTOR_LENGTH (data); ++ c_options = ++ scm_to_locale_string (SCM_UNBNDP (options) ? scm_nullstr : options); ++ ++ err = init_module (c_data, c_len, c_options); ++ ++ free (c_options); ++ ++ if (err != 0) ++ SCM_SYSERROR; ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++SCM_DEFINE (scm_load_linux_module_fd, "load-linux-module/fd", 1, 2, 0, ++ (SCM fd, SCM options, SCM flags), ++ "Load the Linux kernel module from the file at FD, " ++ "with the arguments from the OPTIONS string, and " ++ "optionally the given FLAGS.") ++#define FUNC_NAME s_scm_load_linux_module_fd ++{ ++ long err; ++ int c_fd, c_flags; ++ char *c_options; ++ ++ c_fd = scm_to_int (fd); ++ c_options = ++ scm_to_locale_string (SCM_UNBNDP (options) ? scm_nullstr : options); ++ c_flags = SCM_UNBNDP (flags) ? 0 : scm_to_int (flags); ++ ++ err = finit_module (c_fd, c_options, c_flags); ++ ++ free (c_options); ++ ++ if (err != 0) ++ SCM_SYSERROR; ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++ ++/* Rebooting, halting, and all that. */ ++ ++#include ++ ++SCM_VARIABLE_INIT (flag_RB_AUTOBOOT, "RB_AUTOBOOT", ++ scm_from_int (RB_AUTOBOOT)); ++SCM_VARIABLE_INIT (flag_RB_HALT_SYSTEM, "RB_HALT_SYSTEM", ++ scm_from_int (RB_HALT_SYSTEM)); ++SCM_VARIABLE_INIT (flag_RB_ENABLE_CAD, "RB_ENABLE_CAD", ++ scm_from_int (RB_ENABLE_CAD)); ++SCM_VARIABLE_INIT (flag_RB_DISABLE_CAD, "RB_DISABLE_CAD", ++ scm_from_int (RB_DISABLE_CAD)); ++SCM_VARIABLE_INIT (flag_RB_POWER_OFF, "RB_POWER_OFF", ++ scm_from_int (RB_POWER_OFF)); ++SCM_VARIABLE_INIT (flag_RB_SW_SUSPEND, "RB_SW_SUSPEND", ++ scm_from_int (RB_SW_SUSPEND)); ++SCM_VARIABLE_INIT (flag_RB_KEXEC, "RB_KEXEC", ++ scm_from_int (RB_KEXEC)); ++ ++SCM_DEFINE (scm_reboot, "reboot", 0, 1, 0, ++ (SCM command), ++ "Reboot the system. @var{command} must be one of the @code{RB_} " ++ "constants; if omitted, @var{RB_AUTOBOOT} is used, thus " ++ "performing a hard reset.") ++#define FUNC_NAME s_scm_reboot ++{ ++ int c_command; ++ ++ if (SCM_UNBNDP (command)) ++ c_command = RB_AUTOBOOT; ++ else ++ c_command = scm_to_int (command); ++ ++ reboot (c_command); ++ ++ return SCM_UNSPECIFIED; /* likely unreached */ ++} ++#undef FUNC_NAME ++ ++/* Linux network interfaces. See . */ ++ ++#include ++#include ++#include "libguile/socket.h" ++ ++SCM_VARIABLE_INIT (flag_IFF_UP, "IFF_UP", ++ scm_from_int (IFF_UP)); ++SCM_VARIABLE_INIT (flag_IFF_BROADCAST, "IFF_BROADCAST", ++ scm_from_int (IFF_BROADCAST)); ++SCM_VARIABLE_INIT (flag_IFF_DEBUG, "IFF_DEBUG", ++ scm_from_int (IFF_DEBUG)); ++SCM_VARIABLE_INIT (flag_IFF_LOOPBACK, "IFF_LOOPBACK", ++ scm_from_int (IFF_LOOPBACK)); ++SCM_VARIABLE_INIT (flag_IFF_POINTOPOINT, "IFF_POINTOPOINT", ++ scm_from_int (IFF_POINTOPOINT)); ++SCM_VARIABLE_INIT (flag_IFF_NOTRAILERS, "IFF_NOTRAILERS", ++ scm_from_int (IFF_NOTRAILERS)); ++SCM_VARIABLE_INIT (flag_IFF_RUNNING, "IFF_RUNNING", ++ scm_from_int (IFF_RUNNING)); ++SCM_VARIABLE_INIT (flag_IFF_NOARP, "IFF_NOARP", ++ scm_from_int (IFF_NOARP)); ++SCM_VARIABLE_INIT (flag_IFF_PROMISC, "IFF_PROMISC", ++ scm_from_int (IFF_PROMISC)); ++SCM_VARIABLE_INIT (flag_IFF_ALLMULTI, "IFF_ALLMULTI", ++ scm_from_int (IFF_ALLMULTI)); ++ ++SCM_DEFINE (scm_set_network_interface_address, "set-network-interface-address", ++ 3, 0, 0, ++ (SCM socket, SCM name, SCM address), ++ "Configure network interface @var{name}.") ++#define FUNC_NAME s_scm_set_network_interface_address ++{ ++ char *c_name; ++ struct ifreq ifr; ++ struct sockaddr *c_address; ++ size_t sa_len; ++ int fd, err; ++ ++ socket = SCM_COERCE_OUTPORT (socket); ++ SCM_VALIDATE_OPFPORT (1, socket); ++ fd = SCM_FPORT_FDES (socket); ++ ++ memset (&ifr, 0, sizeof ifr); ++ c_name = scm_to_locale_string (name); ++ c_address = scm_to_sockaddr (address, &sa_len); ++ ++ strncpy (ifr.ifr_name, c_name, sizeof ifr.ifr_name - 1); ++ memcpy (&ifr.ifr_addr, c_address, sa_len); ++ ++ err = ioctl (fd, SIOCSIFADDR, &ifr); ++ if (err != 0) ++ err = errno; ++ ++ free (c_name); ++ free (c_address); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++SCM_DEFINE (scm_set_network_interface_flags, "set-network-interface-flags", ++ 3, 0, 0, ++ (SCM socket, SCM name, SCM flags), ++ "Change the flags of network interface @var{name} to " ++ "@var{flags}.") ++#define FUNC_NAME s_scm_set_network_interface_flags ++{ ++ struct ifreq ifr; ++ char *c_name; ++ int fd, err; ++ ++ socket = SCM_COERCE_OUTPORT (socket); ++ SCM_VALIDATE_OPFPORT (1, socket); ++ fd = SCM_FPORT_FDES (socket); ++ ++ memset (&ifr, 0, sizeof ifr); ++ c_name = scm_to_locale_string (name); ++ strncpy (ifr.ifr_name, c_name, sizeof ifr.ifr_name - 1); ++ ifr.ifr_flags = scm_to_short (flags); ++ ++ err = ioctl (fd, SIOCSIFFLAGS, &ifr); ++ if (err != 0) ++ err = errno; ++ ++ free (c_name); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++SCM_DEFINE (scm_network_interface_flags, "network-interface-flags", ++ 2, 0, 0, ++ (SCM socket, SCM name), ++ "Return the flags of network interface @var{name}.") ++#define FUNC_NAME s_scm_network_interface_flags ++{ ++ struct ifreq ifr; ++ char *c_name; ++ int fd, err; ++ ++ socket = SCM_COERCE_OUTPORT (socket); ++ SCM_VALIDATE_OPFPORT (1, socket); ++ fd = SCM_FPORT_FDES (socket); ++ ++ memset (&ifr, 0, sizeof ifr); ++ c_name = scm_to_locale_string (name); ++ strncpy (ifr.ifr_name, c_name, sizeof ifr.ifr_name - 1); ++ ++ err = ioctl (fd, SIOCGIFFLAGS, &ifr); ++ if (err != 0) ++ err = errno; ++ ++ free (c_name); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return scm_from_short (ifr.ifr_flags); ++} ++#undef FUNC_NAME ++#endif ++ + void + scm_init_posix () + { diff --git a/gnu/packages/patches/guile-3.0-relocatable.patch b/gnu/packages/patches/guile-3.0-relocatable.patch new file mode 100644 index 0000000000..3d101636dc --- /dev/null +++ b/gnu/packages/patches/guile-3.0-relocatable.patch @@ -0,0 +1,69 @@ +This patch changes Guile to use a default search path relative to the +location of the `guile' binary, allowing it to be relocated. + +diff --git a/libguile/load.c b/libguile/load.c +--- a/libguile/load.c ++++ b/libguile/load.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -334,6 +335,32 @@ scm_init_load_path () + SCM cpath = SCM_EOL; + + #ifdef SCM_LIBRARY_DIR ++ char *program, *bin_dir, *prefix, *module_dir, *ccache_dir; ++ ++ /* Determine the source and compiled module directories at run-time, ++ relative to the executable's location. ++ ++ Note: Use /proc/self/exe instead of argv[0] because the latter is ++ not necessarily an absolute, nor a valid file name. */ ++ ++ program = scm_gc_malloc_pointerless (256, "string"); ++ readlink ("/proc/self/exe", program, 256); ++ ++ bin_dir = dirname (strdupa (program)); ++ ++ prefix = scm_gc_malloc_pointerless (strlen (bin_dir) + 4, "string"); ++ strcpy (prefix, bin_dir); ++ strcat (prefix, "/.."); ++ prefix = canonicalize_file_name (prefix); ++ ++ module_dir = scm_gc_malloc_pointerless (strlen (prefix) + 50, "string"); ++ strcpy (module_dir, prefix); ++ strcat (module_dir, "/share/guile/" SCM_EFFECTIVE_VERSION); ++ ++ ccache_dir = scm_gc_malloc_pointerless (strlen (prefix) + 50, "string"); ++ strcpy (ccache_dir, prefix); ++ strcat (ccache_dir, "/lib/guile/" SCM_EFFECTIVE_VERSION "/ccache"); ++ + env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_PATH")); + if (env && strcmp (env, "") == 0) + /* special-case interpret system-path=="" as meaning no system path instead +@@ -342,10 +369,7 @@ scm_init_load_path () + else if (env) + path = scm_parse_path (scm_from_locale_string (env), path); + else +- path = scm_list_4 (scm_from_utf8_string (SCM_LIBRARY_DIR), +- scm_from_utf8_string (SCM_SITE_DIR), +- scm_from_utf8_string (SCM_GLOBAL_SITE_DIR), +- scm_from_utf8_string (SCM_PKGDATA_DIR)); ++ path = scm_list_1 (scm_from_locale_string (module_dir)); + + env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_COMPILED_PATH")); + if (env && strcmp (env, "") == 0) +@@ -355,8 +379,7 @@ scm_init_load_path () + cpath = scm_parse_path (scm_from_locale_string (env), cpath); + else + { +- cpath = scm_list_2 (scm_from_utf8_string (SCM_CCACHE_DIR), +- scm_from_utf8_string (SCM_SITE_CCACHE_DIR)); ++ cpath = scm_list_1 (scm_from_locale_string (ccache_dir)); + } + + #endif /* SCM_LIBRARY_DIR */ -- cgit v1.2.3 From 57833803b446484b6f413fb883b2156933c38639 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 May 2020 22:05:17 +0200 Subject: gnu: linux-initrd: Use Guile 3.0. * gnu/system/linux-initrd.scm (expression->initrd): Change from %GUILE-STATIC-STRIPPED to %GUILE-3.0-STATIC-STRIPPED. --- gnu/system/linux-initrd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index dcc9b6b937..1aa3113ae5 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -36,7 +36,7 @@ #:use-module ((gnu packages xorg) #:select (console-setup xkeyboard-config)) #:use-module ((gnu packages make-bootstrap) - #:select (%guile-static-stripped)) + #:select (%guile-3.0-static-stripped)) #:use-module (gnu system file-systems) #:use-module (gnu system mapped-devices) #:use-module (gnu system keyboard) @@ -62,7 +62,7 @@ (define* (expression->initrd exp #:key - (guile %guile-static-stripped) + (guile %guile-3.0-static-stripped) (gzip gzip) (name "guile-initrd") (system (%current-system))) -- cgit v1.2.3 From ee2649e1351a77f413971bcfc5dd2e7caec4c99e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 1 May 2020 22:12:22 +0200 Subject: gnu: emacs-emms: Update to 5.4. * gnu/packages/emacs-xyz.scm (emacs-emms): Update to 5.4. --- gnu/packages/emacs-xyz.scm | 53 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6c09610ce7..43d1893a6c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1322,33 +1322,32 @@ incrementally confined in Isearch manner.") (define-public emacs-emms (package (name "emacs-emms") - (version "5.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/emms/emms-" - version ".tar.gz")) - (sha256 - (base32 - "00hnv7jjgb2simgrf7gf2y1cyg2syk7kj1hkbac146hlgxk8ngj1")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "Makefile" - (("/usr/bin/install-info") - ;; No need to use 'install-info' since it would create a - ;; useless 'dir' file. - "true") - (("^INFODIR=.*") - ;; Install Info files to $out/share/info, not $out/info. - "INFODIR := $(PREFIX)/share/info\n") - (("/site-lisp/emms") - ;; Install directly in share/emacs/site-lisp, not in a - ;; sub-directory. - "/site-lisp") - (("^all: (.*)\n" _ rest) - ;; Build 'emms-print-metadata'. - (string-append "all: " rest " emms-print-metadata\n"))) - #t)))) + (version "5.4") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/emms/emms-" version ".tar.gz")) + (sha256 + (base32 "1nd7sb6pva7qb1ki6w0zhd6zvqzd7742kaqi0f3v4as5jh09l6nr")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Makefile" + (("/usr/bin/install-info") + ;; No need to use 'install-info' since it would create a + ;; useless 'dir' file. + "true") + (("^INFODIR=.*") + ;; Install Info files to $out/share/info, not $out/info. + "INFODIR := $(PREFIX)/share/info\n") + (("/site-lisp/emms") + ;; Install directly in share/emacs/site-lisp, not in a + ;; sub-directory. + "/site-lisp") + (("^all: (.*)\n" _ rest) + ;; Build 'emms-print-metadata'. + (string-append "all: " rest " emms-print-metadata\n"))) + #t)))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 26e11cffb983604c813064343e41708b99072e4f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 1 May 2020 22:19:43 +0200 Subject: gnu: xfe: Use a mirror:// URL. * gnu/packages/disk.scm (xfe)[source]: Use a mirror://sourceforge URL. --- gnu/packages/disk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index f557c57749..484126a3ea 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -935,8 +935,8 @@ since they are better handled by external tools.") (origin (method url-fetch) (uri - (string-append "https://sourceforge.net/projects/xfe/files/xfe/" - version "/xfe-" version ".tar.gz")) + (string-append "mirror://sourceforge/xfe/xfe/" version "/" + "xfe-" version ".tar.gz")) (sha256 (base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs")))) (build-system gnu-build-system) @@ -982,4 +982,4 @@ since they are better handled by external tools.") the popular but discontinued, X Win Commander. It aims to be the file manager of choice for all light thinking Unix addicts!") (home-page "http://roland65.free.fr/xfe/") - (license license:gpl2+))) \ No newline at end of file + (license license:gpl2+))) -- cgit v1.2.3 From a2522c5da3a71a634a55e5d77df3cf585784676f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 May 2020 22:34:22 +0200 Subject: doc: Update initrd section to refer to the right Guile variable. This is a follow-up to commit 57833803b446484b6f413fb883b2156933c38639. * doc/guix.texi (Initial RAM Disk): Refer to "%guile-3.0-static-stripped" instead of "%guile-static-stripped". --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 26b4652f67..a51c65f12f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26378,7 +26378,7 @@ program. That gives a lot of flexibility. The program to run in that initrd. @deffn {Scheme Procedure} expression->initrd @var{exp} @ - [#:guile %guile-static-stripped] [#:name "guile-initrd"] + [#:guile %guile-3.0-static-stripped] [#:name "guile-initrd"] Return as a file-like object a Linux initrd (a gzipped cpio archive) containing @var{guile} and that evaluates @var{exp}, a G-expression, upon booting. All the derivations referenced by @var{exp} are -- cgit v1.2.3 From 934f0b32cfacd0bc05e79e54ffbc3bc253a0eb2d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 May 2020 20:36:09 +0200 Subject: gnu: icu4c: Update source URI. The previous URL started serving a HTML page, which ultimately refers to . Reported by butterypancake on #guix. * gnu/packages/icu4c.scm (icu4c)[source](uri): Change to GitHub. --- gnu/packages/icu4c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index beeb2d7ff4..2014813466 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -61,8 +61,8 @@ (source (origin (method url-fetch) (uri (string-append - "http://download.icu-project.org/files/icu4c/" - version + "https://github.com/unicode-org/icu/releases/download/release-" + (string-map (lambda (x) (if (char=? x #\.) #\- x)) version) "/icu4c-" (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) -- cgit v1.2.3 From ecd56cd1b223733c3ec04043fec245acf4c1cdb8 Mon Sep 17 00:00:00 2001 From: Jonathan Frederickson Date: Thu, 30 Apr 2020 20:58:01 -0400 Subject: gnu: Add ladspa-bs2b * gnu/packages/audio.scm (ladspa-bs2b): New variable. Signed-off-by: Leo Famulari --- gnu/packages/audio.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e2e276723b..f518fb7f21 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020 Jonathan Frederickson ;;; ;;; This file is part of GNU Guix. ;;; @@ -1855,6 +1856,31 @@ for headphone prolonged listening to disable superstereo fatigue without essential distortions.") (license license:expat))) +(define-public ladspa-bs2b + (package + (name "ladspa-bs2b") + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/bs2b/plugins/LADSPA%20plugin/" + version "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "1b4aipbj1ba5k99gbc7gmgy14sywyrjd8rpyqj5l905j0mjv8jg2")))) + (build-system gnu-build-system) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("ladspa" ,ladspa) + ("libbs2b" ,libbs2b))) + (home-page "https://sourceforge.net/projects/bs2b/") + (synopsis "Bauer stereophonic-to-binaural DSP - LADSPA plugin") + (description "The Bauer stereophonic-to-binaural DSP (bs2b) library and +plugins is designed to improve headphone listening of stereo audio records. +Recommended for headphone prolonged listening to disable superstereo fatigue +without essential distortions. This package contains a LADSPA plugin for use +with applications that support them (e.g. PulseAudio).") + (license license:gpl2+))) + (define-public liblo (package (name "liblo") -- cgit v1.2.3 From 9dbcc8d0d52c6ed69cdeed7d7307d0d134febac1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 2 May 2020 02:19:16 +0200 Subject: gnu: emacs-parsebib: Update to 2.3.3. * gnu/packages/emacs-xyz.scm (emacs-parsebib): Update to 2.3.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 43d1893a6c..657abd036a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13255,7 +13255,7 @@ files to be expanded upon opening them.") (define-public emacs-parsebib (package (name "emacs-parsebib") - (version "2.3.1") + (version "2.3.3") (source (origin (method git-fetch) @@ -13264,7 +13264,7 @@ files to be expanded upon opening them.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh")))) + (base32 "0mpgyy9qfb5x4fvlmb274hgayjbwf0bgk65dxyx31zikjwpcd56p")))) (build-system emacs-build-system) (home-page "https://github.com/joostkremers/parsebib") (synopsis "Library for parsing bib files") -- cgit v1.2.3 From 2e775ecc230bb73d1cde08ae0a6d60b6f54e6710 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 2 May 2020 02:19:59 +0200 Subject: gnu: emacs-ebib: Update to 2.22.1. * gnu/packages/emacs-xyz.scm (emacs-ebib): Update to 2.22.1. --- gnu/packages/emacs-xyz.scm | 50 ++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 657abd036a..313fe01770 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13273,36 +13273,34 @@ files to be expanded upon opening them.") (license license:gpl3+))) (define-public emacs-ebib - (let ((commit "99bd909f47f71e024ce324981109b73a50e82fba")) - (package - (name "emacs-ebib") - (version "2.21") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/joostkremers/ebib.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "131vgl4d1j9s4055x88409w19q52x2m0x08b961hylp7yb5ljzgh")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-parsebib" ,emacs-parsebib))) - (home-page "https://joostkremers.github.io/ebib/") - (synopsis "BibTeX database manager for Emacs") - (description - "Ebib is a BibTeX database manager that runs in GNU Emacs. + (package + (name "emacs-ebib") + (version "2.22.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/joostkremers/ebib.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-parsebib" ,emacs-parsebib))) + (home-page "https://joostkremers.github.io/ebib/") + (synopsis "BibTeX database manager for Emacs") + (description + "Ebib is a BibTeX database manager that runs in GNU Emacs. With Ebib you can create, sort and manage your .bib database files, all within Emacs. It supports searching, multi-line field values and @@String and @@Preamble definitions. Ebib integrates with (La)TeX mode, Org mode and other Emacs editing modes.") - ;; The Ebib source files are released under a BSD license with - ;; the exception of org-ebib.el, which is released under the GNU - ;; GPL. - (license (list license:bsd-3 - license:gpl3+))))) + ;; The Ebib source files are released under a BSD license with + ;; the exception of org-ebib.el, which is released under the GNU + ;; GPL. + (license (list license:bsd-3 + license:gpl3+)))) (define-public emacs-biblio (package -- cgit v1.2.3 From b8642c5500ec311347dff865dc82e6daae40812a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 2 May 2020 02:26:21 +0200 Subject: gnu: emacs-ebib: Add Texinfo markup in description. * gnu/packages/emacs-xyz.scm (emacs-ebib)[description]: Add Texinfo markup. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 313fe01770..c740c458ac 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13292,10 +13292,10 @@ files to be expanded upon opening them.") (synopsis "BibTeX database manager for Emacs") (description "Ebib is a BibTeX database manager that runs in GNU Emacs. -With Ebib you can create, sort and manage your .bib database files, -all within Emacs. It supports searching, multi-line field values and -@@String and @@Preamble definitions. Ebib integrates with (La)TeX -mode, Org mode and other Emacs editing modes.") +With Ebib you can create, sort and manage your @file{.bib} database files, all +within Emacs. It supports searching, multi-line field values and +@samp{@@String} and @samp{@@Preamble} definitions. Ebib integrates +with (La)TeX mode, Org mode and other Emacs editing modes.") ;; The Ebib source files are released under a BSD license with ;; the exception of org-ebib.el, which is released under the GNU ;; GPL. -- cgit v1.2.3 From 7e2e37edc26d7b369a041d4e8b3e187638078e36 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 2 May 2020 02:27:44 +0200 Subject: gnu: emacs-parsebib: Add Texinfo markup. * gnu/packages/emacs-xyz.scm (emacs-parsebib) [synopsis]: [description]: Add Texinfo markup. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c740c458ac..24cd01a513 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13267,9 +13267,9 @@ files to be expanded upon opening them.") (base32 "0mpgyy9qfb5x4fvlmb274hgayjbwf0bgk65dxyx31zikjwpcd56p")))) (build-system emacs-build-system) (home-page "https://github.com/joostkremers/parsebib") - (synopsis "Library for parsing bib files") + (synopsis "Library for parsing @file{.bib} files") (description - "This package provides an Emacs library for parsing bib files.") + "This package provides an Emacs library for parsing @file{.bib} files.") (license license:gpl3+))) (define-public emacs-ebib -- cgit v1.2.3 From f2531a254f7133b343034aa2c66fe14e518c45b8 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Fri, 1 May 2020 18:40:02 -0400 Subject: gnu: git-annex: Update to 8.20200501. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20200501. Signed-off-by: 宋文武 --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index d12d113945..4785ebaca3 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -341,14 +341,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20200330") + (version "8.20200501") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "0xy0ld7kr4cfdl4g4yzvrzl5r60dcj33cxm28a4qz6nqm2yhd4sv")))) + (base32 "19rggaymvqy7r61n2rl2nigwdi2hzq5l1afcd5l0k1vbacwgq4jl")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 5a0b78e62bc3122998990cea5ee17bdb2789aada Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 10 Apr 2020 17:00:47 +0100 Subject: services: dnsmasq: Support the --address flag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduce a new `addresses' field that translates to passing `--address=' multiple times to dnsmasq. * gnu/services/dns.scm (): Add an addresses field. (dnsmasq-shepherd-service): Match the addresses field and translate it to multiple '--address=' flags. * doc/guix.texi (DNS Services): Document it. Signed-off-by: 宋文武 --- doc/guix.texi | 20 ++++++++++++++++++++ gnu/services/dns.scm | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index c571010bc8..d5d8662937 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -78,6 +78,7 @@ Copyright @copyright{} 2020 Jack Hill@* Copyright @copyright{} 2020 Naga Malleswari@* Copyright @copyright{} 2020 Brice Waegeneire@* Copyright @copyright{} 2020 R Veera Kumar@* +Copyright @copyright{} 2020 Pierre Langlois@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -21874,6 +21875,25 @@ When true, don't read @var{resolv-file}. @item @code{servers} (default: @code{'()}) Specify IP address of upstream servers directly. +@item @code{addresses} (default: @code{'()}) +For each entry, specify an IP address to return for any host in the +given domains. Queries in the domains are never forwarded and always +replied to with the specified IP address. + +This is useful for redirecting hosts locally, for example: + +@lisp +(service dnsmasq-service-type + (dnsmasq-configuration + (addresses + '(; Redirect to a local web-server. + "/example.org/127.0.0.1" + ; Redirect subdomain to a specific IP. + "/subdomain.example.org/192.168.1.42")))) +@end lisp + +Note that rules in @file{/etc/hosts} take precedence over this. + @item @code{cache-size} (default: @code{150}) Set the size of dnsmasq's cache. Setting the cache size to zero disables caching. diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index a07946d085..478c837d13 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2020 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -748,6 +749,8 @@ cache.size = 100 * MB (default #f)) ;boolean (servers dnsmasq-configuration-servers (default '())) ;list of string + (addresses dnsmasq-configuration-addresses + (default '())) ;list of string (cache-size dnsmasq-configuration-cache-size (default 150)) ;integer (negative-cache? dnsmasq-configuration-negative-cache? @@ -759,7 +762,7 @@ cache.size = 100 * MB no-hosts? port local-service? listen-addresses resolv-file no-resolv? servers - cache-size negative-cache?) + addresses cache-size negative-cache?) (shepherd-service (provision '(dnsmasq)) (requirement '(networking)) @@ -783,6 +786,8 @@ cache.size = 100 * MB '()) #$@(map (cut format #f "--server=~a" <>) servers) + #$@(map (cut format #f "--address=~a" <>) + addresses) #$(format #f "--cache-size=~a" cache-size) #$@(if negative-cache? '() -- cgit v1.2.3 From 23b37c3d40d497cc6f07437ab26ab10e60fb6e09 Mon Sep 17 00:00:00 2001 From: raingloom Date: Fri, 3 Apr 2020 02:32:23 +0200 Subject: file-systems: Add support for F2FS. * gnu/build/file-systems.scm (%f2fs-endianness): New syntax. (f2fs-superblock?, read-f2fs-superblock, f2fs-superblock-uuid) (f2fs-superblock-volume-name, check-f2fs-file-system): New procedures. (%partition-label-readers, %partition-uuid-readers, check-file-system): Register them. Signed-off-by: Danny Milosavljevic --- gnu/build/file-systems.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 902563b219..bbea4c766e 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -336,6 +336,58 @@ if DEVICE does not contain a JFS file system." (2 'reboot-required) (_ 'fatal-error))) + +;;; +;;; F2FS (Flash-Friendly File System) +;;; + +;;; https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/tree/include/linux/f2fs_fs.h +;;; (but using xxd proved to be simpler) + +(define-syntax %f2fs-endianness + ;; Endianness of F2FS file systems + (identifier-syntax (endianness little))) + +;; F2FS actually stores two adjacent copies of the superblock. +;; should we read both? +(define (f2fs-superblock? sblock) + "Return #t when SBLOCK is an F2FS superblock." + (let ((magic (bytevector-u32-ref sblock 0 %f2fs-endianness))) + (= magic #xF2F52010))) + +(define (read-f2fs-superblock device) + "Return the raw contents of DEVICE's F2FS superblock as a bytevector, or #f +if DEVICE does not contain an F2FS file system." + (read-superblock device + ;; offset of magic in first copy + #x400 + ;; difference between magic of second + ;; and first copies + (- #x1400 #x400) + f2fs-superblock?)) + +(define (f2fs-superblock-uuid sblock) + "Return the UUID of F2FS superblock SBLOCK as a 16-byte bytevector." + (sub-bytevector sblock + (- (+ #x460 12) + ;; subtract superblock offset + #x400) + 16)) + +(define (f2fs-superblock-volume-name sblock) + "Return the volume name of SBLOCK as a string of at most 512 characters, or +#f if SBLOCK has no volume name." + (utf16->string (sub-bytevector sblock (- (+ #x470 12) #x400) 512) %f2fs-endianness)) + +(define (check-f2fs-file-system device) + "Return the health of a F2FS file system on DEVICE." + (match (status:exit-val + (system* "fsck.f2fs" "-p" device)) + ;; 0 and -1 are the only two possibilities + ;; (according to the manpage) + (0 'pass) + (_ 'fatal-error))) + ;;; ;;; LUKS encrypted devices. @@ -472,7 +524,9 @@ partition field reader that returned a value." (partition-field-reader read-fat16-superblock fat16-superblock-volume-name) (partition-field-reader read-jfs-superblock - jfs-superblock-volume-name))) + jfs-superblock-volume-name) + (partition-field-reader read-f2fs-superblock + f2fs-superblock-volume-name))) (define %partition-uuid-readers (list (partition-field-reader read-iso9660-superblock @@ -486,7 +540,9 @@ partition field reader that returned a value." (partition-field-reader read-fat16-superblock fat16-superblock-uuid) (partition-field-reader read-jfs-superblock - jfs-superblock-uuid))) + jfs-superblock-uuid) + (partition-field-reader read-f2fs-superblock + f2fs-superblock-uuid))) (define read-partition-label (cut read-partition-field <> %partition-label-readers)) @@ -582,6 +638,7 @@ were found." ((string-prefix? "btrfs" type) check-btrfs-file-system) ((string-suffix? "fat" type) check-fat-file-system) ((string-prefix? "jfs" type) check-jfs-file-system) + ((string-prefix? "f2fs" type) check-f2fs-file-system) ((string-prefix? "nfs" type) (const 'pass)) (else #f))) -- cgit v1.2.3 From 27efeef3068bfa21011ea509e21efcbe8c353b5f Mon Sep 17 00:00:00 2001 From: raingloom Date: Fri, 3 Apr 2020 07:00:41 +0200 Subject: linux-initrd: Add initial support for F2FS. * gnu/system/linux-initrd.scm (file-system-type-modules): Add f2fs module. Signed-off-by: Danny Milosavljevic --- gnu/system/linux-initrd.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index dcc9b6b937..44ee4f10aa 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -275,6 +275,7 @@ FILE-SYSTEMS." ("btrfs" => '("btrfs")) ("iso9660" => '("isofs")) ("jfs" => '("jfs")) + ("f2fs" => '("f2fs" "crc32_generic")) (else '()))) (define (file-system-modules file-systems) -- cgit v1.2.3 From cc8f31bafb37ac750690c9415f82f650e3832060 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 2 May 2020 11:02:36 +0200 Subject: gnu: emacs-exwm-edit: Update to 20200126. * gnu/packages/emacs-xyz.scm (emacs-exwm-edit): Update to 20200126. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 24cd01a513..d9a3c2acc3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19520,9 +19520,9 @@ be used in @code{dired-mode}.") (license license:gpl3+)))) (define-public emacs-exwm-edit - (let ((commit "961c0f3ea45766b888c73d7353da13d329538034") + (let ((commit "bc25ba094b383be3c650ca0b7e1534efe2bb154f") (version "0.0.1") - (revision "1")) + (revision "2")) (package (name "emacs-exwm-edit") (version (git-version version revision commit)) @@ -19535,7 +19535,7 @@ be used in @code{dired-mode}.") (file-name (git-file-name name version)) (sha256 (base32 - "087pk5ckx753qrn6xpka9khhlp7iqlz76w7861x90av2f5cgy6fw")))) + "1z1ya9xgknka3dy3b3x8zzfkxdx5jqsi8q5aqkvxjxa6n7mmqdwv")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-exwm" ,emacs-exwm))) -- cgit v1.2.3 From 807986a55fc2849d6986efb79f9a015cf4132e09 Mon Sep 17 00:00:00 2001 From: raingloom Date: Sat, 2 May 2020 11:38:48 +0200 Subject: gnu: Add f2fs-tools-static. * gnu/packages/file-systems.scm (f2fs-tools/static): New public variable. Co-authored-by: Danny Milosavljevic --- gnu/packages/linux.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 70d2163fee..dd945aad51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4602,6 +4602,37 @@ disks and SD cards. This package provides the userland utilities.") (inputs `(("libuuid" ,util-linux))))) +(define-public f2fs-tools/static + (static-package + (package + (inherit f2fs-tools) + (name "f2fs-tools-static") + (arguments + `(#:configure-flags + (let ((libuuid-static (assoc-ref %build-inputs "libuuid:static")) + (libuuid (assoc-ref %build-inputs "libuuid"))) + (list + (string-append "libuuid_CFLAGS=-I" libuuid "/include") + (string-append "libuuid_LIBS=-L" libuuid-static "/lib -luuid") + (string-append "libblkid_CFLAGS=-I" libuuid "/include") + (string-append "libblkid_LIBS=-L" libuuid-static "/lib -lblkid"))) + #:disallowed-references (,util-linux) + #:phases + (modify-phases %standard-phases ; TODO: f2fs phases. + (add-after 'unpack 'make-static + (lambda _ + (define (append-to-file name body) + (let ((file (open-file name "a"))) + (display body file) + (close-port file))) + (append-to-file "mkfs/Makefile.am" "\nmkfs_f2fs_LDFLAGS = -all-static\n") + (append-to-file "fsck/Makefile.am" "\nfsck_f2fs_LDFLAGS = -all-static\n") + (append-to-file "tools/Makefile.am" "\nf2fscrypt_LDFLAGS = -all-static -luuid\n") + #t))))) + (inputs + `(("libuuid:static" ,util-linux "static") + ("libuuid" ,util-linux)))))) ; for include files + (define-public freefall (package (name "freefall") -- cgit v1.2.3 From a363978cb9755e950add3fa36e319ec2389a529a Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:39 +0200 Subject: gnu: Add libnatpmp. * gnu/packages/networking.scm (libnatpmp): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/networking.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 94b521584f..98bfdbc3ab 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2019 Brice Waegeneire ;;; Copyright © 2019 Tonton ;;; Copyright © 2019, 2020 Alex Griffin -;;; Copyright © 2019 Jan Wielkiewicz +;;; Copyright © 2019, 2020 Jan Wielkiewicz ;;; Copyright © 2019 Daniel Schaefer ;;; Copyright © 2019 Diego N. Barbato ;;; Copyright © 2020 Vincent Legoll @@ -426,6 +426,41 @@ between different versions of ØMQ.") files contain direct mappings of the abstractions provided by the ØMQ C API.") (license license:expat))) +(define-public libnatpmp + (package + (name "libnatpmp") + (version "20150609") + (source (origin + (method url-fetch) + (uri (string-append + "http://miniupnp.free.fr/files/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check)) ; no tests + #:make-flags + (let* ((target ,(%current-target-system)) + (gcc (if target + (string-append target "-gcc") + "gcc"))) + (list + (string-append "CC=" gcc) + (string-append "INSTALLPREFIX=" (assoc-ref %outputs "out")) + (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))))) + (home-page "http://miniupnp.free.fr/libnatpmp.html") + (synopsis "C library implementing NAT-PMP") + (description + "@code{libnatpmp} is a portable and asynchronous implementation of +the Network Address Translation - Port Mapping Protocol (NAT-PMP) +written in the C programming language.") + (license license:bsd-3))) + (define-public librdkafka (package (name "librdkafka") -- cgit v1.2.3 From 1d2366202ad115cc7c48ac15c83ef994a2d8304c Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:41 +0200 Subject: gnu: libupnp: Update to 1.8.6. * gnu/packages/upnp.scm (libupnp): Update to 1.8.6. [source]: Use git-fetch on the new official repository. [native-inputs]: Add autoconf, automake, libtool and pkg-config. Signed-off-by: Mathieu Othacehe --- gnu/packages/upnp.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 8f3c887a68..768df4a03e 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Theodoros Foradis ;;; Copyright © 2019 Jens Mølgaard +;;; Copyright © 2020 Jan Wielkiewicz ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ #:use-module (gnu packages photo) #:use-module (gnu packages image) #:use-module (gnu packages mp3) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages xiph) #:use-module (gnu packages sqlite) #:use-module (gnu packages python) @@ -92,15 +94,21 @@ over IRC, instant messaging, network games, and most server software.") (define-public libupnp (package (name "libupnp") - (version "1.6.25") + (version "1.8.6") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/pupnp/pupnp/libUPnP%20" - version "/" name "-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pupnp/pupnp.git") + (commit (string-append "release-" version)))) (sha256 (base32 - "0hzsd7rvfa87b4hxg9yj4xhdfxx9sp09r9sqdl3mqhvmcyw018y5")))) + "1jlb6qh47513h2simy0zxia5q61w1c31mnwmjqpr2nf832lmnpk4")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (build-system gnu-build-system) (arguments ;; The tests require a network device capable of multicasting which is -- cgit v1.2.3 From 798335cfbce63362092e1dc53f940021b1a1fc4a Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:44 +0200 Subject: gnu: restinio: Update to 0.6.1.1. * gnu/packages/networking.scm (restinio): Update to 0.6.1.1. Signed-off-by: Mathieu Othacehe --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 98bfdbc3ab..9275c6f98b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2668,7 +2668,7 @@ communication over HTTP.") (define-public restinio (package (name "restinio") - (version "0.6.0.1") + (version "0.6.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -2677,7 +2677,7 @@ communication over HTTP.") (file-name (git-file-name name version)) (sha256 (base32 - "1c25kpx652nng8m1sqf5an2c3c4g3k6zj85mkkaxzk88iwfzq1s8")))) + "141a96hx8zhcdv121g6cs91n46kb47y040v25pnvz5f54964z7f5")))) (build-system cmake-build-system) (inputs ; TODO: Need to force-keep references on some inputs, e.g. boost. `(("zlib" ,zlib) -- cgit v1.2.3 From 218ec70aee2476b3381d18f7394ed1c37c0f7a8c Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:50 +0200 Subject: gnu: opendht: Update to 2.0.0. * gnu/packages/networking.scm (opendht): Update to 2.0.0. Signed-off-by: Mathieu Othacehe --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9275c6f98b..d7720724cc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2710,7 +2710,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.0.0beta2") + (version "2.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -2719,7 +2719,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "02ix0rvvyhq22gd5djcq84qz08ji7ln93faf23b27zjzni2klzv5")))) + "1q1fwk8wwk9r6bp0indpr60ql668lsk16ykslacyhrh7kg97kvhr")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs -- cgit v1.2.3 From 15c6e4260b60135025029a5e2695206e798c9dd6 Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:36 +0200 Subject: gnu: telephony: Move Jami and its dependencies to jami.scm. Jami is a massive package and its developers modify many libraries. Keeping them in a single file makes maintenance easier. * gnu/packages/telephony.scm (%jami-version, jami-source, pjproject-jami, libring, libringclient, jami, jami-client-gnome): Move to ... * gnu/packages/jami.scm: ... this new file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Mathieu Othacehe --- gnu/local.mk | 2 + gnu/packages/jami.scm | 352 +++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/telephony.scm | 291 ------------------------------------- 3 files changed, 354 insertions(+), 291 deletions(-) create mode 100644 gnu/packages/jami.scm diff --git a/gnu/local.mk b/gnu/local.mk index 26d26ee215..812253b192 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -33,6 +33,7 @@ # Copyright © 2020 Michael Rohleder # Copyright © 2020 Felix Gruber # Copyright © 2020 Ryan Prior +# Copyright © 2020 Jan Wielkiewicz # # This file is part of GNU Guix. # @@ -278,6 +279,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/ipfs.scm \ %D%/packages/irc.scm \ %D%/packages/iso-codes.scm \ + %D%/packages/jami.scm \ %D%/packages/java.scm \ %D%/packages/java-compression.scm \ %D%/packages/java-graphics.scm \ diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm new file mode 100644 index 0000000000..050f8cf9f6 --- /dev/null +++ b/gnu/packages/jami.scm @@ -0,0 +1,352 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2019, 2020 Jan Wielkiewicz +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages jami) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages aidc) + #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages boost) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) + #:use-module (gnu packages documentation) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages libcanberra) + #:use-module (gnu packages linux) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages networking) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages python) + #:use-module (gnu packages qt) + #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages telephony) + #:use-module (gnu packages tls) + #:use-module (gnu packages upnp) + #:use-module (gnu packages video) + #:use-module (gnu packages webkit) + #:use-module (gnu packages xiph) + #:use-module (gnu packages xorg) + #:use-module (gnu packages) + #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define %jami-version "20191101.3.67671e7") + +(define* (jami-source #:key without-daemon) + (origin + (method url-fetch) + (uri (string-append "https://dl.jami.net/ring-release/tarballs/ring_" + %jami-version + ".tar.gz")) + (modules '((guix build utils))) + (snippet + (if without-daemon + '(begin + (delete-file-recursively "daemon/contrib")) + #f)) + (sha256 + (base32 + "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) + +(define-public pjproject-jami + (package + (inherit pjproject) + (name "pjproject-jami") + (native-inputs + `(("savoir-faire-linux-patches" ,(jami-source)) + ,@(package-native-inputs pjproject))) + (arguments + `(#:tests? #f + ;; See ring-project/daemon/contrib/src/pjproject/rules.mak. + #:configure-flags + (list "--disable-oss" + "--disable-sound" + "--disable-video" + "--enable-ext-sound" + "--disable-speex-aec" + "--disable-g711-codec" + "--disable-l16-codec" + "--disable-gsm-codec" + "--disable-g722-codec" + "--disable-g7221-codec" + "--disable-speex-codec" + "--disable-ilbc-codec" + "--disable-opencore-amr" + "--disable-silk" + "--disable-sdl" + "--disable-ffmpeg" + "--disable-v4l2" + "--disable-openh264" + "--disable-resample" + "--disable-libwebrtc" + "--with-gnutls" + "--with-external-srtp" + ;; We need -fPIC or else we get the following error when linking + ;; against pjproject-jami: + ;; relocation R_X86_64_32S against `.rodata' can not be used when + ;; making a shared object; + "CFLAGS=-fPIC" + "CXXFLAGS=-fPIC") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (add-after 'unpack 'apply-patches + (lambda* (#:key inputs #:allow-other-keys) + (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches") + ;; Comes from + ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". + ;; WARNING: These amount for huge changes in pjproject. + (savoir-faire-linux-patches + '("fix_turn_alloc_failure" + "rfc2466" + "ipv6" + "multiple_listeners" + "pj_ice_sess" + "fix_turn_fallback" + "fix_ioqueue_ipv6_sendto" + "add_dtls_transport" + "rfc6544" + "ice_config" + "sip_config" + "fix_first_packet_turn_tcp" + "fix_ebusy_turn" + "ignore_ipv6_on_transport_check" + "fix_turn_connection_failure" + ;; "uwp_vs" ; for windows + "disable_local_resolution"))) + (mkdir-p savoir-faire-linux-patches-directory) + (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches") + "-C" savoir-faire-linux-patches-directory + "--strip-components=5" + "ring-project/daemon/contrib/src/pjproject") + (for-each + (lambda (file) + (invoke "patch" "--force" "-p1" "-i" + (string-append savoir-faire-linux-patches-directory "/" + file ".patch"))) + savoir-faire-linux-patches)) + #t)) + ;; TODO: We could use substitute-keyword-arguments instead of + ;; repeating the phases from pjproject, but somehow it does + ;; not work. + (add-before 'build 'build-dep + (lambda _ (invoke "make" "dep"))) + (add-before 'patch-source-shebangs 'autoconf + (lambda _ + (invoke "autoconf" "-v" "-f" "-i" "-o" + "aconfigure" "aconfigure.ac"))) + (add-before 'autoconf 'disable-some-tests + ;; Three of the six test programs fail due to missing network + ;; access. + (lambda _ + (substitute* "Makefile" + (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test") + "selftest: pjlib-test pjlib-util-test pjmedia-test")) + #t))))))) + +(define-public libring + (package + (name "libring") + (version %jami-version) + (source (jami-source #:without-daemon #t)) + (build-system gnu-build-system) + (inputs + ;; Missing (optional?) dep: libnatpmp. + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("dbus-c++" ,dbus-c++) + ("eudev" ,eudev) + ("ffmpeg" ,ffmpeg) + ("flac" ,flac) + ("gmp" ,gmp) + ("gsm" ,gsm) + ("jack" ,jack-1) + ("jsoncpp" ,jsoncpp) + ("libogg" ,libogg) + ("libva" ,libva) + ("opendht" ,opendht) + ("opus" ,opus) + ("pcre" ,pcre) + ("pulseaudio" ,pulseaudio) + ("libsamplerate" ,libsamplerate) + ("libsndfile" ,libsndfile) + ("speex" ,speex) + ("speexdsp" ,speexdsp) + ("libupnp" ,libupnp) + ("libvorbis" ,libvorbis) + ("libx264" ,libx264) + ("libvdpau" ,libvdpau) + ("yaml-cpp" ,yaml-cpp) + ("zlib" ,zlib) + ("openssl" ,openssl) + ("libsecp256k1" ,libsecp256k1) + ("python" ,python) + ("python-wrapper" ,python-wrapper) + ("restinio" ,restinio) + ("libx11" ,libx11) + ("asio" ,asio) + ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) version. + ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24. + ("pjproject" ,pjproject-jami))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("which" ,which) + ("cppunit" ,cppunit) + ("perl" ,perl))) ; Needed for documentation. + (arguments + `(#:tests? #f ; The tests fail to compile due to missing headers. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "daemon") + #t)) + (add-before 'build 'add-lib-dir + (lambda _ + (mkdir-p "src/lib") + #t))))) + (synopsis "Distributed multimedia communications platform") + (description "Jami (formerly GNU Ring) is a secure and distributed voice, +video and chat communication platform that requires no centralized server and +leaves the power of privacy in the hands of the user. It supports the SIP and +IAX protocols, as well as decentralized calling using P2P-DHT. + +This package provides a library and daemon implementing the Jami core +functionality.") + (home-page "https://jami.net/") + (license license:gpl3+))) + +(define-public libringclient + (package + (inherit libring) + (name "libringclient") + (build-system cmake-build-system) + (propagated-inputs + `(("libring" ,libring) ; For 'dring'. + ("qtbase" ,qtbase) ; Qt is included in several installed headers. + ("qttools" ,qttools))) + (arguments + `(#:tests? #f ; There is no testsuite. + #:configure-flags + (list (string-append "-DRING_BUILD_DIR=" + (assoc-ref %build-inputs "libring") "/include")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "lrc") + #t)) + (add-before 'configure 'fix-dbus-interfaces-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _ dbus-interfaces-path-suffix) + (string-append (assoc-ref inputs "libring") + dbus-interfaces-path-suffix)))))))) + (synopsis "Distributed multimedia communications platform") + (description "Jami (formerly GNU Ring) is a secure and distributed voice, +video and chat communication platform that requires no centralized server and +leaves the power of privacy in the hands of the user. It supports the SIP and +IAX protocols, as well as decentralized calling using P2P-DHT. + +This package provides a library common to all Jami clients.") + (home-page "https://jami.net") + (license license:gpl3+))) + +(define-public jami + (package + (inherit libring) + (name "jami") + (build-system cmake-build-system) + (inputs + `(("libringclient" ,libringclient) + ("gtk+" ,gtk+) + ("qrencode" ,qrencode) + ("libnotify" ,libnotify) + ("clutter" ,clutter) + ("clutter-gtk" ,clutter-gtk) + ("gettext" ,gnu-gettext) + ("libcanberra" ,libcanberra) + ("webkitgtk" ,webkitgtk) + ;; TODO: We must wrap ring-client-gnome to force using the + ;; `sqlite-with-column-metadata' package instead of `sqlite' or else it + ;; fails with: + ;; + ;; /gnu/store/...-qtbase-5.11.2/lib/qt5/plugins/sqldrivers/libqsqlite.so: + ;; undefined symbol: sqlite3_column_table_name16 + ;; + ;; qtbase is built against sqlite-with-column-metadata but somehow + ;; jami-client-gnome ends up with both `sqlite' and + ;; `sqlite-with-column-metadata' as inputs and it seems that + ;; libqsqlite.so gets confused. + ("sqlite" ,sqlite-with-column-metadata))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("glib:bin" ,glib "bin") + ("doxygen" ,doxygen))) + (propagated-inputs + `(("libring" ,libring) ; Contains `dring', the daemon, which is automatically by d-bus. + ("adwaita-icon-theme" ,adwaita-icon-theme) + ("evolution-data-server" ,evolution-data-server))) + (arguments + `(#:tests? #f ; There is no testsuite. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "client-gnome") + #t)) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (path (string-append (assoc-ref inputs "sqlite") "/lib"))) + (wrap-program (string-append out "/bin/jami-gnome") + `("LD_LIBRARY_PATH" ":" prefix (,path)))) + #t))))) + (synopsis "Distributed, privacy-respecting communication program") + (description "Jami (formerly GNU Ring) is a secure and distributed voice, +video and chat communication platform that requires no centralized server and +leaves the power of privacy in the hands of the user. It supports the SIP and +IAX protocols, as well as decentralized calling using P2P-DHT. + +This package provides the Jami client for the GNOME desktop.") + (home-page "https://jami.net") + (license license:gpl3+))) + +(define-public jami-client-gnome + (deprecated-package "jami-client-gnome" jami)) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 7b20954120..747b0d75a1 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -734,297 +734,6 @@ calls and messages") Initiation Protocol (SIP) and a multimedia framework.") (license license:gpl2+))) -(define %jami-version "20191101.3.67671e7") - -(define* (jami-source #:key without-daemon) - (origin - (method url-fetch) - (uri (string-append "https://dl.jami.net/ring-release/tarballs/ring_" - %jami-version - ".tar.gz")) - (modules '((guix build utils))) - (snippet - (if without-daemon - '(begin - (delete-file-recursively "daemon/contrib")) - #f)) - (sha256 - (base32 - "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) - -(define-public pjproject-jami - (package - (inherit pjproject) - (name "pjproject-jami") - (native-inputs - `(("savoir-faire-linux-patches" ,(jami-source)) - ,@(package-native-inputs pjproject))) - (arguments - `(#:tests? #f - ;; See ring-project/daemon/contrib/src/pjproject/rules.mak. - #:configure-flags - (list "--disable-oss" - "--disable-sound" - "--disable-video" - "--enable-ext-sound" - "--disable-speex-aec" - "--disable-g711-codec" - "--disable-l16-codec" - "--disable-gsm-codec" - "--disable-g722-codec" - "--disable-g7221-codec" - "--disable-speex-codec" - "--disable-ilbc-codec" - "--disable-opencore-amr" - "--disable-silk" - "--disable-sdl" - "--disable-ffmpeg" - "--disable-v4l2" - "--disable-openh264" - "--disable-resample" - "--disable-libwebrtc" - "--with-gnutls" - "--with-external-srtp" - ;; We need -fPIC or else we get the following error when linking - ;; against pjproject-jami: - ;; relocation R_X86_64_32S against `.rodata' can not be used when - ;; making a shared object; - "CFLAGS=-fPIC" - "CXXFLAGS=-fPIC") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (add-after 'unpack 'apply-patches - (lambda* (#:key inputs #:allow-other-keys) - (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches") - ;; Comes from - ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". - ;; WARNING: These amount for huge changes in pjproject. - (savoir-faire-linux-patches - '("fix_turn_alloc_failure" - "rfc2466" - "ipv6" - "multiple_listeners" - "pj_ice_sess" - "fix_turn_fallback" - "fix_ioqueue_ipv6_sendto" - "add_dtls_transport" - "rfc6544" - "ice_config" - "sip_config" - "fix_first_packet_turn_tcp" - "fix_ebusy_turn" - "ignore_ipv6_on_transport_check" - "fix_turn_connection_failure" - ;; "uwp_vs" ; for windows - "disable_local_resolution"))) - (mkdir-p savoir-faire-linux-patches-directory) - (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches") - "-C" savoir-faire-linux-patches-directory - "--strip-components=5" - "ring-project/daemon/contrib/src/pjproject") - (for-each - (lambda (file) - (invoke "patch" "--force" "-p1" "-i" - (string-append savoir-faire-linux-patches-directory "/" - file ".patch"))) - savoir-faire-linux-patches)) - #t)) - ;; TODO: We could use substitute-keyword-arguments instead of - ;; repeating the phases from pjproject, but somehow it does - ;; not work. - (add-before 'build 'build-dep - (lambda _ (invoke "make" "dep"))) - (add-before 'patch-source-shebangs 'autoconf - (lambda _ - (invoke "autoconf" "-v" "-f" "-i" "-o" - "aconfigure" "aconfigure.ac"))) - (add-before 'autoconf 'disable-some-tests - ;; Three of the six test programs fail due to missing network - ;; access. - (lambda _ - (substitute* "Makefile" - (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test") - "selftest: pjlib-test pjlib-util-test pjmedia-test")) - #t))))))) - -(define-public libring - (package - (name "libring") - (version %jami-version) - (source (jami-source #:without-daemon #t)) - (build-system gnu-build-system) - (inputs - ;; Missing (optional?) dep: libnatpmp. - `(("alsa-lib" ,alsa-lib) - ("boost" ,boost) - ("dbus-c++" ,dbus-c++) - ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) - ("flac" ,flac) - ("gmp" ,gmp) - ("gsm" ,gsm) - ("jack" ,jack-1) - ("jsoncpp" ,jsoncpp) - ("libogg" ,libogg) - ("libva" ,libva) - ("opendht" ,opendht) - ("opus" ,opus) - ("pcre" ,pcre) - ("pulseaudio" ,pulseaudio) - ("libsamplerate" ,libsamplerate) - ("libsndfile" ,libsndfile) - ("speex" ,speex) - ("speexdsp" ,speexdsp) - ("libupnp" ,libupnp) - ("libvorbis" ,libvorbis) - ("libx264" ,libx264) - ("libvdpau" ,libvdpau) - ("yaml-cpp" ,yaml-cpp) - ("zlib" ,zlib) - ("openssl" ,openssl) - ("libsecp256k1" ,libsecp256k1) - ("python" ,python) - ("python-wrapper" ,python-wrapper) - ("restinio" ,restinio) - ("libx11" ,libx11) - ("asio" ,asio) - ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) version. - ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24. - ("pjproject" ,pjproject-jami))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("which" ,which) - ("cppunit" ,cppunit) - ("perl" ,perl))) ; Needed for documentation. - (arguments - `(#:tests? #f ; The tests fail to compile due to missing headers. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "daemon") - #t)) - (add-before 'build 'add-lib-dir - (lambda _ - (mkdir-p "src/lib") - #t))))) - (synopsis "Distributed multimedia communications platform") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides a library and daemon implementing the Jami core -functionality.") - (home-page "https://jami.net/") - (license license:gpl3+))) - -(define-public libringclient - (package - (inherit libring) - (name "libringclient") - (build-system cmake-build-system) - (propagated-inputs - `(("libring" ,libring) ; For 'dring'. - ("qtbase" ,qtbase) ; Qt is included in several installed headers. - ("qttools" ,qttools))) - (arguments - `(#:tests? #f ; There is no testsuite. - #:configure-flags - (list (string-append "-DRING_BUILD_DIR=" - (assoc-ref %build-inputs "libring") "/include")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "lrc") - #t)) - (add-before 'configure 'fix-dbus-interfaces-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _ dbus-interfaces-path-suffix) - (string-append (assoc-ref inputs "libring") - dbus-interfaces-path-suffix)))))))) - (synopsis "Distributed multimedia communications platform") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides a library common to all Jami clients.") - (home-page "https://jami.net") - (license license:gpl3+))) - -(define-public jami - (package - (inherit libring) - (name "jami") - (build-system cmake-build-system) - (inputs - `(("libringclient" ,libringclient) - ("gtk+" ,gtk+) - ("qrencode" ,qrencode) - ("libnotify" ,libnotify) - ("clutter" ,clutter) - ("clutter-gtk" ,clutter-gtk) - ("libcanberra" ,libcanberra) - ("webkitgtk" ,webkitgtk) - ;; TODO: We must wrap ring-client-gnome to force using the - ;; `sqlite-with-column-metadata' package instead of `sqlite' or else it - ;; fails with: - ;; - ;; /gnu/store/...-qtbase-5.11.2/lib/qt5/plugins/sqldrivers/libqsqlite.so: - ;; undefined symbol: sqlite3_column_table_name16 - ;; - ;; qtbase is built against sqlite-with-column-metadata but somehow - ;; jami-client-gnome ends up with both `sqlite' and - ;; `sqlite-with-column-metadata' as inputs and it seems that - ;; libqsqlite.so gets confused. - ("sqlite" ,sqlite-with-column-metadata))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("doxygen" ,doxygen))) - (propagated-inputs - `(("libring" ,libring) ; Contains `dring', the daemon, which is automatically by d-bus. - ("adwaita-icon-theme" ,adwaita-icon-theme) - ("evolution-data-server" ,evolution-data-server))) - (arguments - `(#:tests? #f ; There is no testsuite. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "client-gnome") - #t)) - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (path (string-append (assoc-ref inputs "sqlite") "/lib"))) - (wrap-program (string-append out "/bin/jami-gnome") - `("LD_LIBRARY_PATH" ":" prefix (,path)))) - #t))))) - (synopsis "Distributed, privacy-respecting communication program") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides the Jami client for the GNOME desktop.") - (home-page "https://jami.net") - (license license:gpl3+))) - -(define-public jami-client-gnome - (deprecated-package "jami-client-gnome" jami)) - (define-public libtgvoip (package (name "libtgvoip") -- cgit v1.2.3 From aaa199ca52a1913bcfe988297e3efd24b22df5cd Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:37 +0200 Subject: gnu: jami: Fix download. The package name changed from Ring to Jami. Package tarballs start now with "jami_" prefix. The "ring-release" folder is also deprecated, let's use the "release" folder instead. * gnu/packages/jami.scm (jami-source)[origin]: Change the uri from "https://dl.jami.net/ring-release/tarballs/ring_" to "https://dl.jami.net/release/tarballs/jami_". Signed-off-by: Mathieu Othacehe --- gnu/packages/jami.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 050f8cf9f6..8d6bab84e3 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -65,7 +65,7 @@ (define* (jami-source #:key without-daemon) (origin (method url-fetch) - (uri (string-append "https://dl.jami.net/ring-release/tarballs/ring_" + (uri (string-append "https://dl.jami.net/release/tarballs/jami_" %jami-version ".tar.gz")) (modules '((guix build utils))) -- cgit v1.2.3 From f60699af611b001c7a28f84a9dc9281cdb727a69 Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:38 +0200 Subject: gnu: jami: Create a jami-apply-dependency-patches procedure. * gnu/packages/jami.scm (pjproject-jami) [native-inputs]: Rename "savoir-faire-linux-patches" to "sfl-patches". [arguments]: Move Jami patching procedure to ... (jami-apply-dependency-patches): ... this new procedure. Signed-off-by: Mathieu Othacehe --- gnu/packages/jami.scm | 80 +++++++++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 35 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 8d6bab84e3..3b31fae827 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -78,12 +78,31 @@ (base32 "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) +;; Savoir-Faire Linux modifies many libraries to add features +;; to Jami. This procedure makes applying patches to a given +;; package easy. +(define jami-apply-dependency-patches + '(lambda* (#:key inputs dep-name patches) + (let ((patches-directory "sfl-patches")) + (mkdir-p patches-directory) + (invoke "tar" "-xvf" (assoc-ref inputs "sfl-patches") + "-C" patches-directory + "--strip-components=5" + (string-append "ring-project/daemon/contrib/src/" + dep-name)) + (for-each + (lambda (file) + (invoke "patch" "--force" "-p1" "-i" + (string-append patches-directory "/" + file ".patch"))) + patches)))) + (define-public pjproject-jami (package (inherit pjproject) (name "pjproject-jami") (native-inputs - `(("savoir-faire-linux-patches" ,(jami-source)) + `(("sfl-patches" ,(jami-source)) ,@(package-native-inputs pjproject))) (arguments `(#:tests? #f @@ -125,40 +144,31 @@ #t)) (add-after 'unpack 'apply-patches (lambda* (#:key inputs #:allow-other-keys) - (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches") - ;; Comes from - ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". - ;; WARNING: These amount for huge changes in pjproject. - (savoir-faire-linux-patches - '("fix_turn_alloc_failure" - "rfc2466" - "ipv6" - "multiple_listeners" - "pj_ice_sess" - "fix_turn_fallback" - "fix_ioqueue_ipv6_sendto" - "add_dtls_transport" - "rfc6544" - "ice_config" - "sip_config" - "fix_first_packet_turn_tcp" - "fix_ebusy_turn" - "ignore_ipv6_on_transport_check" - "fix_turn_connection_failure" - ;; "uwp_vs" ; for windows - "disable_local_resolution"))) - (mkdir-p savoir-faire-linux-patches-directory) - (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches") - "-C" savoir-faire-linux-patches-directory - "--strip-components=5" - "ring-project/daemon/contrib/src/pjproject") - (for-each - (lambda (file) - (invoke "patch" "--force" "-p1" "-i" - (string-append savoir-faire-linux-patches-directory "/" - file ".patch"))) - savoir-faire-linux-patches)) - #t)) + (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) + ;; Comes from + ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". + ;; WARNING: These amount for huge changes in pjproject. + (jami-apply-dependency-patches + #:inputs inputs + #:dep-name "pjproject" + #:patches + '("fix_turn_alloc_failure" + "rfc2466" + "ipv6" + "multiple_listeners" + "pj_ice_sess" + "fix_turn_fallback" + "fix_ioqueue_ipv6_sendto" + "add_dtls_transport" + "rfc6544" + "ice_config" + "sip_config" + "fix_first_packet_turn_tcp" + "fix_ebusy_turn" + "ignore_ipv6_on_transport_check" + "fix_turn_connection_failure" + "disable_local_resolution")) + #t))) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does ;; not work. -- cgit v1.2.3 From 63e6f1cdee26bbd26a2fa439e552f29258eb5560 Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:40 +0200 Subject: gnu: libring: Add libnatpmp dependency. This library isn't mandatory, but it works better with new routers than libupnp. * gnu/packages/jami.scm (libring)[inputs]: Add libnatpmp. Signed-off-by: Mathieu Othacehe --- gnu/packages/jami.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 3b31fae827..b4116c8504 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -194,7 +194,6 @@ (source (jami-source #:without-daemon #t)) (build-system gnu-build-system) (inputs - ;; Missing (optional?) dep: libnatpmp. `(("alsa-lib" ,alsa-lib) ("boost" ,boost) ("dbus-c++" ,dbus-c++) @@ -205,6 +204,7 @@ ("gsm" ,gsm) ("jack" ,jack-1) ("jsoncpp" ,jsoncpp) + ("libnatpmp" ,libnatpmp) ("libogg" ,libogg) ("libva" ,libva) ("opendht" ,opendht) -- cgit v1.2.3 From 7f8f39d344ed12983470b756696345778e5f1efc Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:45 +0200 Subject: gnu: jami: Make gettext a native input. * gnu/packages/jami.scm (jami)[inputs]: Move "gettext" to ... [native-inputs]: ... here. Signed-off-by: Mathieu Othacehe --- gnu/packages/jami.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index b4116c8504..3992d18f89 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -310,7 +310,6 @@ This package provides a library common to all Jami clients.") ("libnotify" ,libnotify) ("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) - ("gettext" ,gnu-gettext) ("libcanberra" ,libcanberra) ("webkitgtk" ,webkitgtk) ;; TODO: We must wrap ring-client-gnome to force using the @@ -327,6 +326,7 @@ This package provides a library common to all Jami clients.") ("sqlite" ,sqlite-with-column-metadata))) (native-inputs `(("pkg-config" ,pkg-config) + ("gettext" ,gnu-gettext) ("glib:bin" ,glib "bin") ("doxygen" ,doxygen))) (propagated-inputs -- cgit v1.2.3 From 2ff4e549bbb8cb0e40f730830be0ba6d19269292 Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:46 +0200 Subject: gnu: pjproject-jami: Update to 2.10. * gnu/packages/telephony.scm (pjproject): Update to 2.10, [source]: reorder "file-name" and "sha256" fields. * gnu/packages/jami.scm (%jami-version): Update to 20200401.1.6f090d, (pjproject-jami)[arguments]: apply patches related to 2.10. Signed-off-by: Mathieu Othacehe --- gnu/packages/jami.scm | 29 +++++++++++------------------ gnu/packages/telephony.scm | 14 +++++++------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 3992d18f89..06067a9253 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -60,7 +60,7 @@ #:use-module (guix packages) #:use-module (guix utils)) -(define %jami-version "20191101.3.67671e7") +(define %jami-version "20200401.1.6f090de") (define* (jami-source #:key without-daemon) (origin @@ -76,7 +76,7 @@ #f)) (sha256 (base32 - "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) + "0lryx9n1jn0jsw7s10pbwivqv0d5m3jdzhdhdyg5n02v72mjvkmh")))) ;; Savoir-Faire Linux modifies many libraries to add features ;; to Jami. This procedure makes applying patches to a given @@ -152,22 +152,15 @@ #:inputs inputs #:dep-name "pjproject" #:patches - '("fix_turn_alloc_failure" - "rfc2466" - "ipv6" - "multiple_listeners" - "pj_ice_sess" - "fix_turn_fallback" - "fix_ioqueue_ipv6_sendto" - "add_dtls_transport" - "rfc6544" - "ice_config" - "sip_config" - "fix_first_packet_turn_tcp" - "fix_ebusy_turn" - "ignore_ipv6_on_transport_check" - "fix_turn_connection_failure" - "disable_local_resolution")) + '("0001-rfc6544" + "0002-rfc2466" + "0003-add-tcp-keep-alive" + "0004-multiple_listeners" + "0005-fix_ebusy_turn" + "0006-ignore_ipv6_on_transport_check" + "0007-pj_ice_sess" + "0008-fix_ioqueue_ipv6_sendto" + "0009-add-config-site")) #t))) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 747b0d75a1..17974e17f9 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -651,13 +651,17 @@ calls and messages") (define-public pjproject (package (name "pjproject") - (version "2.9") + (version "2.10") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/pjsip/pjproject.git") - (commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4"))) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")) (modules '((guix build utils))) (snippet '(begin @@ -686,11 +690,7 @@ calls and messages") (lambda (dirs) (substitute* "third_party/build/os-linux.mak" (((string-append "DIRS += " dirs)) ""))) - third-party-dirs)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) + third-party-dirs)))))) (build-system gnu-build-system) (inputs `(("portaudio" ,portaudio))) -- cgit v1.2.3 From f06eefa31d9994c92cb6cb4bb956d645d00e6bfa Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 03:14:48 +0200 Subject: gnu: jami: Use gettext-minimal. * gnu/packages/jami.scm (jami)[native-inputs]: Use "gettext-minimal" instead of "gnu-gettext". Signed-off-by: Mathieu Othacehe --- gnu/packages/jami.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 06067a9253..67146dcd70 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -319,7 +319,7 @@ This package provides a library common to all Jami clients.") ("sqlite" ,sqlite-with-column-metadata))) (native-inputs `(("pkg-config" ,pkg-config) - ("gettext" ,gnu-gettext) + ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("doxygen" ,doxygen))) (propagated-inputs -- cgit v1.2.3 From 8c98eb28084858d89bdf6a3bd90eb056bf31c49e Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sat, 2 May 2020 11:31:13 +0200 Subject: gnu: jami: Add epoll support. * gnu/packages/jami.scm (jami)[arguments]: Add epoll support on Linux systems. Signed-off-by: Mathieu Othacehe --- gnu/packages/jami.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 67146dcd70..dda787b3cd 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages hurd) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages multiprecision) @@ -111,6 +112,11 @@ (list "--disable-oss" "--disable-sound" "--disable-video" + ;; The following flag is Linux specific. + ,@(if (hurd-triplet? (or (%current-system) + (%current-target-system))) + '() + '("--enable-epoll")) "--enable-ext-sound" "--disable-speex-aec" "--disable-g711-codec" -- cgit v1.2.3 From 3c566eba1951dbcdb162fb20e249bbaac87a4c4a Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Thu, 30 Apr 2020 11:21:38 -0500 Subject: gnu: Add guile3.0-ncurses. * gnu/packages/guile-xyz.scm (guile-ncurses)[arguments]: Use Guile effective version instead of hardcoding the version number in the libary path. Also import the required module to do that. (guile3.0-ncurses): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/guile-xyz.scm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 6ec1c4c2fc..de76f3b6d0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2019 swedebugia ;;; Copyright © 2019, 2020 Amar Singh ;;; Copyright © 2019 Timothy Sample -;;; Copyright © 2019 Martin Becze +;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2020 Evan Straw ;;; ;;; This file is part of GNU Guix. @@ -1833,7 +1833,13 @@ many readers as needed).") ("guile" ,guile-2.2))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments - '(#:configure-flags (list "--with-ncursesw" ; Unicode support + `(#:modules ((guix build gnu-build-system) + ((guix build guile-build-system) + #:select (target-guile-effective-version)) + (guix build utils)) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:configure-flags (list "--with-ncursesw" ; Unicode support "--with-gnu-filesystem-hierarchy") #:phases (modify-phases %standard-phases @@ -1848,8 +1854,8 @@ many readers as needed).") (files (find-files dir ".scm"))) (substitute* files (("\"libguile-ncurses\"") - (format #f "\"~a/lib/guile/2.2/libguile-ncurses\"" - out))) + (format #f "\"~a/lib/guile/~a/libguile-ncurses\"" + out (target-guile-effective-version)))) #t)))))) (home-page "https://www.gnu.org/software/guile-ncurses/") (synopsis "Guile bindings to ncurses") @@ -1858,6 +1864,14 @@ many readers as needed).") library.") (license license:lgpl3+))) +(define-public guile3.0-ncurses + (package + (inherit guile-ncurses) + (name "guile3.0-ncurses") + (version "3.0") + (inputs `(("ncurses" ,ncurses) + ("guile" ,guile-3.0))))) + (define-public guile-ncurses/gpm (package (inherit guile-ncurses) -- cgit v1.2.3 From 87001355cc8c578898a9b1e756e6a0e9e7cc2b0a Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Thu, 30 Apr 2020 11:58:57 -0500 Subject: gnu: Add guile3.0-ncurses-with-gpm. * gnu/packages/guile-xyz.scm (guile3.0-ncurses/gpm): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/guile-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index de76f3b6d0..8075e8c21a 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1879,6 +1879,13 @@ library.") (inputs `(("ncurses" ,ncurses/gpm) ("guile" ,guile-2.2))))) +(define-public guile3.0-ncurses/gpm + (package + (inherit guile3.0-ncurses) + (name "guile3.0-ncurses-with-gpm") + (inputs `(("ncurses" ,ncurses/gpm) + ("guile" ,guile-3.0))))) + (define-public guile-lib (package (name "guile-lib") -- cgit v1.2.3 From 48a168ff9712c42c127f8bee45a45ba2f7df28f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 May 2020 12:52:47 +0200 Subject: gnu: libdbusmenu: Fix build failure. * gnu/packages/gtk.scm (libdbusmenu)[arguments]: Add phase do-not-treat-warnings-as-errors. --- gnu/packages/gtk.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 159b5f4705..f375ca9b82 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1914,6 +1914,14 @@ shell scripts. Example of how to use @code{yad} can be consulted at "/lib/girepository-1.0")) #:phases (modify-phases %standard-phases + (add-before 'configure 'do-not-treat-warnings-as-errors + (lambda _ + ;; Prevent the build from failing due to deprecation warnings + ;; from newer GLib and GTK versions. + (substitute* (find-files "." "^Makefile.in$") + ((" -Werror") + "")) + #t)) (add-before 'configure 'set-environment (lambda _ (setenv "HAVE_VALGRIND_TRUE" "") -- cgit v1.2.3 From 7c65fc378cf68b598965fd977f5844050435ac97 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Tue, 28 Apr 2020 13:51:31 +0200 Subject: doc: Fix building the cookbook. Fixes . Reported by "operator.name" . * doc/build.scm (%languages): Add smaller list for the cookbook. (syntax-highlighted-html): Adapt regexp for mono-node files to include the cookbook. --- doc/build.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/build.scm b/doc/build.scm index 3907b49caf..2b6d0c4aea 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Ludovic Courtès +;;; Copyright © 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,7 +59,10 @@ "guix")) (define %languages - '("de" "en" "es" "fr" "ru" "zh_CN")) + ;; The cookbook is currently only translated into German. + (if (string=? %manual "guix-cookbook") + '("de" "en") + '("de" "en" "es" "fr" "ru" "zh_CN"))) (define (texinfo-manual-images source) "Return a directory containing all the images used by the user manual, taken @@ -451,7 +455,9 @@ its 
 blocks (as produced by 'makeinfo --html')."
                             (lambda (mono)
                               (let ((anchors (collect-anchors mono)))
                                 (process-html mono anchors)))
-                            (find-files #$input "^guix(\\.[a-zA-Z_-]+)?\\.html$"))
+                            (find-files
+                             #$input
+                             "^guix(-cookbook|)(\\.[a-zA-Z_-]+)?\\.html$"))
 
             ;; Next process the multi-node HTML files in two phases: (1)
             ;; collect the list of anchors, and (2) perform
-- 
cgit v1.2.3


From f59cc03b569ec7b2d96cdd5474685984640fc074 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov 
Date: Mon, 27 Apr 2020 13:07:13 +0300
Subject: gnu: Add emacs-gitlab-snip-helm.

* gnu/packages/emacs-xyz.scm (emacs-gitlab-snip-helm): New variable.
---
 gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d9a3c2acc3..cb9405acf0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7515,6 +7515,29 @@ special variables.  An interface to GitLab’s CI file linter is also provided
 via @code{gitlab-ci-lint}.")
     (license license:gpl3+)))
 
+(define-public emacs-gitlab-snip-helm
+  (package
+    (name "emacs-gitlab-snip-helm")
+    (version "0.0.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.com/sasanidas/gitlab-snip-helm.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1c5js19zyb1z61hapvbfcl5jhrjqij46cxldgqij6al0scw44dga"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-dash" ,emacs-dash)
+       ("emacs-helm" ,emacs-helm)))
+    (home-page "https://gitlab.com/sasanidas/gitlab-snip-helm/")
+    (synopsis "GitLab snippet API interaction for Emacs")
+    (description "This package provides GitLab snippet API interaction for
+Emacs.")
+    (license license:gpl3+)))
+
 (define-public emacs-web-mode
   (package
     (name "emacs-web-mode")
-- 
cgit v1.2.3


From 39f1806ca1d04b9aee70e897e06466aadbbee152 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Thu, 9 Apr 2020 15:56:42 +0200
Subject: gnu: Add warsow-qfusion.

* gnu/local.mk (warsow-qfusion): New variable.
---
 gnu/local.mk                      |  1 +
 gnu/packages/game-development.scm | 78 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 812253b192..461102ebdd 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1527,6 +1527,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/vsearch-unbundle-cityhash.patch		\
   %D%/packages/patches/vte-CVE-2012-2738-pt1.patch			\
   %D%/packages/patches/vte-CVE-2012-2738-pt2.patch			\
+  %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch	\
   %D%/packages/patches/weasyprint-library-paths.patch		\
   %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch	\
   %D%/packages/patches/wicd-bitrate-none-fix.patch		\
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index d4b2fdcab2..d2df5d864a 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -38,6 +38,7 @@
 
 (define-module (gnu packages game-development)
   #:use-module (srfi srfi-1)
+  #:use-module (ice-9 match)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -2225,3 +2226,80 @@ rigid body physics library written in C.")
 developers providing an advanced true color console, input, and lots of other
 utilities frequently used in roguelikes.")
     (license license:bsd-3)))
+
+(define-public warsow-qfusion
+  ;; As of 2020-04-09, the latest stable version 2.1.0 is deprecated.
+  ;; The 2.5 beta as published on the homepage is commit
+  ;; c4de15df559410aff0ca6643724e24cddb0ecbbd
+  (let ((commit "c4de15df559410aff0ca6643724e24cddb0ecbbd")
+        (arch (match (or (%current-target-system)
+                         (%current-system))
+                ("x86_64-linux" "x86_64")
+                ("i686-linux" "i386")
+                (_ ""))))
+    (package
+      (name "warsow-qfusion")
+      (version (git-version "2.5" "1" commit)) ; 2.5-beta
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/Warsow/qfusion/")
+                      (commit commit)
+                      (recursive? #t)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0xv2yycr43p3xmq7lm6j6zb3cpcr6w00x7qg918faq0mw9j7v48g"))
+                ;; Issue reported here: https://github.com/Warsow/qfusion/issues/46
+                (patches (search-patches "warsow-qfusion-fix-bool-return-type.patch"))))
+      (build-system cmake-build-system)
+      (arguments
+       `(#:tests? #f                    ; No tests.
+         #:configure-flags '("-DQFUSION_GAME=Warsow")
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'change-to-build-dir
+             (lambda _
+               (chdir "source")
+               #t))
+           (add-after 'install 'really-install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out")))
+                 (install-file (string-append "../source/build/basewsw/libgame_"
+                                              ,arch ".so")
+                               (string-append out "/lib/"))
+                 (install-file (string-append "../source/build/libui_" ,arch ".so")
+                               (string-append out "/lib/"))
+                 (for-each
+                  (lambda (file)
+                    (install-file file (string-append out "/bin/")))
+                  (append (find-files "../source/build" "warsow")
+                          (find-files "../source/build" "wsw_server."))))
+               #t)))))
+      (inputs
+       `(("alsa-lib" ,alsa-lib)
+         ("curl" ,curl)
+         ("freetype" ,freetype)
+         ("ffmpeg" ,ffmpeg)
+         ("libjpeg" ,libjpeg)
+         ("libogg" ,libogg)
+         ("libpng" ,libpng)
+         ("libtheora" ,libtheora)
+         ("libvorbis" ,libvorbis)
+         ("mesa" ,mesa)
+         ("openal" ,openal)
+         ("pulseaudio" ,pulseaudio)
+         ("qtbase" ,qtbase)
+         ("qtdeclarative" ,qtdeclarative)
+         ("sdl2" ,sdl2)
+         ("uuid.h" ,util-linux)
+         ("zlib" ,zlib)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)))
+      (home-page "https://github.com/Warsow/qfusion")
+      (synopsis "Warsow's fork of qfusion, the id Tech 2 derived game engine")
+      (supported-systems '("i686-linux" "x86_64-linux"))
+      (description
+       "This package contains Warsow's fork of qfusion, the id Tech 2 derived
+game engine.  id Tech 2 is the engine originally behind Quake 2.")
+      (license license:gpl2+))))
-- 
cgit v1.2.3


From 2515968f4985b7b72f3152c2d3265bcd8900a182 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Sat, 2 May 2020 16:44:55 +0200
Subject: Revert "gnu: Add warsow-qfusion."

'warsow-qfusion-fix-bool-return-type.patch' is missing.

This reverts commit 39f1806ca1d04b9aee70e897e06466aadbbee152.
---
 gnu/local.mk                      |  1 -
 gnu/packages/game-development.scm | 78 ---------------------------------------
 2 files changed, 79 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 461102ebdd..812253b192 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1527,7 +1527,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/vsearch-unbundle-cityhash.patch		\
   %D%/packages/patches/vte-CVE-2012-2738-pt1.patch			\
   %D%/packages/patches/vte-CVE-2012-2738-pt2.patch			\
-  %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch	\
   %D%/packages/patches/weasyprint-library-paths.patch		\
   %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch	\
   %D%/packages/patches/wicd-bitrate-none-fix.patch		\
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index d2df5d864a..d4b2fdcab2 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -38,7 +38,6 @@
 
 (define-module (gnu packages game-development)
   #:use-module (srfi srfi-1)
-  #:use-module (ice-9 match)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -2226,80 +2225,3 @@ rigid body physics library written in C.")
 developers providing an advanced true color console, input, and lots of other
 utilities frequently used in roguelikes.")
     (license license:bsd-3)))
-
-(define-public warsow-qfusion
-  ;; As of 2020-04-09, the latest stable version 2.1.0 is deprecated.
-  ;; The 2.5 beta as published on the homepage is commit
-  ;; c4de15df559410aff0ca6643724e24cddb0ecbbd
-  (let ((commit "c4de15df559410aff0ca6643724e24cddb0ecbbd")
-        (arch (match (or (%current-target-system)
-                         (%current-system))
-                ("x86_64-linux" "x86_64")
-                ("i686-linux" "i386")
-                (_ ""))))
-    (package
-      (name "warsow-qfusion")
-      (version (git-version "2.5" "1" commit)) ; 2.5-beta
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/Warsow/qfusion/")
-                      (commit commit)
-                      (recursive? #t)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0xv2yycr43p3xmq7lm6j6zb3cpcr6w00x7qg918faq0mw9j7v48g"))
-                ;; Issue reported here: https://github.com/Warsow/qfusion/issues/46
-                (patches (search-patches "warsow-qfusion-fix-bool-return-type.patch"))))
-      (build-system cmake-build-system)
-      (arguments
-       `(#:tests? #f                    ; No tests.
-         #:configure-flags '("-DQFUSION_GAME=Warsow")
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'change-to-build-dir
-             (lambda _
-               (chdir "source")
-               #t))
-           (add-after 'install 'really-install
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let ((out (assoc-ref outputs "out")))
-                 (install-file (string-append "../source/build/basewsw/libgame_"
-                                              ,arch ".so")
-                               (string-append out "/lib/"))
-                 (install-file (string-append "../source/build/libui_" ,arch ".so")
-                               (string-append out "/lib/"))
-                 (for-each
-                  (lambda (file)
-                    (install-file file (string-append out "/bin/")))
-                  (append (find-files "../source/build" "warsow")
-                          (find-files "../source/build" "wsw_server."))))
-               #t)))))
-      (inputs
-       `(("alsa-lib" ,alsa-lib)
-         ("curl" ,curl)
-         ("freetype" ,freetype)
-         ("ffmpeg" ,ffmpeg)
-         ("libjpeg" ,libjpeg)
-         ("libogg" ,libogg)
-         ("libpng" ,libpng)
-         ("libtheora" ,libtheora)
-         ("libvorbis" ,libvorbis)
-         ("mesa" ,mesa)
-         ("openal" ,openal)
-         ("pulseaudio" ,pulseaudio)
-         ("qtbase" ,qtbase)
-         ("qtdeclarative" ,qtdeclarative)
-         ("sdl2" ,sdl2)
-         ("uuid.h" ,util-linux)
-         ("zlib" ,zlib)))
-      (native-inputs
-       `(("pkg-config" ,pkg-config)))
-      (home-page "https://github.com/Warsow/qfusion")
-      (synopsis "Warsow's fork of qfusion, the id Tech 2 derived game engine")
-      (supported-systems '("i686-linux" "x86_64-linux"))
-      (description
-       "This package contains Warsow's fork of qfusion, the id Tech 2 derived
-game engine.  id Tech 2 is the engine originally behind Quake 2.")
-      (license license:gpl2+))))
-- 
cgit v1.2.3


From 795b4bca1867e2463d7b60e7238f916e2695db6e Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Sat, 2 May 2020 13:57:15 +0200
Subject: gnu: ledger: Update to 3.2.0.

* gnu/packages/finance.scm (ledger): Update to 3.2.0.
[arguments]: Add #:modules and #:imported-modules.  Add phase
'fix-python-installation-directory'.
---
 gnu/packages/finance.scm | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index c31b87ec19..61d807190c 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -18,6 +18,7 @@
 ;;; Copyright © 2020 Kei Kebreau 
 ;;; Copyright © 2020 Christopher Lemmer Webber 
 ;;; Copyright © 2020 Tom Zander 
+;;; Copyright © 2020 Marius Bakke 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -197,7 +198,7 @@ and dynamically with report tools based on filtering and graphical charts.")
 (define-public ledger
   (package
     (name "ledger")
-    (version "3.1.3")
+    (version "3.2.0")
     (source
      (origin
        (method git-fetch)
@@ -206,16 +207,32 @@ and dynamically with report tools based on filtering and graphical charts.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0bfnrqrd6wqgsngfpqi30xh6yy86pwl25iwzrqy44q31r0zl4mm3"))))
+        (base32 "1l5c9jf2wnly6ncm9civ8i7v47xld15g1y7wpl0hqwgbfyffwjci"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags
+     `(#:modules (,@%cmake-build-system-modules
+                  ((guix build python-build-system) #:select (python-version)))
+       #:imported-modules (,@%cmake-build-system-modules
+                           (guix build python-build-system))
+       #:configure-flags
        `("-DBUILD_DOCS:BOOL=ON"
          "-DBUILD_WEB_DOCS:BOOL=ON"
          "-DUSE_PYTHON:BOOL=ON"
          "-DCMAKE_INSTALL_LIBDIR:PATH=lib")
        #:phases
-       (modify-phases %standard-phases
+       (modify-phases (@ (guix build cmake-build-system) %standard-phases)
+         (add-after 'unpack 'fix-python-installation-directory
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; By default the package attempts to install its Python bindings
+             ;; to the Python store directory, which obviously does not work.
+             ;; Passing -DPython_SITEARCH in #:configure-flags has no effect.
+             (let ((python-version (python-version (assoc-ref inputs "python")))
+                   (out (assoc-ref outputs "out")))
+               (substitute* "src/CMakeLists.txt"
+                 (("DESTINATION \\$\\{Python_SITEARCH\\}")
+                  (string-append "DESTINATION " out "/lib/python"
+                                 python-version "/site-packages")))
+               #t)))
          (add-before 'configure 'install-examples
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((examples (string-append (assoc-ref outputs "out")
-- 
cgit v1.2.3


From 61586ce9a22768926448fa16673f7c3a93ebc5c6 Mon Sep 17 00:00:00 2001
From: TomZ 
Date: Sat, 2 May 2020 12:20:09 +0200
Subject: gnu: qutebrowser: Update to 1.11.0

* gnu/packages/web-branch.scm (qutebrowser): Update to 1.11.0

Signed-off-by: Marius Bakke 
---
 gnu/packages/web-browsers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 424951cdb7..33ff3d1a74 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -338,7 +338,7 @@ access.")
 (define-public qutebrowser
   (package
     (name "qutebrowser")
-    (version "1.10.0")
+    (version "1.11.0")
     (source
      (origin
        (method url-fetch)
@@ -347,7 +347,7 @@ access.")
                            "qutebrowser-" version ".tar.gz"))
        (sha256
         (base32
-         "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby"))))
+         "0b0qlki9bp9mm41lrh6rc6qqvm4nsz8da63sby3a1f2xm9b9vvg2"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-attrs" ,python-attrs))) ; for tests
-- 
cgit v1.2.3


From 20d7dbc77a2b0ed379c0a595daf8d7f852ef3a4c Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Sat, 2 May 2020 12:00:11 +0100
Subject: gnu: python-gst: Fix build with Python 3.8.

Add a patch based on an upstream commit [1].

1: 10707f437f2fc3632067c6a0efa4432f7ebaf362

* gnu/packages/patches/python-gst-fix-build-with-python-3.8.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gstreamer.scm (python-gst)[source]: Use the patch.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/gstreamer.scm                         |  4 ++-
 .../python-gst-fix-build-with-python-3.8.patch     | 36 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/python-gst-fix-build-with-python-3.8.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 0111ae2161..acfc5cec4d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1394,6 +1394,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
   %D%/packages/patches/python-configobj-setuptools.patch	\
   %D%/packages/patches/python-flask-restful-werkzeug-compat.patch	\
+  %D%/packages/patches/python-gst-fix-build-with-python-3.8.patch	\
   %D%/packages/patches/python-keras-integration-test.patch	\
   %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
   %D%/packages/patches/python-pyfakefs-remove-bad-test.patch	\
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 93149e370e..7596796d68 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -521,7 +521,9 @@ non-linear editors.")
                     "gst-python-" version ".tar.xz"))
               (sha256
                (base32
-                "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390"))))
+                "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390"))
+              (patches
+               (search-patches "python-gst-fix-build-with-python-3.8.patch"))))
     (build-system meson-build-system)
     (arguments
      `(#:modules ((guix build meson-build-system)
diff --git a/gnu/packages/patches/python-gst-fix-build-with-python-3.8.patch b/gnu/packages/patches/python-gst-fix-build-with-python-3.8.patch
new file mode 100644
index 0000000000..affa0e1317
--- /dev/null
+++ b/gnu/packages/patches/python-gst-fix-build-with-python-3.8.patch
@@ -0,0 +1,36 @@
+Fix build with Python 3.8 by also checking for python-3.X-embed.pc. Since
+Python 3.8 the normal checks don't include the Python libraries anymore and
+linking of the gst-python module would fail.
+
+See also https://github.com/mesonbuild/meson/issues/5629
+Fixes https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
+
+Patch based on upstream commit:
+
+https://gitlab.freedesktop.org/gstreamer/gst-python/-/commit/10707f437f2fc3632067c6a0efa4432f7ebaf362
+
+diff --git a/meson.build b/meson.build
+index 5f13b48..d7c7e66 100644
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,17 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
+ 
+ pymod = import('python')
+ python = pymod.find_installation(get_option('python'))
+-python_dep = python.dependency(required : true)
++pythonver = python.language_version()
++if pythonver.version_compare('<3.0')
++   error('Python2 is not supported anymore, please port your code to python3 (@0@ specified)'.format(python.language_version()))
++endif
++
++# Workaround for https://github.com/mesonbuild/meson/issues/5629
++# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
++python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>=3', required: false)
++if not python_dep.found()
++  python_dep = python.dependency(required : true)
++endif
+ 
+ python_abi_flags = python.get_variable('ABIFLAGS', '')
+ pylib_loc = get_option('libpython-dir')
+-- 
+2.26.2
-- 
cgit v1.2.3


From 4c0cc7bed3de2c0e2d3a6e95b88693941e839eec Mon Sep 17 00:00:00 2001
From: Diego Nicola Barbato 
Date: Tue, 28 Apr 2020 13:31:54 +0200
Subject: services: syslog: Simplify 'start' method.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a followup to d7113bb655ff80a868a9e624c913f9d23e6c63ad and
e3358a831e7d5d9e8dc614340e49ea5aeb11a7ff.

* gnu/services/base.scm (syslog-service-type): Change 'start' method to set
  umask using the #:file-creation-mask parameter of
  'make-forkexec-constructor' introduced in version 0.8.0 of the Shepherd.

Signed-off-by: Ludovic Courtès 
---
 gnu/services/base.scm | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 2913478e4a..0f119cc2f9 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1316,17 +1316,13 @@ Service Switch}, for an example."
       (documentation "Run the syslog daemon (syslogd).")
       (provision '(syslogd))
       (requirement '(user-processes))
-      (start #~(let ((spawn (make-forkexec-constructor
-                             (list #$(syslog-configuration-syslogd config)
-                                   "--rcfile"
-                                   #$(syslog-configuration-config-file config))
-                             #:pid-file "/var/run/syslog.pid")))
-                 (lambda ()
-                   ;; Set the umask such that file permissions are #o640.
-                   (let ((mask (umask #o137))
-                         (pid  (spawn)))
-                     (umask mask)
-                     pid))))
+      (start #~(make-forkexec-constructor
+                (list #$(syslog-configuration-syslogd config)
+                      "--rcfile"
+                      #$(syslog-configuration-config-file config))
+                ;; Set the umask such that file permissions are #o640.
+                #:file-creation-mask #o137
+                #:pid-file "/var/run/syslog.pid"))
       (stop #~(make-kill-destructor))))))
 
 ;; Snippet adapted from the GNU inetutils manual.
-- 
cgit v1.2.3


From b1cb8b5d83dc92734840e9243d084c1c2a604321 Mon Sep 17 00:00:00 2001
From: Giacomo Leidi 
Date: Mon, 20 Apr 2020 23:56:13 +0200
Subject: gnu: llvm-for-extempore: Update to 3.8.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/llvm.scm (llvm-for-extempore): Update to 3.8.
[source]: Use upstream patched source.
* gnu/packages/patches/llvm-for-extempore.patch: Delete due to source being
already patched.
* gnu/local.mk (dist_patch_DATA): Remove it.

Signed-off-by: Ludovic Courtès 
---
 gnu/local.mk                                  |   1 -
 gnu/packages/llvm.scm                         |  11 ++-
 gnu/packages/patches/llvm-for-extempore.patch | 118 --------------------------
 3 files changed, 8 insertions(+), 122 deletions(-)
 delete mode 100644 gnu/packages/patches/llvm-for-extempore.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 812253b192..3c6c98a284 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1184,7 +1184,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/lirc-localstatedir.patch			\
   %D%/packages/patches/lirc-reproducible-build.patch		\
   %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch	\
-  %D%/packages/patches/llvm-for-extempore.patch			\
   %D%/packages/patches/lm-sensors-hwmon-attrs.patch		\
   %D%/packages/patches/lrcalc-includes.patch    		\
   %D%/packages/patches/lrzip-CVE-2017-8842.patch		\
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index d6c519bcbd..33d863ae11 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2019 Arm Ltd 
 ;;; Copyright © 2019 Mathieu Othacehe 
 ;;; Copyright © 2019 Brett Gilio 
+;;; Copyright © 2020 Giacomo Leidi 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -627,12 +628,16 @@ output), and Binutils.")
                    #:patches '("clang-3.5-libc-search-path.patch")))
 
 (define-public llvm-for-extempore
-  (package (inherit llvm-3.7)
+  (package (inherit llvm-3.8)
     (name "llvm-for-extempore")
     (source
      (origin
-       (inherit (package-source llvm-3.7))
-       (patches (list (search-patch "llvm-for-extempore.patch")))))
+       (method url-fetch)
+       (uri (string-append "http://extempore.moso.com.au/extras/"
+                           "llvm-3.8.0.src-patched-for-extempore.tar.xz"))
+       (sha256
+        (base32
+         "1svdl6fxn8l01ni8mpm0bd5h856ahv3h9sdzgmymr6fayckjvqzs"))))
     ;; Extempore refuses to build on architectures other than x86_64
     (supported-systems '("x86_64-linux"))))
 
diff --git a/gnu/packages/patches/llvm-for-extempore.patch b/gnu/packages/patches/llvm-for-extempore.patch
deleted file mode 100644
index 614682c6cb..0000000000
--- a/gnu/packages/patches/llvm-for-extempore.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-This patch to LLVM is required by the developers of the Extempore language.
-The following explanation was posted to the extemporelang@googlegroups.com
-mailing list:
-
-"There is an assumption in the parser that all definitions occur within the
-same compilation unit - i.e. the parser has local state about what has been
-parsed in this unit of work.  Extempore obviously does lots of little units
-rather than one big unit and this causes problems for named types that were
-defined in another unit - which they always are.  The patch simply checks the
-current module to see if the type has been previously defined, and intervenes
-appropriately if it has."
-
-Message-ID: 
-
---- llvm-3.7.1.src/include/llvm/MC/MCSectionCOFF.h	2015-04-11 12:11:45.000000000 +1000
-+++ llvm-3.7.1.src/include/llvm/MC/MCSectionCOFF.h	2015-09-14 09:22:56.000000000 +1000
-@@ -16,7 +16,6 @@
- 
- #include "llvm/ADT/StringRef.h"
- #include "llvm/MC/MCSection.h"
--#include "llvm/Support/COFF.h"
- 
- namespace llvm {
- class MCSymbol;
-
---- llvm-3.7.1.src/lib/AsmParser/LLParser.cpp	2015-07-11 20:30:36.000000000 +1000
-+++ llvm-3.7.1.src/lib/AsmParser/LLParser.cpp	2015-09-14 09:20:57.000000000 +1000
-@@ -1754,8 +1754,14 @@
-     // If the type hasn't been defined yet, create a forward definition and
-     // remember where that forward def'n was seen (in case it never is defined).
-     if (!Entry.first) {
--      Entry.first = StructType::create(Context, Lex.getStrVal());
--      Entry.second = Lex.getLoc();
-+      // this here for extempore
-+      if (M->getTypeByName(Lex.getStrVal())) {
-+        Entry.first = M->getTypeByName(Lex.getStrVal());
-+        Entry.second = SMLoc();
-+      } else {
-+        Entry.first = StructType::create(Context, Lex.getStrVal());
-+        Entry.second = Lex.getLoc();
-+      }
-     }
-     Result = Entry.first;
-     Lex.Lex();
-
---- llvm-3.7.1.src/lib/CodeGen/TargetLoweringObjectFileImpl.cpp	2015-07-01 05:10:31.000000000 +1000
-+++ llvm-3.7.1.src/lib/CodeGen/TargetLoweringObjectFileImpl.cpp	2015-09-14 09:23:40.000000000 +1000
-@@ -32,6 +32,7 @@
- #include "llvm/MC/MCStreamer.h"
- #include "llvm/MC/MCSymbolELF.h"
- #include "llvm/MC/MCValue.h"
-+#include "llvm/Support/COFF.h"
- #include "llvm/Support/Dwarf.h"
- #include "llvm/Support/ELF.h"
- #include "llvm/Support/ErrorHandling.h"
-
---- llvm-3.7.1.src/lib/ExecutionEngine/MCJIT/MCJIT.cpp	2015-07-31 02:31:16.000000000 +1000
-+++ llvm-3.7.1.src/lib/ExecutionEngine/MCJIT/MCJIT.cpp	2015-09-14 09:21:28.000000000 +1000
-@@ -524,6 +524,17 @@
-         rv.IntVal = APInt(32, PF(ArgValues[0].IntVal.getZExtValue()));
-         return rv;
-       }
-+      if (FTy->getNumParams() == 1 &&
-+          RetTy->isVoidTy() &&
-+          FTy->getParamType(0)->isPointerTy()) {
-+        GenericValue rv;
-+        //void (*PF)(char *) = (void(*)(char *))(intptr_t)FPtr;
-+        //printf("are symbols available: %d\n",isSymbolSearchingDisabled());
-+        void (*PF)(char *) = (void(*)(char *))FPtr;
-+        char* mzone = (char*) GVTOP(ArgValues[0]);
-+        PF(mzone);
-+        return rv;
-+      }      
-       break;
-     }
-   }
-
---- llvm-3.7.1.src/lib/MC/MCContext.cpp	2015-06-23 21:31:32.000000000 +1000
-+++ llvm-3.7.1.src/lib/MC/MCContext.cpp	2015-09-14 09:24:01.000000000 +1000
-@@ -23,6 +23,7 @@
- #include "llvm/MC/MCSymbolCOFF.h"
- #include "llvm/MC/MCSymbolELF.h"
- #include "llvm/MC/MCSymbolMachO.h"
-+#include "llvm/Support/COFF.h"
- #include "llvm/Support/ELF.h"
- #include "llvm/Support/ErrorHandling.h"
- #include "llvm/Support/FileSystem.h"
-
---- llvm-3.7.1.src/lib/MC/MCObjectFileInfo.cpp	2015-06-25 10:28:42.000000000 +1000
-+++ llvm-3.7.1.src/lib/MC/MCObjectFileInfo.cpp	2015-09-14 09:24:17.000000000 +1000
-@@ -16,6 +16,7 @@
- #include "llvm/MC/MCSectionCOFF.h"
- #include "llvm/MC/MCSectionELF.h"
- #include "llvm/MC/MCSectionMachO.h"
-+#include "llvm/Support/COFF.h"
- using namespace llvm;
- 
- static bool useCompactUnwind(const Triple &T) {
-
---- llvm-3.7.1.src/lib/MC/MCSectionCOFF.cpp	2015-06-09 10:31:39.000000000 +1000
-+++ llvm-3.7.1.src/lib/MC/MCSectionCOFF.cpp	2015-09-14 09:24:25.000000000 +1000
-@@ -11,6 +11,7 @@
- #include "llvm/MC/MCAsmInfo.h"
- #include "llvm/MC/MCContext.h"
- #include "llvm/MC/MCSymbol.h"
-+#include "llvm/Support/COFF.h"
- #include "llvm/Support/raw_ostream.h"
- using namespace llvm;
- 
---- llvm-3.7.1.src/lib/Target/X86/X86TargetObjectFile.cpp	2015-06-27 04:55:48.000000000 +1000
-+++ llvm-3.7.1.src/lib/Target/X86/X86TargetObjectFile.cpp	2015-09-14 09:25:03.000000000 +1000
-@@ -16,6 +16,7 @@
- #include "llvm/MC/MCSectionCOFF.h"
- #include "llvm/MC/MCSectionELF.h"
- #include "llvm/MC/MCValue.h"
-+#include "llvm/Support/COFF.h"
- #include "llvm/Support/Dwarf.h"
- #include "llvm/Target/TargetLowering.h"
-- 
cgit v1.2.3


From 7bb0ba81b394d82f56ee9d238919c7112e4666fd Mon Sep 17 00:00:00 2001
From: Giacomo Leidi 
Date: Mon, 20 Apr 2020 23:56:14 +0200
Subject: gnu: nanovg-for-extempore: Update to 0.7.1-0.3c60175.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/gl.scm (nanovg-for-extempore): Update to 0.7.1-0.3c60175.
[source]: Switch to Git source to include latest changes.
[version]: Use git-version.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/gl.scm | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 01241cd88e..fd2e543461 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 Pierre Neidhardt 
 ;;; Copyright © 2020 Marius Bakke 
+;;; Copyright © 2020 Giacomo Leidi 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -742,30 +743,34 @@ and surfaces, receiving input and events.")
     (license license:zlib)))
 
 (define-public nanovg-for-extempore
-  (package
-    (name "nanovg-for-extempore")
-    (version "0.7.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/extemporelang/nanovg/"
-                                  "archive/"  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0ivs1sagq19xiw8jxd9f8w2b39svi0n9hrbmdvckwvqg95r8701g"))))
-    (build-system cmake-build-system)
-    (arguments `(#:tests? #f)) ; no tests included
-    (inputs
-     `(("mesa" ,mesa)))
-    ;; Extempore refuses to build on architectures other than x86_64
-    (supported-systems '("x86_64-linux"))
-    (home-page "https://github.com/extemporelang/nanovg")
-    (synopsis "2D vector drawing library on top of OpenGL")
-    (description "NanoVG is small antialiased vector graphics rendering
+  (let ((version "0.7.1")
+        (revision "0")
+        (commit "3c60175fcc2e5fe305b04355cdce35d499c80310"))
+    (package
+      (name "nanovg-for-extempore")
+      (version (git-version version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/extemporelang/nanovg.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0ddn3d3mxqn8hj9967v3pss7lz1wn08pcdnqzc118g7yjkq7hxzy"))))
+      (build-system cmake-build-system)
+      (arguments `(#:tests? #f))        ; no tests included
+      (inputs
+       `(("mesa" ,mesa)))
+      ;; Extempore refuses to build on architectures other than x86_64
+      (supported-systems '("x86_64-linux"))
+      (home-page "https://github.com/extemporelang/nanovg")
+      (synopsis "2D vector drawing library on top of OpenGL")
+      (description "NanoVG is small antialiased vector graphics rendering
 library for OpenGL.  It has lean API modeled after HTML5 canvas API.  It is
 aimed to be a practical and fun toolset for building scalable user interfaces
 and visualizations.")
-    (license license:zlib)))
+      (license license:zlib))))
 
 (define-public gl2ps
   (package
-- 
cgit v1.2.3


From fc570fab8039f5090997b082930db812846be5bf Mon Sep 17 00:00:00 2001
From: Giacomo Leidi 
Date: Mon, 20 Apr 2020 23:56:15 +0200
Subject: gnu: portmidi-for-extempore: Update to 217-0.8602f54.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/music.scm (portmidi-for-extempore): Update to 217-0.8602f54.
[version]: Use git-version to include latest changes.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/music.scm | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 7e8f5e581e..5227f450aa 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1979,24 +1979,27 @@ using a system-independent interface.")
     (license license:expat)))
 
 (define-public portmidi-for-extempore
-  (package (inherit portmidi)
-    (name "portmidi-for-extempore")
-    (version "217")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/extemporelang/portmidi.git")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1inriyrjf7xx2b7r54x0vmf9ngyqgr7g5060c22bwkbsgg53apzv"))))
-    (build-system cmake-build-system)
-    (arguments `(#:tests? #f)) ; no tests
-    (native-inputs '())
-    ;; Extempore refuses to build on architectures other than x86_64
-    (supported-systems '("x86_64-linux"))
-    (home-page "https://github.com/extemporelang/portmidi/")))
+  (let ((version "217")
+        (revision "0")
+        (commit "8602f548f71daf5ef638b2f7d224753400cb2158"))
+    (package (inherit portmidi)
+      (name "portmidi-for-extempore")
+      (version (git-version version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/extemporelang/portmidi.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1qidzl1s3kzhczzm96rcd2ppn27a97k2axgfh1zhvyf0s52d7m4w"))))
+      (build-system cmake-build-system)
+      (arguments `(#:tests? #f))        ; no tests
+      (native-inputs '())
+      ;; Extempore refuses to build on architectures other than x86_64
+      (supported-systems '("x86_64-linux"))
+      (home-page "https://github.com/extemporelang/portmidi/"))))
 
 (define-public python-pyportmidi
   (package
-- 
cgit v1.2.3


From 3ff2d2708cbece9985ee34b73e4b4d4be81eeafb Mon Sep 17 00:00:00 2001
From: Giacomo Leidi 
Date: Mon, 20 Apr 2020 23:56:16 +0200
Subject: gnu: extempore: Update to 0.8.6.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/music.scm (extempore): Update to 0.8.6.
[snippets]: Delete bundled dependencies.
[patches]: Add it.
* gnu/packages/patches/extempore-unbundle-external-dependencies.patch: Patch
  CMakeLists.txt to use system libraries.
* gnu/local.mk (dist_patch_DATA): Add it.

Signed-off-by: Ludovic Courtès 
---
 gnu/local.mk                                       |   1 +
 gnu/packages/music.scm                             |  87 +++++++------
 .../extempore-unbundle-external-dependencies.patch | 140 +++++++++++++++++++++
 3 files changed, 188 insertions(+), 40 deletions(-)
 create mode 100644 gnu/packages/patches/extempore-unbundle-external-dependencies.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3c6c98a284..9eb64b47b3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -879,6 +879,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/evolution-data-server-libical-compat.patch	\
   %D%/packages/patches/exiv2-CVE-2017-14860.patch		\
   %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch	\
+  %D%/packages/patches/extempore-unbundle-external-dependencies.patch	\
   %D%/packages/patches/extundelete-e2fsprogs-1.44.patch		\
   %D%/packages/patches/fastcap-mulGlobal.patch			\
   %D%/packages/patches/fastcap-mulSetup.patch			\
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5227f450aa..1e56154854 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -27,6 +27,7 @@
 ;;; Copyright © 2019, 2020 Alexandros Theodotou 
 ;;; Copyright © 2020 Vincent Legoll 
 ;;; Copyright © 2020 Lars-Dominik Braun 
+;;; Copyright © 2020 Giacomo Leidi 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -625,63 +626,73 @@ MusePack, Monkey's Audio, and WavPack files.")
 (define-public extempore
   (package
     (name "extempore")
-    (version "0.7.0")
+    (version "0.8.6")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/digego/extempore.git")
-                    (commit version)))
+                    (commit (string-append "v" version))))
               (sha256
                (base32
-                "12fsp7zkfxb9kykwq46l88kcbbici9arczrrsl4qn87m6vm5349l"))
-              (file-name (string-append name "-" version "-checkout"))))
+                "182jy23qv115dipny7kglwbn21z55dp253w1ykm0kh8n6vkgs7gp"))
+              (file-name (git-file-name name version))
+              (patches (search-patches
+                        "extempore-unbundle-external-dependencies.patch"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Remove bundled sources.
+                  (map delete-file-recursively
+                       '("src/portaudio"
+                         "src/pcre"))
+                  #t))))
     (build-system cmake-build-system)
     (arguments
-     `(;; The default target also includes ahead-of-time compilation of the
-       ;; standard libraries.  However, during the "install" phase this would
-       ;; happen *again* for unknown reasons.  Hence we only build the
-       ;; extempore executable during the build phase.
-       #:make-flags '("extempore")
-       #:configure-flags '("-DJACK=ON"
-                           ;; We want to distribute.
-                           "-DIN_TREE=OFF"
-                           ;; Don't download any dependencies.
-                           "-DBUILD_DEPS=OFF")
+     `(#:configure-flags (list "-DJACK=ON"
+                               "-DPACKAGE=ON"
+                               "-DEXTERNAL_SHLIBS_AUDIO=OFF"
+                               "-DEXTERNAL_SHLIBS_GRAPHICS=OFF"
+                               "-DCMAKE_BUILD_TYPE=Release"
+                               (string-append "-DEXT_SHARE_DIR="
+                                              (assoc-ref %outputs "out")
+                                              "/share"))
        #:modules ((ice-9 match)
                   (guix build cmake-build-system)
                   (guix build utils))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'build 'build-aot-libs
+           (lambda _
+             (for-each (lambda (target)
+                         (invoke "make" target))
+                       '("aot_base"
+                         "aot_math"
+                         "aot_instruments"))
+             #t))
+         (add-after 'unpack 'patch-install-locations
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "CMakeLists.txt"
+               (("EXT_SHARE_DIR=\"\\.\"\\)")
+                "EXT_SHARE_DIR=\"${EXT_SHARE_DIR}/extempore\")")
+               (("DESTINATION \"\\.\"\\)") "DESTINATION bin)")
+               (("DESTINATION \"\\.\"\n") "DESTINATION share/extempore\n"))
+             #t))
          (add-after 'unpack 'patch-directories
            (lambda* (#:key outputs #:allow-other-keys)
-             ;; Rewrite default path to runtime directory
-             (substitute* "src/Extempore.cpp"
-               (("runtimedir \\+= \"runtime\"")
-                (string-append "runtimedir = \""
-                               (assoc-ref outputs "out")
-                               "/lib/extempore/runtime\"")))
              (substitute* "extras/extempore.el"
                (("\\(runtime-directory \\(concat default-directory \"runtime\"\\)\\)")
                 (string-append "(runtime-directory \""
                                (assoc-ref outputs "out")
-                               "/lib/extempore/runtime"
+                               "/share/extempore/runtime"
                                "\")")))
              #t))
          (add-after 'unpack 'link-with-additional-libs
            (lambda _
              ;; The executable must be linked with libffi and zlib.
              (substitute* "CMakeLists.txt"
-               (("add_dependencies\\(aot_extended extended_deps\\)") "")
                (("target_link_libraries\\(extempore PRIVATE dl" line)
                 (string-append line " ffi z")))
              #t))
-         ;; FIXME: AOT compilation of the nanovg bindings fail with the error:
-         ;; "Compiler Error  could not bind _nvgLinearGradient"
-         (add-after 'unpack 'disable-nanovg
-           (lambda _
-             (substitute* "CMakeLists.txt"
-               (("aotcompile_lib\\(libs/external/nanovg.xtm.*") ""))
-             #t))
          ;; FIXME: All examples that are used as tests segfault for some
          ;; unknown reason.
          (add-after 'unpack 'disable-broken-tests
@@ -710,20 +721,16 @@ MusePack, Monkey's Audio, and WavPack files.")
                 ("gl/glcompat-directbind" "libGL.so" "mesa")))
              #t))
          (add-after 'unpack 'use-own-llvm
-          (lambda* (#:key inputs #:allow-other-keys)
-            (setenv "EXT_LLVM_DIR" (assoc-ref inputs "llvm"))
-            ;; Our LLVM builds shared libraries, so Extempore should use
-            ;; those.
-            (substitute* "CMakeLists.txt"
-              (("CMAKE_STATIC_LIBRARY") "CMAKE_SHARED_LIBRARY"))
-            #t))
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "EXT_LLVM_DIR" (assoc-ref inputs "llvm"))
+             ;; Our LLVM builds shared libraries, so Extempore should use
+             ;; those.
+             (substitute* "CMakeLists.txt"
+               (("CMAKE_STATIC_LIBRARY") "CMAKE_SHARED_LIBRARY"))
+             #t))
          (add-after 'unpack 'fix-aot-compilation
            (lambda* (#:key outputs #:allow-other-keys)
              (substitute* "CMakeLists.txt"
-               ;; EXT_SHARE_DIR does not exist before installation, so the
-               ;; working directory should be the source directory instead.
-               (("WORKING_DIRECTORY \\$\\{EXT_SHARE_DIR\\}")
-                "WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}")
                ;; Extempore needs to be told where the runtime is to be found.
                ;; While we're at it we disable automatic tuning for a specific
                ;; CPU to make binary substitution possible.
diff --git a/gnu/packages/patches/extempore-unbundle-external-dependencies.patch b/gnu/packages/patches/extempore-unbundle-external-dependencies.patch
new file mode 100644
index 0000000000..e9484f7994
--- /dev/null
+++ b/gnu/packages/patches/extempore-unbundle-external-dependencies.patch
@@ -0,0 +1,140 @@
+Remove build machinery for bundled dependencies.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 89e6125e..c5e90750 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,7 +36,7 @@ endif()
+ if(PACKAGE)
+   # this needs to be set before project() is called
+   set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
+-  set(ASSETS ON) # necessary for packaging
++  set(ASSETS OFF) # necessary for packaging
+   message(STATUS "Building Extempore for binary distribution (assets directory will be downloaded)")
+ endif()
+ 
+@@ -134,71 +134,6 @@ else()
+   message(FATAL_ERROR "Sorry, Extempore isn't supported on this platform - macOS, Linux & Windows only.")
+ endif()
+ 
+-########
+-# PCRE #
+-########
+-
+-# current in-tree PCRE version: 8.38
+-
+-add_library(pcre STATIC
+-  # headers
+-  src/pcre/config.h
+-  src/pcre/pcre.h
+-  src/pcre/ucp.h
+-  # source files
+-  src/pcre/pcre_chartables.c
+-  src/pcre/pcre_compile.c
+-  src/pcre/pcre_exec.c
+-  src/pcre/pcre_globals.c
+-  src/pcre/pcre_internal.h
+-  src/pcre/pcre_newline.c
+-  src/pcre/pcre_tables.c
+-  )
+-
+-target_compile_definitions(pcre
+-  PRIVATE -DHAVE_CONFIG_H
+-  )
+-
+-if(PACKAGE)
+-  target_compile_options(pcre
+-    PRIVATE -mtune=generic)
+-endif()
+-
+-#############
+-# portaudio #
+-#############
+-
+-add_library(portaudio STATIC
+-  src/portaudio/src/common/pa_allocation.c
+-  src/portaudio/src/common/pa_allocation.h
+-  src/portaudio/src/common/pa_converters.c
+-  src/portaudio/src/common/pa_converters.h
+-  src/portaudio/src/common/pa_cpuload.c
+-  src/portaudio/src/common/pa_cpuload.h
+-  src/portaudio/src/common/pa_debugprint.c
+-  src/portaudio/src/common/pa_debugprint.h
+-  src/portaudio/src/common/pa_dither.c
+-  src/portaudio/src/common/pa_dither.h
+-  src/portaudio/src/common/pa_endianness.h
+-  src/portaudio/src/common/pa_front.c
+-  src/portaudio/src/common/pa_hostapi.h
+-  src/portaudio/src/common/pa_memorybarrier.h
+-  src/portaudio/src/common/pa_process.c
+-  src/portaudio/src/common/pa_process.h
+-  src/portaudio/src/common/pa_ringbuffer.c
+-  src/portaudio/src/common/pa_ringbuffer.h
+-  src/portaudio/src/common/pa_stream.c
+-  src/portaudio/src/common/pa_stream.h
+-  src/portaudio/src/common/pa_trace.c
+-  src/portaudio/src/common/pa_trace.h
+-  src/portaudio/src/common/pa_types.h
+-  src/portaudio/src/common/pa_util.h
+-  )
+-
+-target_include_directories(portaudio
+-  PRIVATE src/portaudio/include
+-  PRIVATE src/portaudio/src/common)
+-
+ # platform-specific
+ 
+ if(APPLE)
+@@ -224,25 +159,8 @@ if(APPLE)
+ 
+ elseif(UNIX AND NOT APPLE)
+   # use ALSA on Linux
+-  target_sources(portaudio
+-    PRIVATE src/portaudio/src/hostapi/alsa/pa_linux_alsa.c
+-    PRIVATE src/portaudio/src/os/unix/pa_unix_hostapis.c
+-    PRIVATE src/portaudio/src/os/unix/pa_unix_util.c
+-    )
+-  target_include_directories(portaudio
+-    PRIVATE src/portaudio/src/os/unix)
+-  target_compile_definitions(portaudio
+-    PRIVATE -DPA_USE_ALSA)
+-  target_link_libraries(portaudio
+-    PRIVATE asound)
+ 
+   if(JACK)
+-    target_sources(portaudio
+-      PRIVATE src/portaudio/src/hostapi/jack/pa_jack.c)
+-    target_compile_definitions(portaudio
+-      PRIVATE -DPA_USE_JACK)
+-    target_link_libraries(portaudio
+-      PRIVATE jack)
+   endif()
+ 
+ elseif(WIN32)
+@@ -292,8 +210,6 @@ if(ASIO)
+ endif()
+ 
+ if(PACKAGE)
+-  target_compile_options(portaudio
+-    PRIVATE -mtune=generic)
+ endif()
+ 
+ ##############
+@@ -411,8 +327,6 @@ endif()
+ 
+ # dependencies
+ 
+-add_dependencies(extempore pcre portaudio)
+-
+ if(BUILD_LLVM)
+   if(WIN32)
+     add_dependencies(extempore LLVM-install)
+@@ -553,7 +467,7 @@ else()
+   install(TARGETS extempore
+     RUNTIME
+     DESTINATION ".")
+-  install(DIRECTORY assets runtime libs examples tests
++  install(DIRECTORY runtime libs examples
+     DESTINATION "."
+     PATTERN ".DS_Store" EXCLUDE)
+ endif()
-- 
cgit v1.2.3


From 5af2a8fe96e02bd694eae0ee467df25fd4ff1b24 Mon Sep 17 00:00:00 2001
From: Giacomo Leidi 
Date: Mon, 20 Apr 2020 23:56:17 +0200
Subject: gnu: emacs-extempore-mode: Update to 0.0.0-1.09518ae.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs-xyz.scm (emacs-extempore-mode): Update to to 0.0.0-1.09518ae.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index cb9405acf0..bf72133a88 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2455,7 +2455,7 @@ work with Emacs 24 and 25.")
 
 (define-public emacs-extempore-mode
   ;; Use the latest commit at time of packaging.  There are no releases or tags.
-  (let ((commit "848ad0084f27b92d1cf98dabffbad29f959a642d")
+  (let ((commit "09518ae6650d7be33a4633a4c0f31b7130d04c6e")
         (revision "1"))
     (package
       (name "emacs-extempore-mode")
@@ -2468,7 +2468,7 @@ work with Emacs 24 and 25.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "00wr025php7nl33x541s9rjm99hj0jbdcmnw9ljx5hqpm04aqm7c"))))
+          (base32 "0hfza9lzdsz94gxhmzyp9fwviscv19rmnjgd0q613faayn11sjsp"))))
       (build-system emacs-build-system)
       (home-page "https://github.com/extemporelang/extempore-emacs-mode")
       (synopsis "Emacs major mode for Extempore source files")
-- 
cgit v1.2.3


From afc57916e5398737e13d94b3823983783221eb63 Mon Sep 17 00:00:00 2001
From: Stefan 
Date: Sun, 26 Apr 2020 21:21:38 +0200
Subject: linux-boot: Allow the root file system to be mounted via NFS.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/build/linux-boot.scm (boot-system) Treat a root option with ":/" as an nfs source
and avoid to call 'canonicalize-device-spec' for it.

Signed-off-by: Ludovic Courtès 
---
 gnu/build/linux-boot.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 4fb711b8f2..05e833c0c6 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -534,10 +534,13 @@ upon error."
             ;; The "--root=SPEC" kernel command-line option always provides a
             ;; string, but the string can represent a device, a UUID, or a
             ;; label.  So check for all three.
-            (let ((root (cond ((string-prefix? "/" root) root)
-                              ((uuid root) => identity)
-                              (else (file-system-label root)))))
-              (mount-root-file-system (canonicalize-device-spec root)
+            (let ((device-spec (cond ((string-prefix? "/" root) root)
+                                     ((uuid root) => identity)
+                                     ((string-contains root ":/") #f) ; nfs
+                                     (else (file-system-label root)))))
+              (mount-root-file-system (if device-spec
+                                          (canonicalize-device-spec device-spec)
+                                          root)
                                       root-fs-type
                                       #:volatile-root? volatile-root?
                                       #:flags root-fs-flags
-- 
cgit v1.2.3


From a8cb1e72ef351330d1521833c1b270dcc0da593f Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Sat, 2 May 2020 12:30:53 +0100
Subject: gnu: behave: Fix build with Python 3.8.

Add a patch based on an upstream commit [1].

1: c000c88eb5239b87f299c85e83b349b0ef387ae7

* gnu/packages/patches/behave-skip-a-couple-of-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/check.scm (behave)[source]: Use the patch.
---
 gnu/local.mk                                       |   1 +
 gnu/packages/check.scm                             |   4 +-
 .../patches/behave-skip-a-couple-of-tests.patch    | 462 +++++++++++++++++++++
 3 files changed, 466 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/behave-skip-a-couple-of-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index acfc5cec4d..f48c6803ee 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -774,6 +774,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/bc-fix-cross-compilation.patch		\
   %D%/packages/patches/beancount-disable-googleapis-fonts.patch	\
   %D%/packages/patches/beets-werkzeug-compat.patch		\
+  %D%/packages/patches/behave-skip-a-couple-of-tests.patch	\
   %D%/packages/patches/beignet-correct-file-names.patch		\
   %D%/packages/patches/benchmark-unbundle-googletest.patch	\
   %D%/packages/patches/biber-fix-encoding-write.patch		\
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 05a796a3e3..2629e88323 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2107,7 +2107,9 @@ backported from Python 2.7 for Python 2.4+.")
              (uri (pypi-uri "behave" version))
              (sha256
               (base32
-               "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr"))))
+               "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr"))
+             (patches (search-patches
+                       "behave-skip-a-couple-of-tests.patch"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-mock" ,python-mock)
diff --git a/gnu/packages/patches/behave-skip-a-couple-of-tests.patch b/gnu/packages/patches/behave-skip-a-couple-of-tests.patch
new file mode 100644
index 0000000000..e3d4e15241
--- /dev/null
+++ b/gnu/packages/patches/behave-skip-a-couple-of-tests.patch
@@ -0,0 +1,462 @@
+Fix build with Python 3.8, this is a patch based on upstream commit [1].
+
+1: c000c88eb5239b87f299c85e83b349b0ef387ae7
+
+
+diff --git a/behave.ini b/behave.ini
+index 45c0f0d7..952240d6 100644
+--- a/behave.ini
++++ b/behave.ini
+@@ -15,8 +15,9 @@ show_skipped = false
+ format   = rerun
+     progress3
+ outfiles = rerun.txt
+-    reports/report_progress3.txt
++    build/behave.reports/report_progress3.txt
+ junit = true
++junit_directory = build/behave.reports
+ logging_level = INFO
+ # logging_format = LOG.%(levelname)-8s  %(name)-10s: %(message)s
+ # logging_format = LOG.%(levelname)-8s  %(asctime)s  %(name)-10s: %(message)s
+diff --git a/features/environment.py b/features/environment.py
+index 4744e89a..3769ee40 100644
+--- a/features/environment.py
++++ b/features/environment.py
+@@ -1,5 +1,7 @@
+ # -*- coding: UTF-8 -*-
++# FILE: features/environemnt.py
+ 
++from __future__ import absolute_import, print_function
+ from behave.tag_matcher import ActiveTagMatcher, setup_active_tag_values
+ from behave4cmd0.setup_command_shell import setup_command_shell_processors4behave
+ import platform
+@@ -20,6 +22,15 @@
+ }
+ active_tag_matcher = ActiveTagMatcher(active_tag_value_provider)
+ 
++
++def print_active_tags_summary():
++    active_tag_data = active_tag_value_provider
++    print("ACTIVE-TAG SUMMARY:")
++    print("use.with_python.version=%s" % active_tag_data.get("python.version"))
++    # print("use.with_os=%s" % active_tag_data.get("os"))
++    print()
++
++
+ # -----------------------------------------------------------------------------
+ # HOOKS:
+ # -----------------------------------------------------------------------------
+@@ -30,11 +41,14 @@ def before_all(context):
+     setup_python_path()
+     setup_context_with_global_params_test(context)
+     setup_command_shell_processors4behave()
++    print_active_tags_summary()
++
+ 
+ def before_feature(context, feature):
+     if active_tag_matcher.should_exclude_with(feature.tags):
+         feature.skip(reason=active_tag_matcher.exclude_reason)
+ 
++
+ def before_scenario(context, scenario):
+     if active_tag_matcher.should_exclude_with(scenario.effective_tags):
+         scenario.skip(reason=active_tag_matcher.exclude_reason)
+diff --git a/features/step.duplicated_step.feature b/features/step.duplicated_step.feature
+index 59888b0f..396cca27 100644
+--- a/features/step.duplicated_step.feature
++++ b/features/step.duplicated_step.feature
+@@ -32,11 +32,11 @@ Feature: Duplicated Step Definitions
+         AmbiguousStep: @given('I call Alice') has already been defined in
+         existing step @given('I call Alice') at features/steps/alice_steps.py:3
+         """
+-    And the command output should contain:
+-        """
+-        File "features/steps/alice_steps.py", line 7, in 
+-        @given(u'I call Alice')
+-        """
++    # -- DISABLED: Python 3.8 traceback line numbers differ w/ decorators (+1).
++    # And the command output should contain:
++    #    """
++    #    File "features/steps/alice_steps.py", line 7, in 
++    #    """
+ 
+ 
+   Scenario: Duplicated Step Definition in another File
+@@ -70,11 +70,11 @@ Feature: Duplicated Step Definitions
+         AmbiguousStep: @given('I call Bob') has already been defined in
+         existing step @given('I call Bob') at features/steps/bob1_steps.py:3
+         """
+-    And the command output should contain:
+-        """
+-        File "features/steps/bob2_steps.py", line 3, in 
+-        @given('I call Bob')
+-        """
++    # -- DISABLED: Python 3.8 traceback line numbers differ w/ decorators (+1).
++    # And the command output should contain:
++    #    """
++    #    File "features/steps/bob2_steps.py", line 3, in 
++    #    """
+ 
+   @xfail
+   Scenario: Duplicated Same Step Definition via import from another File
+diff --git a/issue.features/environment.py b/issue.features/environment.py
+index 2dfec751..7e48ee03 100644
+--- a/issue.features/environment.py
++++ b/issue.features/environment.py
+@@ -1,5 +1,5 @@
+ # -*- coding: UTF-8 -*-
+-# FILE: features/environment.py
++# FILE: issue.features/environemnt.py
+ # pylint: disable=unused-argument
+ """
+ Functionality:
+@@ -7,17 +7,20 @@
+   * active tags
+ """
+ 
+-from __future__ import print_function
++
++from __future__ import absolute_import, print_function
+ import sys
+ import platform
+ import os.path
+ import six
+ from behave.tag_matcher import ActiveTagMatcher
+ from behave4cmd0.setup_command_shell import setup_command_shell_processors4behave
+-# PREPARED:
+-# from behave.tag_matcher import setup_active_tag_values
++# PREPARED: from behave.tag_matcher import setup_active_tag_values
+ 
+ 
++# ---------------------------------------------------------------------------
++# TEST SUPPORT: For Active Tags
++# ---------------------------------------------------------------------------
+ def require_tool(tool_name):
+     """Check if a tool (an executable program) is provided on this platform.
+ 
+@@ -45,12 +48,14 @@ def require_tool(tool_name):
+     # print("TOOL-NOT-FOUND: %s" % tool_name)
+     return False
+ 
++
+ def as_bool_string(value):
+     if bool(value):
+         return "yes"
+     else:
+         return "no"
+ 
++
+ def discover_ci_server():
+     # pylint: disable=invalid-name
+     ci_server = "none"
+@@ -67,11 +72,17 @@ def discover_ci_server():
+     return ci_server
+ 
+ 
++# ---------------------------------------------------------------------------
++# BEHAVE SUPPORT: Active Tags
++# ---------------------------------------------------------------------------
+ # -- MATCHES ANY TAGS: @use.with_{category}={value}
+ # NOTE: active_tag_value_provider provides category values for active tags.
++python_version = "%s.%s" % sys.version_info[:2]
+ active_tag_value_provider = {
++    "platform": sys.platform,
+     "python2": str(six.PY2).lower(),
+     "python3": str(six.PY3).lower(),
++    "python.version": python_version,
+     # -- python.implementation: cpython, pypy, jython, ironpython
+     "python.implementation": platform.python_implementation().lower(),
+     "pypy":    str("__pypy__" in sys.modules).lower(),
+@@ -82,17 +92,33 @@ def discover_ci_server():
+ }
+ active_tag_matcher = ActiveTagMatcher(active_tag_value_provider)
+ 
++
++def print_active_tags_summary():
++    active_tag_data = active_tag_value_provider
++    print("ACTIVE-TAG SUMMARY:")
++    print("use.with_python.version=%s" % active_tag_data.get("python.version"))
++    # print("use.with_platform=%s" % active_tag_data.get("platform"))
++    # print("use.with_os=%s" % active_tag_data.get("os"))
++    print()
++
++
++# ---------------------------------------------------------------------------
++# BEHAVE HOOKS:
++# ---------------------------------------------------------------------------
+ def before_all(context):
+     # -- SETUP ACTIVE-TAG MATCHER (with userdata):
+     # USE: behave -D browser=safari ...
+-    # NOT-NEEDED: setup_active_tag_values(active_tag_value_provider,
+-    #                                     context.config.userdata)
++    # NOT-NEEDED:
++    # setup_active_tag_values(active_tag_value_provider, context.config.userdata)
+     setup_command_shell_processors4behave()
++    print_active_tags_summary()
++
+ 
+ def before_feature(context, feature):
+     if active_tag_matcher.should_exclude_with(feature.tags):
+         feature.skip(reason=active_tag_matcher.exclude_reason)
+ 
++
+ def before_scenario(context, scenario):
+     if active_tag_matcher.should_exclude_with(scenario.effective_tags):
+         scenario.skip(reason=active_tag_matcher.exclude_reason)
+diff --git a/issue.features/issue0330.feature b/issue.features/issue0330.feature
+index dc1ebe75..81cb6e29 100644
+--- a/issue.features/issue0330.feature
++++ b/issue.features/issue0330.feature
+@@ -70,6 +70,7 @@ Feature: Issue #330: Skipped scenarios are included in junit reports when --no-s
+     And note that "bob.feature is skipped"
+ 
+ 
++  @not.with_python.version=3.8
+   Scenario: Junit report for skipped feature is created with --show-skipped
+     When I run "behave --junit -t @tag1 --show-skipped @alice_and_bob.featureset"
+     Then it should pass with:
+@@ -83,6 +84,23 @@ Feature: Issue #330: Skipped scenarios are included in junit reports when --no-s
+       
+       """
+ 
++  @use.with_python.version=3.8
++  Scenario: Junit report for skipped feature is created with --show-skipped
++    When I run "behave --junit -t @tag1 --show-skipped @alice_and_bob.featureset"
++    Then it should pass with:
++      """
++      1 feature passed, 0 failed, 1 skipped
++      """
++    And a file named "test_results/TESTS-alice.xml" exists
++    And a file named "test_results/TESTS-bob.xml" exists
++    And the file "test_results/TESTS-bob.xml" should contain:
++      """
++      
++      """
++      # -- HINT FOR: Python < 3.8
++      # 
++
++  @not.with_python.version=3.8
+   Scenario: Junit report for skipped scenario is neither shown nor counted with --no-skipped
+     When I run "behave --junit -t @tag1 --no-skipped"
+     Then it should pass with:
+@@ -102,7 +120,30 @@ Feature: Issue #330: Skipped scenarios are included in junit reports when --no-s
+       """
+     And note that "Charly2 is the skipped scenarion in charly.feature"
+ 
++  @use.with_python.version=3.8
++  Scenario: Junit report for skipped scenario is neither shown nor counted with --no-skipped
++    When I run "behave --junit -t @tag1 --no-skipped"
++    Then it should pass with:
++      """
++      2 features passed, 0 failed, 1 skipped
++      2 scenarios passed, 0 failed, 2 skipped
++      """
++    And a file named "test_results/TESTS-alice.xml" exists
++    And a file named "test_results/TESTS-charly.xml" exists
++    And the file "test_results/TESTS-charly.xml" should contain:
++      """
++      "
+ 
+ 
++    @use.with_python.version=3.8
++    Scenario: Hook error in before_scenario()
++      When I run "behave -f plain --junit features/before_scenario_failure.feature"
++      Then it should fail with:
++        """
++        0 scenarios passed, 1 failed, 0 skipped
++        """
++      And the command output should contain:
++        """
++        HOOK-ERROR in before_scenario: RuntimeError: OOPS
++        """
++      And the file "reports/TESTS-before_scenario_failure.xml" should contain:
++        """
++        
++        """
++        # -- HINT FOR: Python < 3.8
++        # 
++      And the file "reports/TESTS-before_scenario_failure.xml" should contain:
++        """
++        File "features/environment.py", line 6, in before_scenario
++          cause_hook_failure()
++        File "features/environment.py", line 2, in cause_hook_failure
++          raise RuntimeError("OOPS")
++        """
++      And note that "the traceback is contained in the XML element "
++
++
++    @not.with_python.version=3.8
+     Scenario: Hook error in after_scenario()
+       When I run "behave -f plain --junit features/after_scenario_failure.feature"
+       Then it should fail with:
+@@ -114,3 +149,38 @@ Feature: Issue #446 -- Support scenario hook-errors with JUnitReporter
+           raise RuntimeError("OOPS")
+         """
+       And note that "the traceback is contained in the XML element "
++
++
++    @use.with_python.version=3.8
++    Scenario: Hook error in after_scenario()
++      When I run "behave -f plain --junit features/after_scenario_failure.feature"
++      Then it should fail with:
++        """
++        0 scenarios passed, 1 failed, 0 skipped
++        """
++      And the command output should contain:
++        """
++          Scenario: B1
++            Given another step passes ... passed
++        HOOK-ERROR in after_scenario: RuntimeError: OOPS
++        """
++      And the file "reports/TESTS-after_scenario_failure.xml" should contain:
++        """
++        
++        """
++        # -- HINT FOR: Python < 3.8
++        # 
++      And the file "reports/TESTS-after_scenario_failure.xml" should contain:
++        """
++        File "features/environment.py", line 10, in after_scenario
++          cause_hook_failure()
++        File "features/environment.py", line 2, in cause_hook_failure
++          raise RuntimeError("OOPS")
++        """
++      And note that "the traceback is contained in the XML element "
+diff --git a/issue.features/issue0457.feature b/issue.features/issue0457.feature
+index f80640e9..46f96e9c 100644
+--- a/issue.features/issue0457.feature
++++ b/issue.features/issue0457.feature
+@@ -24,6 +24,7 @@ Feature: Issue #457 -- Double-quotes in error messages of JUnit XML reports
+         """
+ 
+ 
++    @not.with_python.version=3.8
+     Scenario: Use failing assertation in a JUnit XML report
+       Given a file named "features/fails1.feature" with:
+         """
+@@ -44,6 +45,31 @@ Feature: Issue #457 -- Double-quotes in error messages of JUnit XML reports
+         
++        """
++        # -- HINT FOR: Python < 3.8
++        #  I am
++              '''
++        """
++      When I run "behave --junit features/fails2.feature"
++      Then it should fail with:
++        """
++        0 scenarios passed, 1 failed, 0 skipped
++        """
++      And the file "reports/TESTS-fails2.xml" should contain:
++        """
++        
++        """
++        # -- HINT FOR: Python < 3.8
++        # 
Date: Sat, 2 May 2020 13:58:34 +0200
Subject: gnu: ledger: Build with Python 3.

* gnu/packages/finance.scm (ledger)[inputs]: Change from PYTHON-2 to PYTHON.
---
 gnu/packages/finance.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 61d807190c..201ff3d1bd 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -258,7 +258,7 @@ and dynamically with report tools based on filtering and graphical charts.")
        ("gmp" ,gmp)
        ("libedit" ,libedit)
        ("mpfr" ,mpfr)
-       ("python" ,python-2)
+       ("python" ,python)
        ("utfcpp" ,utfcpp)))
     (native-inputs
      `(("groff" ,groff)
-- 
cgit v1.2.3


From f7228e317703808a8a193f6db8a3cb6ba5380f2f Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Sat, 2 May 2020 14:48:29 +0200
Subject: gnu: Add musl-cross.

* gnu/packages/patches/musl-cross-locate.patch: New file.
* gnu/packages/heads.scm: New file.
* gnu/local.mk (dist_patch_DATA): Add one.
(GNU_SYSTEM_MODULES): Add the other.
---
 gnu/local.mk                                 |   2 +
 gnu/packages/heads.scm                       | 163 +++++++++++++++++++++++++++
 gnu/packages/patches/musl-cross-locale.patch |  20 ++++
 3 files changed, 185 insertions(+)
 create mode 100644 gnu/packages/heads.scm
 create mode 100644 gnu/packages/patches/musl-cross-locale.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 9eb64b47b3..3c9a10b6bc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -260,6 +260,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/haskell-crypto.scm		\
   %D%/packages/haskell-web.scm			\
   %D%/packages/haskell-xyz.scm			\
+  %D%/packages/heads.scm			\
   %D%/packages/hexedit.scm			\
   %D%/packages/hugs.scm				\
   %D%/packages/hurd.scm				\
@@ -1240,6 +1241,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/mumps-shared-pord.patch			\
   %D%/packages/patches/mupen64plus-ui-console-notice.patch	\
   %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch    \
+  %D%/packages/patches/musl-cross-locale.patch			\
   %D%/packages/patches/mutt-store-references.patch		\
   %D%/packages/patches/m4-gnulib-libio.patch			\
   %D%/packages/patches/ncompress-fix-softlinks.patch		\
diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm
new file mode 100644
index 0000000000..b28433431c
--- /dev/null
+++ b/gnu/packages/heads.scm
@@ -0,0 +1,163 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Danny Milosavljevic 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (gnu packages heads)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages assembly)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages elf)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages cpio)
+  #:use-module (gnu packages file)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages virtualization)
+  #:use-module ((guix build utils) #:select (alist-replace)))
+
+(define-public musl-cross
+  (let ((revision "3")
+        (commit "a8a66490dae7f23a2cf5e256f3a596d1ccfe1a03"))
+  (package
+    (name "musl-cross")
+    (version (git-version "0.1" revision commit))
+    (source
+     (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/GregorR/musl-cross")
+              (commit commit)))
+        (file-name "musl-cross-checkout")
+        (sha256
+         (base32
+          "1xvl9y017wb2qaphy9zqh3vrhm8hklr8acvzzcjc35d1jjhyl58y"))
+        (patches (search-patches "musl-cross-locale.patch"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; No tests in main project.
+       #:modules
+       ((guix build utils)
+        (guix build gnu-build-system)
+        (srfi srfi-1)) ; drop
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda _
+             (setenv "SHELL" "bash")
+             (setenv "CONFIG_SHELL" "bash")
+             #t))
+         (add-after 'unpack 'unpack-dependencies
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (define (install-file* source-key destination-directory
+                                    destination-suffix)
+               (let* ((source-file (assoc-ref inputs source-key))
+                      (source-basename (basename source-file))
+                      (source-parts (string-split source-basename #\-))
+                      (destination-file
+                       (string-join (drop source-parts 1) "-")))
+                 (copy-file source-file
+                  (string-append destination-directory "/"
+                                 destination-file destination-suffix))))
+             (for-each (lambda (name)
+                         (install-file* name "tarballs" ""))
+                       '("binutils" "target-gcc-5" "linux-headers" "musl"))
+             (copy-file (string-append (assoc-ref inputs "config.sub")
+                                       "/share/automake-1.16/config.sub")
+                        "tarballs/config.sub;hb=3d5db9ebe860")
+             (copy-file (string-append (assoc-ref inputs "config.sub")
+                                       "/share/automake-1.16/config.guess")
+                        "tarballs/config.guess;hb=3d5db9ebe860")
+             (substitute* "config.sh"
+              (("^CC_BASE_PREFIX=.*")
+               (string-append "CC_BASE_PREFIX=" (assoc-ref outputs "out")
+                              "/crossgcc\n")))
+             ;; Note: Important: source/gcc-5.3.0/gcc/exec-tool.in
+             ;; Note: Important: source/kernel-headers-3.12.6-5/tools/install.sh
+             ;; Note: Important: move-if-change (twice)
+             ;; Make sure that shebangs are patched after new extractions.
+             (substitute* "defs.sh"
+              (("touch \"[$]2/extracted\"")
+               (string-append "touch \"$2/extracted\"
+for s in mkinstalldirs move-if-change compile depcomp callprocs configure \\
+mkdep compile libtool-ldflags config.guess install-sh missing config.sub \\
+config.rpath progtest.m4 lib-ld.m4 acx.m4 gen-fixed.sh mkheader.sh ylwrap \\
+merge.sh godeps.sh lock-and-run.sh print-sysroot-suffix.sh mkconfig.sh \\
+genmultilib exec-tool.in install.sh
+do
+  find . -name $s -exec sed -i -e 's;!/bin/sh;!" (assoc-ref inputs "bash")
+"/bin/sh;' '{}' ';'
+  find . -name $s -exec sed -i -e 's; /bin/sh; " (assoc-ref inputs "bash")
+"/bin/sh;' '{}' ';'
+done
+" )))
+             #t))
+         (replace 'build
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "./build.sh")))
+         (delete 'install))))
+    (native-inputs
+     `(("config.sub" ,automake)
+       ("bash" ,bash)
+       ("flex" ,flex)
+       ("gmp" ,gmp)
+       ("mpfr" ,mpfr)
+       ("mpc" ,mpc)
+       ("binutils"
+        ,(origin
+           (method url-fetch)
+           (uri "https://ftpmirror.gnu.org/gnu/binutils/binutils-2.27.tar.bz2")
+           (sha256
+            (base32 "125clslv17xh1sab74343fg6v31msavpmaa1c1394zsqa773g5rn"))))
+       ("target-gcc-5"
+        ,(origin
+           (method url-fetch)
+           (uri "https://ftpmirror.gnu.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.tar.bz2")
+           (sha256
+            (base32 "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq"))))
+       ("linux-headers"
+        ,(origin
+           (method url-fetch)
+           (uri "http://ftp.barfooze.de/pub/sabotage/tarballs/linux-headers-4.19.88.tar.xz")
+           (sha256
+            (base32 "1srgi2nqw892jb6yd4kzacf2xzwfvzhsv2957xfh1nvbs7varwyk"))))
+       ("musl"
+        ,(origin
+           (method url-fetch)
+           (uri "http://www.musl-libc.org/releases/musl-1.1.24.tar.gz")
+           (sha256
+            (base32 "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k"))))))
+    (home-page "https://github.com/osresearch/heads")
+    (synopsis "Musl-cross gcc 5 toolchain")
+    (description "Musl-cross toolchain: binutils, gcc 5 and musl.")
+    (license license:isc))))
diff --git a/gnu/packages/patches/musl-cross-locale.patch b/gnu/packages/patches/musl-cross-locale.patch
new file mode 100644
index 0000000000..7634eda381
--- /dev/null
+++ b/gnu/packages/patches/musl-cross-locale.patch
@@ -0,0 +1,20 @@
+Disable locales other than C and POSIX because of a compilation error.
+By Danny Milosavljevic 
+This patch is distributed under BSD-3 license.
+See https://github.com/osresearch/heads/pull/610
+diff -ruN b/source/patches/gcc-5.3.0-locale.diff guix-build-musl-cross-0.1-3.a8a6649.drv-12/source/patches/gcc-5.3.0-locale.diff
+--- a/patches/gcc-5.3.0-locale.diff	1970-01-01 01:00:00.000000000 +0100
++++ b/patches/gcc-5.3.0-locale.diff	2020-05-02 14:20:47.213564509 +0200
+@@ -0,0 +1,12 @@
++--- gcc-5.3.0/libstdc++-v3/config/locale/gnu/ctype_members.cc.orig	2020-05-02 14:16:31.376147000 +0200
+++++ gcc-5.3.0/libstdc++-v3/config/locale/gnu/ctype_members.cc	2020-05-02 14:16:56.716279576 +0200
++@@ -47,7 +47,8 @@
++ 	this->_S_create_c_locale(this->_M_c_locale_ctype, __s); 
++ 	this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
++ 	this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
++-	this->_M_table = this->_M_c_locale_ctype->__ctype_b;
+++	//this->_M_table = this->_M_c_locale_ctype->__ctype_b;
+++	throw 3;
++       }
++   }
++ 
-- 
cgit v1.2.3


From e4aa83be33d7a7bc24ccd77a89fa5dfd0edbf1c5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 2 May 2020 17:56:47 +0200
Subject: gnu: openconnect: Update to 8.09 [fixes CVE-2020-12105].

* gnu/packages/vpn.scm (openconnect): Update to 8.09.
---
 gnu/packages/vpn.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index a9e20049c6..2da1a7c2a4 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2014 Eric Bavier 
 ;;; Copyright © 2015 Jeff Mickey 
 ;;; Copyright © 2016, 2017, 2019 Efraim Flashner 
-;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice 
+;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Julien Lepiller 
 ;;; Copyright © 2018 Pierre Langlois 
 ;;; Copyright © 2018 Meiyo Peng 
@@ -245,13 +245,13 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer
 (define-public openconnect
   (package
    (name "openconnect")
-   (version "8.08")
+   (version "8.09")
    (source (origin
             (method url-fetch)
             (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/"
                                 "openconnect-" version ".tar.gz"))
             (sha256
-             (base32 "1s3rjdazx1n5izpcgz05p1sirm7kf4z3gh26dq2h2j5xmgmk0jxp"))))
+             (base32 "19p91hs6j348qp0v9c7abl3rb8d9ncc37k743qhrn29s9jz0567k"))))
    (build-system gnu-build-system)
    (propagated-inputs
     `(("libxml2" ,libxml2)
-- 
cgit v1.2.3


From 1d7f3c00b0b57fcafb3c00fa016e55278a633a36 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 2 May 2020 18:02:06 +0200
Subject: gnu: openconnect: Add LZ4 support.

* gnu/packages/vpn.scm (openconnect)[inputs]: Add lz4.
---
 gnu/packages/vpn.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 2da1a7c2a4..2beff48964 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -258,7 +258,8 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer
       ("gnutls" ,gnutls-3.6.13)
       ("zlib" ,zlib)))
    (inputs
-    `(("vpnc-scripts" ,vpnc-scripts)))
+    `(("lz4" ,lz4)
+      ("vpnc-scripts" ,vpnc-scripts)))
    (native-inputs
     `(("gettext" ,gettext-minimal)
       ("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From 5bcb149c45378baac767bd18d3b83f503bf2a2ff Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov 
Date: Sat, 2 May 2020 21:28:28 +0300
Subject: gnu: youtube-dl: Update to 2020.05.03.

* gnu/packages/video.scm (youtube-dl): Update to 2020.05.03.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dbea0afcf6..6656b892d8 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1610,7 +1610,7 @@ To load this plugin, specify the following option when starting mpv:
 (define-public youtube-dl
   (package
     (name "youtube-dl")
-    (version "2020.03.24")
+    (version "2020.05.03")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/ytdl-org/youtube-dl/"
@@ -1618,7 +1618,7 @@ To load this plugin, specify the following option when starting mpv:
                                   version ".tar.gz"))
               (sha256
                (base32
-                "05l4asakakxn53wrvxn6c03fd80zdizdbj6r2cj8c1ja3sj9i8s5"))))
+                "0qigk1bml6vkck4rs0wnmr46j5gkz04zn30jvnw1r4czjs7vnpal"))))
     (build-system python-build-system)
     (arguments
      ;; The problem here is that the directory for the man page and completion
-- 
cgit v1.2.3


From 00e0240ec0a5522764a5d7520b89d5286fce819a Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Sat, 2 May 2020 16:35:22 -0400
Subject: gnu: linux-libre: Update deblob scripts.

* gnu/packages/linux.scm (deblob-scripts-5.4): Update to 5.4.37.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index dd945aad51..0d2e7b1afe 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -200,9 +200,9 @@ defconfig.  Return the appropriate make target if applicable, otherwise return
 
 (define deblob-scripts-5.4
   (linux-libre-deblob-scripts
-   "5.4.28"
+   "5.4.37"
    (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25")
-   (base32 "08ls4gx5vanyiq9rn0869nfq4piw4lx1dl8hh9w9xgkr4ypc1j4k")))
+   (base32 "10qb890is4z58vr8czh3xx69q62l3b3j38y410kgiw8nii3zx5lr")))
 
 (define deblob-scripts-4.19
   (linux-libre-deblob-scripts
-- 
cgit v1.2.3


From c70b31df510bda2ad617b222d282b04f529d94c1 Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Sat, 2 May 2020 16:27:22 -0400
Subject: gnu: linux-libre@4.4: Update to 4.4.221.

* gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.221.
(linux-libre-4.4-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 0d2e7b1afe..88da521da4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -409,10 +409,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.9)))
 
-(define-public linux-libre-4.4-version "4.4.220")
+(define-public linux-libre-4.4-version "4.4.221")
 (define-public linux-libre-4.4-pristine-source
   (let ((version linux-libre-4.4-version)
-        (hash (base32 "1knj3qsl7x3fysdz1h0s980ddbafs3658z2y67w6sn79wp7d8blg")))
+        (hash (base32 "06rpjnvrdp71flz948mfmx7jv8x2vmdg54zz1xpkb2458mwh5hbq")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.4)))
-- 
cgit v1.2.3


From 8321da88a88c691e8a992282d1848a2009104a73 Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Sat, 2 May 2020 16:28:19 -0400
Subject: gnu: linux-libre@4.9: Update to 4.9.221.

* gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.221.
(linux-libre-4.9-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 88da521da4..8a7e726f66 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -401,10 +401,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
 
-(define-public linux-libre-4.9-version "4.9.220")
+(define-public linux-libre-4.9-version "4.9.221")
 (define-public linux-libre-4.9-pristine-source
   (let ((version linux-libre-4.9-version)
-        (hash (base32 "0bhbkybzbdsbmrjmb5m7hxxl8b3v6n79zhh86cbr95kzg1hcgnfs")))
+        (hash (base32 "1gh1x73xblxkb927igc3shrqnn49lcscwrq2fixmk9n7jb7q2hp6")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.9)))
-- 
cgit v1.2.3


From a5ab7c7c317c58cb997558a499e8c44c296bcf5a Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Sat, 2 May 2020 16:28:46 -0400
Subject: gnu: linux-libre@4.14: Update to 4.14.178.

* gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.178.
(linux-libre-4.14-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8a7e726f66..3e4e63096d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -393,10 +393,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
 
-(define-public linux-libre-4.14-version "4.14.177")
+(define-public linux-libre-4.14-version "4.14.178")
 (define-public linux-libre-4.14-pristine-source
   (let ((version linux-libre-4.14-version)
-        (hash (base32 "04hq0i06mg2yc09jj2xk0vhf5q9yigzjzm55a5bvfy2a6j43r9rk")))
+        (hash (base32 "1pcqxmq9ir4f963aiw5bab9w2mp4vfiwaq2bk7nksbl2bs3k6b7x")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
-- 
cgit v1.2.3


From a970bab0e7b2bb937d9d87f71f04498cc49a8f78 Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Sat, 2 May 2020 16:29:27 -0400
Subject: gnu: linux-libre@4.19: Update to 4.19.120.

* gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.120.
(linux-libre-4.19-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3e4e63096d..4cc5f8562f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -385,10 +385,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.4)))
 
-(define-public linux-libre-4.19-version "4.19.119")
+(define-public linux-libre-4.19-version "4.19.120")
 (define-public linux-libre-4.19-pristine-source
   (let ((version linux-libre-4.19-version)
-        (hash (base32 "1klvdzz8sndg2zsr1anfy9p5fc1aapjqvc249myrbndyf55bk91b")))
+        (hash (base32 "03mjng5ws9y56id99619ysarz73qqyylgc3mlknga1yphbhh16qb")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
-- 
cgit v1.2.3


From 02c792b505269060a2b03de5dd4119ade3300753 Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Sat, 2 May 2020 16:30:17 -0400
Subject: gnu: linux-libre@5.6: Update to 5.6.10.

* gnu/packages/linux.scm (linux-libre-5.6-version): Update to 5.6.10.
(linux-libre-5.6-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4cc5f8562f..d7e1c88a25 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -369,10 +369,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
     (sha256 hash)))
 
 
-(define-public linux-libre-5.6-version "5.6.8")
+(define-public linux-libre-5.6-version "5.6.10")
 (define-public linux-libre-5.6-pristine-source
   (let ((version linux-libre-5.6-version)
-        (hash (base32 "1pw2q9509jzp84b6qasaais2ws25v2wrjh072q0x3j520zzl5q8r")))
+        (hash (base32 "1f81b0icn0r9gww95rckyxs5d4g8bwf4mmqkrmwxxf4xga19dp3v")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.6)))
-- 
cgit v1.2.3


From 8a0b02c248a9877812cce29641bb1843cb77ea19 Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Sat, 2 May 2020 16:30:55 -0400
Subject: gnu: linux-libre: Update to 5.4.38.

* gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.38.
(linux-libre-5.4-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d7e1c88a25..df442920de 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -377,10 +377,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.6)))
 
-(define-public linux-libre-5.4-version "5.4.36")
+(define-public linux-libre-5.4-version "5.4.38")
 (define-public linux-libre-5.4-pristine-source
   (let ((version linux-libre-5.4-version)
-        (hash (base32 "13avfvimjyg4lhj9micgib9bb5qpx11cja5liypid0rf2acfmymr")))
+        (hash (base32 "03pks3jx5kk0wnhjkm92wxdbgw8qbdg93sfwchnx88m2wfj9yaz7")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.4)))
-- 
cgit v1.2.3


From b34793c14372fbda2246d68ef6270f1207e53e98 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 3 May 2020 09:23:44 +0300
Subject: gnu: efl: Update to 1.24.0.

* gnu/packages/enlightenment.scm (efl): Update to 1.24.0.
[propagated-inputs]: Remove bullet. Add libpng. Move libtiff, libwebp ...
[inputs]: ... to here. Add openjpeg. Remove libxp.
[arguments]: In configure-flags disable scim, enable avahi, glib. Use
setuid mount/umount binaries.
---
 gnu/packages/enlightenment.scm | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 4a65c55af9..a154c0403c 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Tomáš Čech 
 ;;; Copyright © 2015 Daniel Pimentel 
-;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner 
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner 
 ;;; Copyright © 2017 ng0 
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Timo Eisenmann 
@@ -69,7 +69,7 @@
 (define-public efl
   (package
     (name "efl")
-    (version "1.23.3")
+    (version "1.24.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -77,7 +77,7 @@
                     version ".tar.xz"))
               (sha256
                (base32
-                "00b9lp3h65254kdb1ys15fv7p3ln7qsvf15jkw4kli5ymagadkjk"))))
+                "1yhck2g4rwlzgnzqa4wjxw3lf6k6rd730hz4bwzajdjy7i26xfdk"))))
     (build-system meson-build-system)
     (native-inputs
      `(("check" ,check)
@@ -93,6 +93,7 @@
        ("libraw" ,libraw)
        ("librsvg" ,librsvg)
        ("libspectre" ,libspectre)
+       ("libtiff" ,libtiff)
        ("libxau" ,libxau)
        ("libxcomposite" ,libxcomposite)
        ("libxcursor" ,libxcursor)
@@ -102,18 +103,18 @@
        ("libxi" ,libxi)
        ("libxfixes" ,libxfixes)
        ("libxinerama" ,libxinerama)
-       ("libxp" ,libxp)
        ("libxrandr" ,libxrandr)
        ("libxrender" ,libxrender)
        ("libxss" ,libxscrnsaver)
        ("libxtst" ,libxtst)
+       ("libwebp" ,libwebp)
+       ("openjpeg" ,openjpeg)
        ("poppler" ,poppler)
        ("wayland-protocols" ,wayland-protocols)))
     (propagated-inputs
      ;; All these inputs are in package config files in section
      ;; Requires.private.
      `(("avahi" ,avahi)
-       ("bullet" ,bullet)
        ("dbus" ,dbus)
        ("elogind" ,elogind)
        ("eudev" ,eudev)
@@ -122,15 +123,13 @@
        ("fribidi" ,fribidi)
        ("glib" ,glib)
        ("harfbuzz" ,harfbuzz)
-       ("luajit" ,luajit)
        ("libinput" ,libinput-minimal)
        ("libjpeg" ,libjpeg)
-       ("libpng" ,libpng)
        ("libsndfile" ,libsndfile)
-       ("libtiff" ,libtiff)
-       ("libwebp" ,libwebp)
+       ("libpng" ,libpng)
        ("libx11" ,libx11)
        ("libxkbcommon" ,libxkbcommon)
+       ("luajit" ,luajit)
        ("lz4" ,lz4)
        ("openssl" ,openssl)
        ("pulseaudio" ,pulseaudio)
@@ -139,13 +138,18 @@
        ("zlib" ,zlib)))
     (arguments
      `(#:configure-flags '("-Dsystemd=false"
+                           "-Delogind=true"
                            "-Dembedded-lz4=false"
                            "-Devas-loaders-disabler=json"
                            "-Dbuild-examples=false"
+                           "-Decore-imf-loaders-disabler=scim"
+                           "-Davahi=true"
+                           "-Dglib=true"
+                           "-Dmount-path=/run/setuid-programs/mount"
+                           "-Dunmount-path=/run/setuid-programs/umount"
                            ;(string-append "-Ddictionaries-hyphen-dir="
                            ;               (assoc-ref %build-inputs "hyphen")
                            ;               "/share/hyphen")
-                           "-Delogind=true"
                            "-Dnetwork-backend=connman"
                            ,@(match (%current-system)
                                ("armhf-linux"
@@ -153,8 +157,8 @@
                                (_
                                 '("-Dopengl=full")))
                            ;; for wayland
-                           "-Dwl-deprecated=true" ; ecore_wayland
-                           "-Ddrm-deprecated=true" ; ecore_drm
+                           "-Dwl-deprecated=true"   ; ecore_wayland
+                           "-Ddrm-deprecated=true"  ; ecore_drm
                            "-Dwl=true"
                            "-Ddrm=true")
        #:tests? #f ; Many tests fail due to timeouts and network requests.
-- 
cgit v1.2.3


From 5a743e1ef0f88bdd3ec358e1e90802328daf5e2b Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 3 May 2020 09:25:22 +0300
Subject: gnu: enlightenment: Change mount/umount binaries.

* gnu/packages/enlightenment.scm (enlightenment)[arugments]: Use the
setuid binaries for mount/umount.
---
 gnu/packages/enlightenment.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index a154c0403c..abc0e843a0 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -340,8 +340,8 @@ Libraries with some extra bells and whistles.")
                (substitute* "src/modules/everything/evry_plug_calc.c"
                  (("bc -l") (string-append bc "/bin/bc -l")))
                (substitute* "data/etc/meson.build"
-                 (("/bin/mount") (string-append utils "/bin/mount"))
-                 (("/bin/umount") (string-append utils "/bin/umount"))
+                 (("/bin/mount") "/run/setuid-programs/mount")
+                 (("/bin/umount") "/run/setuid-programs/umount")
                  (("/usr/bin/eject") (string-append utils "/bin/eject"))
                  (("/usr/bin/l2ping") (string-append bluez "/bin/l2ling"))
                  (("/bin/rfkill") (string-append utils "/sbin/rfkill"))
-- 
cgit v1.2.3


From 67c8f879c5117732e58213d55a6b51ecc7f4bd54 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 3 May 2020 09:26:15 +0300
Subject: gnu: python-efl: Update to 1.24.0.

* gnu/packages/enlightenment.scm (python-efl): Update to 1.24.0.
---
 gnu/packages/enlightenment.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index abc0e843a0..991847ab8d 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -393,7 +393,7 @@ embedded systems.")
 (define-public python-efl
   (package
     (name "python-efl")
-    (version "1.23.0")
+    (version "1.24.0")
     (source
       (origin
         (method url-fetch)
@@ -401,7 +401,7 @@ embedded systems.")
                             "python/python-efl-" version ".tar.xz"))
         (sha256
          (base32
-          "16yn6a1b9167nfmryyi44ma40m20ansfpwgrvqzfvwix7qaz9pib"))
+          "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy"))
         (modules '((guix build utils)))
         ;; Remove files generated by Cython
         (snippet
-- 
cgit v1.2.3


From 13d3a9bf148cc653fd1be5fd45af75478d42f969 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 3 May 2020 09:27:31 +0300
Subject: gnu: evisum: Update to 0.4.0.

* gnu/packages/enlighenment.scm (evisum): Update to 0.4.0.
[build-system]: Switch to meson-build-system.
[arguments]: Remove make-flags, custom phases.
[inputs]: Remove alsa-lib, perl.
---
 gnu/packages/enlightenment.scm | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 991847ab8d..ccb265340b 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -564,7 +564,7 @@ directories.
 (define-public evisum
   (package
     (name "evisum")
-    (version "0.2.6")
+    (version "0.4.0")
     (source
       (origin
         (method url-fetch)
@@ -572,22 +572,14 @@ directories.
                             "evisum/evisum-" version ".tar.xz"))
         (sha256
          (base32
-          "1rg3kri6j8nmab0kdljnmcc096c8ibgwzvbhqr0b25xpmrq8bcac"))))
-    (build-system gnu-build-system)
+          "0gh3y2348pgf683sljnfry9k545h42dx75idyigcspsjsk7khisz"))))
+    (build-system meson-build-system)
     (arguments
-     '(#:tests? #f   ; no tests
-       #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure) ; no configure phase
-         (add-after 'unpack 'set-environmental-variables
-           (lambda _ (setenv "CC" (which "gcc")) #t)))))
+     '(#:tests? #f))    ; no tests
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("alsa-lib" ,alsa-lib)
-       ("efl" ,efl)
-       ("perl" ,perl)))
+     `(("efl" ,efl)))
     (home-page "https://www.enlightenment.org")
     (synopsis "EFL process viewer")
     (description
-- 
cgit v1.2.3


From 1463079a2dc855df2274a2429dd48adc4d31ffdb Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 3 May 2020 10:11:19 +0300
Subject: gnu: edi: Update to 0.8.0.

* gnu/packages/enlightenment.scm (edi): Update to 0.8.0.
[source]: Download from new uri.
[arguments]: Add custom phase to fix clang headers discovery.
[native-inputs]: Add check, gettext-minimal.
[license]: Add gpl3.
---
 gnu/packages/enlightenment.scm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index ccb265340b..2fa586d6c0 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -453,25 +453,32 @@ Libraries stack (eo, evas, ecore, edje, emotion, ethumb and elementary).")
 (define-public edi
   (package
     (name "edi")
-    (version "0.6.0")
+    (version "0.8.0")
     (source
       (origin
         (method url-fetch)
-        (uri (string-append "https://download.enlightenment.org/rel/apps/edi/"
-                            name "-" version ".tar.xz"))
+        (uri (string-append "https://github.com/Enlightenment/edi/releases/"
+                            "download/v" version "/edi-" version ".tar.xz"))
         (sha256
          (base32
-          "0iqkah327ms5m7k054hcik2l9v68i4mg9yy52brprfqpd5jk7pw8"))))
-    (build-system gnu-build-system)
+          "01k8gp8r2wa6pyg3dkbm35m6hdsbss06hybghg0qjmd4mzswcd3a"))))
+    (build-system meson-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-clang-header
+           (lambda _
+             (substitute* "scripts/clang_include_dir.sh"
+               (("grep clang") "grep clang | head -n1"))
+             #t))
          (add-after 'unpack 'set-home-directory
            ;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2
            (lambda _ (setenv "HOME" "/tmp") #t)))
        #:tests? #f)) ; tests require running dbus service
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("check" ,check)
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)))
     (inputs
      `(("clang" ,clang)
        ("efl" ,efl)))
@@ -482,7 +489,8 @@ the EFL.  It's aim is to create a new, native development environment for Linux
 that tries to lower the barrier to getting involved in Enlightenment development
 and in creating applications based on the Enlightenment Foundation Library suite.")
     (license (list license:public-domain ; data/extra/skeleton
-                   license:gpl2))))      ; edi
+                   license:gpl2          ; edi
+                   license:gpl3))))      ; data/extra/examples/images/mono-runtime.png
 
 (define-public lekha
   (package
-- 
cgit v1.2.3


From 6241eacd708ee82da0fad6b8a9fc867cc82f926c Mon Sep 17 00:00:00 2001
From: Giacomo Leidi 
Date: Fri, 1 May 2020 00:24:52 +0200
Subject: gnu: supercollider: Enable SCClassLibrary library lookup.

This hardcodes the path of SCClassLibrary to fix a lookup error that was
preventing SCServer's boot.

* gnu/packages/audio.scm (supercollider)[source]: Fetch via git,
[arguments]: build release target and add a new 'patch-scclass-dir phase to
hardcode SCClassLibrary path.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/audio.scm | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f518fb7f21..3a452f1458 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -31,6 +31,7 @@
 ;;; Copyright © 2020 Vincent Legoll 
 ;;; Copyright © 2020 Guillaume Le Vaillant 
 ;;; Copyright © 2020 Jonathan Frederickson 
+;;; Copyright © 2020 Giacomo Leidi 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2320,18 +2321,20 @@ background file post-processing.")
     (name "supercollider")
     (version "3.10.4")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/supercollider/supercollider"
-                    "/releases/download/Version-" version
-                    "/SuperCollider-" version "-Source-linux.tar.bz2"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/supercollider/supercollider.git")
+                    (commit (string-append "Version-" version))
+                    ;; for nova-simd, nova-tt, hidapi, TLSF, oscpack
+                    (recursive? #t)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0x11g3pfw11m6v18qfpfl5w99dbmf73g4z7wvwhrj1a4qv2dn084"))))
+                "0xdg1dx0y0agircnkn4bg3jpw184xc5pn28k7rrzgjh1rdnyzz24"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on"
-                           "-DSC_QT=off"
+                           "-DSC_QT=off" "-DCMAKE_BUILD_TYPE=Release"
                            "-DSC_EL=off") ;scel is packaged individually as
                                           ;emacs-scel
        #:modules ((guix build utils)
@@ -2369,7 +2372,19 @@ background file post-processing.")
                (("add_subdirectory\\(sclang\\)")
                 ""))
              (delete-file "testsuite/sclang/CMakeLists.txt")
-             #t)))))
+             #t))
+         (add-after 'disable-broken-tests 'patch-scclass-dir
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (scclass-dir
+                     (string-append out
+                                    "/share/SuperCollider/SCClassLibrary")))
+               (substitute* "lang/LangSource/SC_LanguageConfig.cpp"
+                 (((string-append
+                    "SC_Filesystem::instance\\(\\)\\.getDirectory"
+                    "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME"))
+                  (string-append "Path(\"" scclass-dir "\")")))
+               #t))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-- 
cgit v1.2.3


From 2bed28f46c490cbd04fe61064db6d7ffcaf349e6 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Tue, 14 Apr 2020 20:29:27 +0100
Subject: gnu: Add softhsm.

Required for the libcacard tests.

* gnu/packages/security-token.scm (softhsm): New variable.
---
 gnu/packages/security-token.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index c5cbb758da..10e69237ca 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -167,6 +167,34 @@ the low-level development kit for the Yubico YubiKey authentication device.")
     (home-page "https://developers.yubico.com/yubico-c/")
     (license license:bsd-2)))
 
+(define-public softhsm
+  (package
+    (name "softhsm")
+    (version "2.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://dist.opendnssec.org/source/"
+                    "softhsm-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1wkmyi6n3z2pak1cj5yk6v6bv9w0m24skycya48iikab0mrr8931"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags '("--disable-gost"))) ; TODO Missing the OpenSSL
+                                               ; engine for GOST
+    (inputs
+     `(("openssl" ,openssl)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("cppunit" ,cppunit)))
+    (synopsis "Software implementation of a generic cryptographic device")
+    (description
+     "SoftHSM 2 is a software implementation of a generic cryptographic device
+with a PKCS #11 Cryptographic Token Interface.")
+    (home-page "https://www.opendnssec.org/softhsm/")
+    (license license:bsd-2)))
+
 (define-public pcsc-lite
   (package
     (name "pcsc-lite")
-- 
cgit v1.2.3


From ee3d20b9de26945d7165189d2a04900fbb785318 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Tue, 14 Apr 2020 20:29:33 +0100
Subject: gnu: Add libcacard.

Required for smartcard support in QEMU.

* gnu/packages/spice.scm (libcacard): New variable.
---
 gnu/packages/spice.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 3445c64924..0357c2ea40 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -21,6 +21,7 @@
 
 (define-module (gnu packages spice)
   #:use-module (gnu packages)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages gl)
@@ -31,9 +32,11 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages nss)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages security-token)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
@@ -287,6 +290,51 @@ resolution scaling on graphical console window resize.")
     (home-page "https://www.spice-space.org")
     (license license:gpl3+)))
 
+(define-public libcacard
+  (package
+    (name "libcacard")
+    (version "2.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://gitlab.freedesktop.org/spice/libcacard/uploads/"
+                    "56cb2499198e78e560a1d4c716cd8ab1"
+                    "/libcacard-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f                      ; TODO Tests require gnutls built with
+                                        ; p11-kit
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-tests
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "tests/setup-softhsm2.sh"
+               (("\\/usr\\/lib64\\/pkcs11\\/libsofthsm2\\.so")
+                (string-append (assoc-ref inputs "softhsm")
+                               "/lib/softhsm/libsofthsm2.so")))
+             #t)))))
+    (propagated-inputs
+     `(("glib" ,glib)                   ; Requires: in the pkg-config file
+       ("nss" ,nss)))                   ; Requires.private: in the pkg-config
+                                        ; file
+    (native-inputs
+     `(("openssl" ,openssl)
+       ("nss" ,nss "bin")
+       ("opensc" ,opensc)
+       ("softhsm" ,softhsm)
+       ("gnutls" ,gnutls)
+       ("pkg-config" ,pkg-config)
+       ("which" ,which)))
+    (synopsis "Emulate and share smart cards with virtual machines")
+    (description
+     "The @acronym{CAC,Common Access Card} library can be used to emulate and
+share smart cards from client system to local or remote virtual machines.")
+    (home-page "https://gitlab.freedesktop.org/spice/libcacard")
+    (license license:lgpl2.1+)))
+
 (define-public virt-viewer
   (package
     (name "virt-viewer")
-- 
cgit v1.2.3


From a06051e11b268bb6de8ea8b5642344e4c405ee87 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Tue, 14 Apr 2020 20:29:41 +0100
Subject: gnu: qemu: Add libcacard as an input to enable smartcard support.

This fixes an error in gnome-boxes when starting virtual machines:

  Unable to start domain: unsupported configuration: this QEMU binary lacks
  smartcard passthrough mode support

* gnu/packages/virtualization.scm (qemu)[inputs]: Add libcacard.
---
 gnu/packages/virtualization.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index be17ec15f0..e27097c253 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -223,6 +223,7 @@ exec smbd $@")))
        ("gtk+" ,gtk+)
        ("libaio" ,libaio)
        ("libattr" ,attr)
+       ("libcacard" ,libcacard)     ; smartcard support
        ("libcap" ,libcap)           ; virtfs support requires libcap & libattr
        ("libdrm" ,libdrm)
        ("libepoxy" ,libepoxy)
-- 
cgit v1.2.3


From 17adb70f78b34a490b8e692f1a110cef72097685 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Tue, 14 Apr 2020 20:29:46 +0100
Subject: gnu: spice: Add libcacard as an input to enable smartcard support.

This is to fix an issue with gnome-boxes when trying to start a virtual
machine:

  unsupported type name: smartcard

* gnu/packages/spice.scm (spice)[inputs]: Add libcacard.
---
 gnu/packages/spice.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 0357c2ea40..c9d091c40c 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -212,6 +212,7 @@ which allows users to view a desktop computing environment.")
       `(("cyrus-sasl" ,cyrus-sasl)
         ("glib" ,glib)
         ("libjpeg-turbo" ,libjpeg-turbo)
+        ("libcacard" ,libcacard)        ; smartcard support
         ("lz4" ,lz4)
         ("opus" ,opus)
         ("orc" ,orc)
-- 
cgit v1.2.3


From a5cf52d3aa31717a8ae0c2cbbc4b848266ed7818 Mon Sep 17 00:00:00 2001
From: raingloom 
Date: Fri, 3 Apr 2020 04:18:26 +0200
Subject: gnu: Add f2fs-fsck-static.

* gnu/packages/linux.scm (f2fs-fsck/static): New public variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/linux.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index df442920de..f7c42ffba7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4633,6 +4633,38 @@ disks and SD cards.  This package provides the userland utilities.")
       `(("libuuid:static" ,util-linux "static")
         ("libuuid" ,util-linux)))))) ; for include files
 
+(define-public f2fs-fsck/static
+  (package
+    (name "f2fs-fsck-static")
+    (version (package-version f2fs-tools/static))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils)
+                      (ice-9 ftw)
+                      (srfi srfi-26))
+         (let* ((f2fs-tools (assoc-ref %build-inputs "f2fs-tools-static"))
+                (fsck "fsck.f2fs")
+                (out (assoc-ref %outputs "out"))
+                (sbin (string-append out "/sbin")))
+           (mkdir-p sbin)
+           (with-directory-excursion sbin
+             (install-file (string-append f2fs-tools "/sbin/" fsck)
+                           ".")
+             (remove-store-references fsck)
+             (chmod fsck #o555))
+           #t))))
+    (inputs
+     `(("f2fs-tools-static" ,f2fs-tools/static)))
+    (home-page (package-home-page f2fs-tools/static))
+    (synopsis "Statically-linked fsck.f2fs command from f2fs-tools")
+    (description "This package provides statically-linked fsck.f2fs command taken
+from the f2fs-tools package. It is meant to be used in initrds.")
+    (license (package-license f2fs-tools/static))))
+
 (define-public freefall
   (package
     (name "freefall")
-- 
cgit v1.2.3


From d5aee5003422c1cc4f3adfe016a24cc1b9c35881 Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou 
Date: Fri, 10 Apr 2020 13:34:17 +0100
Subject: gnu: Add bchoppr.

* gnu/packages/music.scm (bchoppr): New variable.

Signed-off-by: Christopher Baines 
---
 gnu/packages/music.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 1e56154854..b653b96906 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1162,6 +1162,28 @@ complete studio.")
 with a selectable pattern matrix size.")
     (license license:gpl3+)))
 
+(define-public bchoppr
+  (package
+    (inherit bsequencer)
+    (name "bchoppr")
+    (version "1.4.2")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/sjaehn/BChoppr.git")
+               (commit version)))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "1ympx0kyn3mkb23xgd44rlrf4qnngnlkmikz9syhayklgax7ijgm"))))
+    (synopsis "Audio stream-chopping LV2 plugin")
+    (description "B.Choppr cuts the audio input stream into a repeated
+sequence of up to 16 chops.  Each chop can be leveled up or down (gating).
+B.Choppr is the successor of B.Slizr.")
+    (home-page "https://github.com/sjaehn/BChoppr")
+    (license license:gpl3+)))
+
 (define-public solfege
   (package
     (name "solfege")
-- 
cgit v1.2.3


From a414d6ac24653e59ddb9ae4352ec1a252c6af55b Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Sun, 3 May 2020 11:20:42 +0100
Subject: gnu: qemu-minimal: Don't include libcacard as an input.

This probably isn't useful for QEMU without GUI support.

* gnu/package/virtualization.scm (qemu-minimal)[inputs]: Don't include
libcacard.
---
 gnu/packages/virtualization.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index e27097c253..b9ac18820f 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -289,7 +289,8 @@ server and embedded PowerPC, and S390 guests.")
                   '("gettext")))
     (inputs (fold alist-delete (package-inputs qemu)
                   '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+"
-                    "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2")))))
+                    "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2"
+                    "libcacard")))))
 
 (define-public libosinfo
   (package
-- 
cgit v1.2.3


From 0eed77127592323d89f56c215a15374a1aaae110 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Sun, 3 May 2020 17:25:28 +0200
Subject: locale: Add glibc 2.29 to '%default-locale-libcs'.

This eases transition for anyone reconfiguring and still having profiles
with packages using the former libc.

* gnu/system/locale.scm (%default-locale-libcs): Add GLIBC-2.29.
---
 gnu/system/locale.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm
index c7a371e9bf..ec1b71e061 100644
--- a/gnu/system/locale.scm
+++ b/gnu/system/locale.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ludovic Courtès 
+;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès 
 ;;; Copyright © 2018 Mark H Weaver 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -147,7 +147,8 @@ data format changes between libc versions."
 
 (define %default-locale-libcs
   ;; The libcs for which we build locales by default.
-  (list glibc))
+  ;; List the previous and current libc to ease transition.
+  (list glibc-2.29 glibc))
 
 (define %default-locale-definitions
   ;; Arbitrary set of locales that are built by default.  They are here mostly
-- 
cgit v1.2.3


From 60c9264b30d64527e2ab395b60a076fe070d0baf Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Sun, 3 May 2020 17:30:42 +0200
Subject: gnu: Add guile-packrat.

* gnu/packages/guile-xyz.scm (guile-packrat): New variable.
---
 gnu/packages/guile-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index d97aacdf6b..a75088ed61 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3186,6 +3186,42 @@ SHA-512).")
 (define-public guile3.0-hashing
   (deprecated-package "guile3.0-hashing" guile-hashing))
 
+(define-public guile-packrat
+  (package
+    (name "guile-packrat")
+    (version "0.1.1")
+    (home-page "https://github.com/weinholt/packrat")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1aga17164fkhbgllqc7ni6fk5zl8mkmgkl5zcsy67x7ngpyalbby"))))
+    (build-system guile-build-system)
+    (arguments
+     `(#:implicit-inputs? #f                      ;needs nothing but Guile
+       #:compile-flags '("--r6rs" "-Wunbound-variable" "-Warity-mismatch")
+       #:not-compiled-file-regexp "/extensible\\.scm$"
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'no-srfi-23
+                    (lambda _
+                      (substitute* "packrat.sls"
+                        (("\\(srfi :23 error\\)")
+                         (object->string '(only (guile) error))))
+                      #t)))))
+    (native-inputs
+     `(("guile" ,guile-3.0)))
+    (synopsis "Packrat parser library in R6RS Scheme")
+    (description
+     "This is an R6RS Scheme adaptation of the
+@uref{https://bford.info/packrat/, packrat parsing}.  Packrat parsing is a
+memoizing, backtracking, recursive-descent parsing technique that runs in time
+and space linear in the size of the input text.")
+    (license license:expat)))
+
 (define-public guile-webutils
   (let ((commit "8541904f761066dc9c27b1153e9a838be9a55299")
         (revision "0"))
-- 
cgit v1.2.3


From 14c6e8b67162913920ac15693e2a63b414e7b36e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 3 May 2020 17:31:05 +0200
Subject: gnu: znc: Update to 1.8.0.

* gnu/packages/messaging.scm (znc): Update to 1.8.0.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index c6217a95de..3dbf010631 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -505,14 +505,14 @@ compromised.")
 (define-public znc
   (package
     (name "znc")
-    (version "1.7.5")
+    (version "1.8.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://znc.in/releases/archive/znc-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "08a7yb2xs85hyyz8dpzfbsfjwj2r6kcii022lj3l4rf8hl9ix558"))))
+                "0m5xf60r40pgbg9lyk56dafxj2hj149pn2wf8vzsp8xgq4kv5zcl"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit v1.2.3


From 97a77eab09999e8f98fd4ba46982ab517d30b527 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Sun, 3 May 2020 18:25:26 +0200
Subject: gnu: Add guile-ac-d-bus.

* gnu/packages/guile-xyz.scm (guile-ac-d-bus): New variable.
---
 gnu/packages/guile-xyz.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index a75088ed61..45cc6b2326 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3222,6 +3222,70 @@ memoizing, backtracking, recursive-descent parsing technique that runs in time
 and space linear in the size of the input text.")
     (license license:expat)))
 
+(define-public guile-ac-d-bus
+  (package
+    (name "guile-ac-d-bus")
+    (version "1.0.0-alpha.0")
+    (home-page "https://gitlab.com/weinholt/ac-d-bus/")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "05cbp7slmzrx4cib2liysk31laknqiycw9ckgn65fylgz6c2y5x9"))))
+    (build-system guile-build-system)
+    (arguments
+     `(#:implicit-inputs? #f                      ;needs nothing but Guile
+       #:compile-flags '("--r6rs" "-Wunbound-variable" "-Warity-mismatch")
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'adjust-for-guile
+                    (lambda _
+                      ;; Adjust source file names for Guile.
+                      (define (guile-sls->sls file)
+                        (string-append (string-drop-right
+                                        file (string-length ".guile.sls"))
+                                       ".sls"))
+
+                      ;; Remove files targeting other implementations:
+                      ;; *.mosh.sls, etc.
+                      (for-each delete-file
+                                (find-files
+                                 "compat"
+                                 (lambda (file stat)
+                                   (not (string-contains file ".guile.")))))
+
+                      ;; Rename *.guile.sls to *.sls so the ".guile" bit does
+                      ;; not appear in .go file names.
+                      (for-each (lambda (file)
+                                  (rename-file file (guile-sls->sls file)))
+                                (find-files "compat" "\\.guile\\.sls"))
+
+                      ;; Move directories under d-bus/ to match module names.
+                      (mkdir "d-bus")
+                      (for-each (lambda (directory)
+                                  (rename-file directory
+                                               (string-append "d-bus/"
+                                                              directory)))
+                                '("compat" "protocol"))
+
+                      #t)))))
+    (native-inputs
+     `(("guile" ,guile-3.0)))
+    (propagated-inputs
+     `(("guile-packrat" ,guile-packrat)))
+    (synopsis "D-Bus protocol implementation in R6RS Scheme")
+    (description
+     "AC/D-Bus is an implementation of the D-Bus wire protocol.  D-Bus is an
+interprocess communication protocol popular on GNU/Linux systems to
+communicate with a variety of services.  Originally designed for desktop
+environments, it is now used by programs like VLC media player, BlueZ,
+NetworkManager, Pulseaudio, systemd (including logind and resolved), Polkit,
+gnome-keyring, and many more.")
+    (license license:expat)))
+
 (define-public guile-webutils
   (let ((commit "8541904f761066dc9c27b1153e9a838be9a55299")
         (revision "0"))
-- 
cgit v1.2.3


From b4fe5dab9a4f404b214e6ad08cfa20b9f0d37083 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 3 May 2020 20:49:39 +0300
Subject: gnu: network-manager-openconnect: Add missing input.

* gnu/packages/gnome.scm (network-manager-openconnect)[inputs]: Add lz4.
---
 gnu/packages/gnome.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2f581870bf..70975df3c7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6671,6 +6671,7 @@ Compatible with Cisco VPN concentrators configured to use IPsec.")
        ("kmod" ,kmod)
        ("libsecret" ,libsecret)
        ("libxml2" ,libxml2)
+       ("lz4" ,lz4)
        ("network-manager" ,network-manager)
        ("openconnect" ,openconnect)))
     (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
-- 
cgit v1.2.3


From af7a8e718dddd12c3dddf92bfce2f79471fa4a0d Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Sun, 3 May 2020 12:49:29 +0200
Subject: tests: install: Test a F2FS root file system.

* gnu/tests/install.scm (%f2fs-root-os, %f2fs-root-installation-script,
%test-f2fs-root-os): New variables.
---
 gnu/tests/install.scm | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 019e21fd39..23f60c68bf 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
 ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2020 Mathieu Othacehe 
+;;; Copyright © 2020 Danny Milosavljevic 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -58,6 +59,7 @@
             %test-encrypted-root-os
             %test-btrfs-root-os
             %test-jfs-root-os
+            %test-f2fs-root-os
 
             %test-gui-installed-os
             %test-gui-installed-os-encrypted
@@ -926,6 +928,79 @@ build (current-guix) and then store a couple of full system images.")
                          (command (qemu-command/writable-image image)))
       (run-basic-test %jfs-root-os command "jfs-root-os")))))
 
+
+;;;
+;;; F2FS root file system.
+;;;
+
+(define-os-with-source (%f2fs-root-os %f2fs-root-os-source)
+  ;; The OS we want to install.
+  (use-modules (gnu) (gnu tests) (srfi srfi-1))
+
+  (operating-system
+    (host-name "liberigilo")
+    (timezone "Europe/Paris")
+    (locale "en_US.UTF-8")
+
+    (bootloader (bootloader-configuration
+                 (bootloader grub-bootloader)
+                 (target "/dev/vdb")))
+    (kernel-arguments '("console=ttyS0"))
+    (file-systems (cons (file-system
+                          (device (file-system-label "my-root"))
+                          (mount-point "/")
+                          (type "f2fs"))
+                        %base-file-systems))
+    (users (cons (user-account
+                  (name "charlie")
+                  (group "users")
+                  (supplementary-groups '("wheel" "audio" "video")))
+                 %base-user-accounts))
+    (services (cons (service marionette-service-type
+                             (marionette-configuration
+                              (imported-modules '((gnu services herd)
+                                                  (guix combinators)))))
+                    %base-services))))
+
+(define %f2fs-root-installation-script
+  ;; Shell script of a simple installation.
+  "\
+. /etc/profile
+set -e -x
+guix --version
+
+export GUIX_BUILD_OPTIONS=--no-grafts
+ls -l /run/current-system/gc-roots
+parted --script /dev/vdb mklabel gpt \\
+  mkpart primary ext2 1M 3M \\
+  mkpart primary ext2 3M 2G \\
+  set 1 boot on \\
+  set 1 bios_grub on
+mkfs.f2fs -l my-root -q /dev/vdb2
+mount /dev/vdb2 /mnt
+herd start cow-store /mnt
+mkdir /mnt/etc
+cp /etc/target-config.scm /mnt/etc/config.scm
+guix system build /mnt/etc/config.scm
+guix system init /mnt/etc/config.scm /mnt --no-substitutes
+sync
+reboot\n")
+
+(define %test-f2fs-root-os
+  (system-test
+   (name "f2fs-root-os")
+   (description
+    "Test basic functionality of an OS installed like one would do by hand.
+This test is expensive in terms of CPU and storage usage since we need to
+build (current-guix) and then store a couple of full system images.")
+   (value
+    (mlet* %store-monad ((image   (run-install %f2fs-root-os
+                                               %f2fs-root-os-source
+                                               #:script
+                                               %f2fs-root-installation-script))
+                         (command (qemu-command/writable-image image)))
+      (run-basic-test %f2fs-root-os command "f2fs-root-os")))))
+
 
 ;;;
 ;;; Installation through the graphical interface.
-- 
cgit v1.2.3


From f8a0065ae391bc9f717033e612f342741c66d946 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Sun, 3 May 2020 16:12:30 +0200
Subject: install: Add f2fs-tools to the installation image.

* gnu/system/install.scm (installation-os)[packages]: Add f2fs-tools.
---
 gnu/system/install.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 8804585215..6435c1bff4 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -524,6 +524,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
                      mdadm
                      dosfstools         ;mkfs.fat, for the UEFI boot partition
                      btrfs-progs
+                     f2fs-tools
                      jfsutils
                      openssh    ;we already have sshd, having ssh/scp can help
                      wireless-tools iw wpa-supplicant-minimal iproute
-- 
cgit v1.2.3


From f73f4b3a2d7a313a6cb1667bd69205ea4b09f57c Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Sun, 3 May 2020 17:29:39 +0200
Subject: file-systems: Fix F2FS volume name accessor.

Follow-up to 23b37c3d40d497cc6f07437ab26ab10e60fb6e09.

* gnu/build/file-systems.scm (bytevector-utf16-length): New procedure.
(null-terminated-utf16->string): New procedure.
(f2fs-superblock-volume-name): Use it.
---
 gnu/build/file-systems.scm | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index bbea4c766e..4ac672d96f 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -98,6 +98,22 @@ takes a bytevector and returns #t when it's a valid superblock."
 (define null-terminated-latin1->string
   (cut latin1->string <> zero?))
 
+(define (bytevector-utf16-length bv)
+  "Given a bytevector BV containing a NUL-terminated UTF16-encoded string,
+determine where the NUL terminator is and return its index.  If there's no
+NUL terminator, return the size of the bytevector."
+  (let ((length (bytevector-length bv)))
+    (let loop ((index 0))
+      (if (< index length)
+          (if (zero? (bytevector-u16-ref bv index 'little))
+              index
+              (loop (+ index 2)))
+          length))))
+
+(define (null-terminated-utf16->string bv endianness)
+  (utf16->string (sub-bytevector bv 0 (bytevector-utf16-length bv))
+                 endianness))
+
 
 ;;;
 ;;; Ext2 file systems.
@@ -377,7 +393,9 @@ if DEVICE does not contain an F2FS file system."
 (define (f2fs-superblock-volume-name sblock)
   "Return the volume name of SBLOCK as a string of at most 512 characters, or
 #f if SBLOCK has no volume name."
-  (utf16->string (sub-bytevector sblock (- (+ #x470 12) #x400) 512) %f2fs-endianness))
+  (null-terminated-utf16->string
+   (sub-bytevector sblock (- (+ #x470 12) #x400) 512)
+   %f2fs-endianness))
 
 (define (check-f2fs-file-system device)
   "Return the health of a F2FS file system on DEVICE."
-- 
cgit v1.2.3


From 96e399ee30251a0767a45b2bde3f052b25c62714 Mon Sep 17 00:00:00 2001
From: Christopher Howard 
Date: Sat, 2 May 2020 14:41:00 -0800
Subject: gnu: libusb-0.1: fix build failure on newer gcc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/libusb.scm (libusb-0.1): Disable -Werror.

Signed-off-by: Jakub Kądziołka 
---
 gnu/packages/libusb.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 01c138cb4e..5f64b33df9 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2017 Jonathan Brielmaier 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Vagrant Cascadian 
+;;; Copyright © 2020 Christopher Howard 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -113,7 +114,8 @@ version of libusb to run with newer libusb.")
       (sha256
        (base32
         "0i4bacxkyr7xyqxbmb00ypkrv4swkgm0mghbzjsnw6blvvczgxip"))
-      (patches (search-patches "libusb-0.1-disable-tests.patch"))))))
+      (patches (search-patches "libusb-0.1-disable-tests.patch"))))
+    (arguments `(#:configure-flags (list "CFLAGS=-Wno-error")))))
 
 (define-public libusb4java
   ;; There is no public release so we take the latest version from git.
-- 
cgit v1.2.3


From bb357c509e1c017e1fef5aa5f4d05beea0c25157 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Sun, 3 May 2020 21:40:04 +0200
Subject: file-systems: Fix UTF-16 handling in initrd.

Follow-up to f73f4b3a2d7a313a6cb1667bd69205ea4b09f57c.

* gnu/build/file-systems.scm (bytevector->u16-list): New procedure.
(utf16->string): New procedure.
---
 gnu/build/file-systems.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 4ac672d96f..b920e8fc62 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -110,6 +110,31 @@ NUL terminator, return the size of the bytevector."
               (loop (+ index 2)))
           length))))
 
+(define* (bytevector->u16-list bv endianness #:optional (index 0))
+  (if (< index (bytevector-length bv))
+      (cons (bytevector-u16-ref bv index endianness)
+            (bytevector->u16-list bv endianness (+ index 2)))
+      '()))
+
+;; The initrd doesn't have iconv data, so do the conversion ourselves.
+(define (utf16->string bv endianness)
+  (list->string
+   (map integer->char
+        (reverse
+         (let loop ((remainder (bytevector->u16-list bv endianness))
+                    (result '()))
+             (match remainder
+              (() result)
+              ((a) (cons a result))
+              ((a b x ...)
+               (if (and (>= a #xD800) (< a #xDC00) ; high surrogate
+                        (>= b #xDC00) (< b #xE000)) ; low surrogate
+                   (loop x (cons (+ #x10000
+                                    (* #x400 (- a #xD800))
+                                    (- b #xDC00))
+                                 result))
+                   (loop (cons b x) (cons a result))))))))))
+
 (define (null-terminated-utf16->string bv endianness)
   (utf16->string (sub-bytevector bv 0 (bytevector-utf16-length bv))
                  endianness))
-- 
cgit v1.2.3


From da09c63e78ebebeabb347f483d7284b87ff51c2f Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Sun, 3 May 2020 22:40:57 +0200
Subject: gnu: f2fs-tools-static: Work around bug in our util-linux.

* gnu/packages/linux.scm (f2fs-tools/static): Work around bug in our util-linux.
---
 gnu/packages/linux.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f7c42ffba7..3de29a59ed 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4628,7 +4628,14 @@ disks and SD cards.  This package provides the userland utilities.")
              (append-to-file "mkfs/Makefile.am" "\nmkfs_f2fs_LDFLAGS = -all-static\n")
              (append-to-file "fsck/Makefile.am" "\nfsck_f2fs_LDFLAGS = -all-static\n")
              (append-to-file "tools/Makefile.am" "\nf2fscrypt_LDFLAGS = -all-static -luuid\n")
-             #t)))))
+             #t))
+          (add-after 'install 'remove-store-references
+            (lambda* (#:key outputs #:allow-other-keys)
+              ;; Work around bug in our util-linux.
+              ;; .
+              (remove-store-references (string-append (assoc-ref outputs "out")
+                                                      "/sbin/mkfs.f2fs"))
+              #t)))))
      (inputs
       `(("libuuid:static" ,util-linux "static")
         ("libuuid" ,util-linux)))))) ; for include files
-- 
cgit v1.2.3


From 33eab4a10dcd2a6580f168f18455df1d4653d14b Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Sun, 3 May 2020 22:41:24 +0200
Subject: linux-initrd: Provide fsck for F2FS.

* gnu/system/linux-initrd.scm (file-system-packages): Add F2FS fsck.
---
 gnu/system/linux-initrd.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 44ee4f10aa..6a1840dbf6 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -245,6 +245,9 @@ FILE-SYSTEMS."
           '())
     ,@(if (find (file-system-type-predicate "jfs") file-systems)
           (list jfs_fsck/static)
+          '())
+    ,@(if (find (file-system-type-predicate "f2fs") file-systems)
+          (list f2fs-fsck/static)
           '())))
 
 (define-syntax vhash                              ;TODO: factorize
-- 
cgit v1.2.3


From 14b0dcc7f79a3a7c4f4b976b3e6fafe521e96383 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Sun, 3 May 2020 23:07:37 +0200
Subject: gnu: emacs-xr: Update to 1.19.

* gnu/packages/emacs-xyz.scm (emacs-xr): Update to 1.19.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index bf72133a88..4dba87ba03 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1002,13 +1002,13 @@ in certain cases.  It also enables recursion for anonymous functions.")
 (define-public emacs-xr
   (package
     (name "emacs-xr")
-    (version "1.18")
+    (version "1.19")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar"))
        (sha256
-        (base32 "1nq9pj47sxgpkw97c2xrkhgcwh3zsfd2a22qiqbl4i9zf2l9yy91"))))
+        (base32 "1aa3iqh0r635jw8k89zh8y4am9d4hfrqpk9mrdh2b51invjn8llq"))))
     (build-system emacs-build-system)
     (home-page "https://elpa.gnu.org/packages/xr.html")
     (synopsis "Convert string regexp to rx notation")
-- 
cgit v1.2.3


From c563f8887db23241922fabf62a4da5d1526a644f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Sun, 3 May 2020 23:07:43 +0200
Subject: gnu: emacs-relint: Update to 1.16.

* gnu/packages/emacs-xyz.scm (emacs-relint): Update to 1.16.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4dba87ba03..abb4020e0c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1106,14 +1106,14 @@ optional minor mode which can apply this command automatically on save.")
 (define-public emacs-relint
   (package
     (name "emacs-relint")
-    (version "1.15")
+    (version "1.16")
     (source
      (origin
        (method url-fetch)
        (uri (string-append
              "https://elpa.gnu.org/packages/relint-" version ".tar"))
        (sha256
-        (base32 "0sxmdsacj8my942k8j76m2y68nzab7190acv7cwgflc5n4f07yxa"))))
+        (base32 "0cwk806g2kq60sql8sic2zdn63l1g2pzdiklcv0w8l2k9wssknnx"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-xr" ,emacs-xr)))
     (home-page "https://github.com/mattiase/relint")
-- 
cgit v1.2.3


From c91e27c60864faa229198f6f0caf620275c429a2 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Fri, 1 May 2020 15:07:02 +0200
Subject: Add '.guix-authorizations'.

* .guix-authorizations: New file.
---
 .guix-authorizations | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .guix-authorizations

diff --git a/.guix-authorizations b/.guix-authorizations
new file mode 100644
index 0000000000..25fd1d85a1
--- /dev/null
+++ b/.guix-authorizations
@@ -0,0 +1,8 @@
+;; This is the list of OpenPGP keys currently authorized to sign commits in
+;; this repository.
+
+(authorizations
+ (version 0)
+
+ (("3CE4 6455 8A84 FDC6 9DB4  0CFB 090B 1199 3D9A EBB5"
+   (name "civodul"))))
-- 
cgit v1.2.3


From 43408e304ffb1149f35cb539b40d673d567c9116 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Thu, 2 Jan 2020 00:03:58 +0100
Subject: Add (guix openpgp).

* guix/openpgp.scm, tests/openpgp.scm, tests/civodul.key,
tests/dsa.key, tests/ed25519.key, tests/rsa.key,
tests/ed25519.sec: New files.
* Makefile.am (MODULES): Add guix/openpgp.scm.
(SCM_TESTS): Add tests/openpgp.scm.
(EXTRA_DIST): Add tests/*.key and tests/ed25519.sec.
---
 Makefile.am       |    7 +
 guix/openpgp.scm  | 1022 ++++++++++++++++++++++++++++++++++++++++
 tests/civodul.key | 1345 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/dsa.key     |   25 +
 tests/ed25519.key |   10 +
 tests/ed25519.sec |   10 +
 tests/openpgp.scm |  248 ++++++++++
 tests/rsa.key     |   18 +
 8 files changed, 2685 insertions(+)
 create mode 100644 guix/openpgp.scm
 create mode 100644 tests/civodul.key
 create mode 100644 tests/dsa.key
 create mode 100644 tests/ed25519.key
 create mode 100644 tests/ed25519.sec
 create mode 100644 tests/openpgp.scm
 create mode 100644 tests/rsa.key

diff --git a/Makefile.am b/Makefile.am
index d9d7ffd6c5..f4004e351e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,7 @@ MODULES =					\
   guix/docker.scm	   			\
   guix/json.scm					\
   guix/records.scm				\
+  guix/openpgp.scm				\
   guix/pki.scm					\
   guix/progress.scm				\
   guix/combinators.scm				\
@@ -414,6 +415,7 @@ SCM_TESTS =					\
   tests/nar.scm				\
   tests/networking.scm				\
   tests/opam.scm				\
+  tests/openpgp.scm				\
   tests/packages.scm				\
   tests/pack.scm				\
   tests/pki.scm				\
@@ -564,6 +566,11 @@ EXTRA_DIST +=						\
   tests/signing-key.pub					\
   tests/signing-key.sec					\
   tests/cve-sample.json					\
+  tests/civodul.key					\
+  tests/rsa.key						\
+  tests/dsa.key						\
+  tests/ed25519.key					\
+  tests/ed25519.sec					\
   build-aux/config.rpath				\
   bootstrap						\
   doc/build.scm						\
diff --git a/guix/openpgp.scm b/guix/openpgp.scm
new file mode 100644
index 0000000000..bfdbe4b61b
--- /dev/null
+++ b/guix/openpgp.scm
@@ -0,0 +1,1022 @@
+;; -*- mode: scheme; coding: utf-8 -*-
+;; Copyright © 2010, 2012 Göran Weinholt 
+;; Copyright © 2020 Ludovic Courtès 
+
+;; Permission is hereby granted, free of charge, to any person obtaining a
+;; copy of this software and associated documentation files (the "Software"),
+;; to deal in the Software without restriction, including without limitation
+;; the rights to use, copy, modify, merge, publish, distribute, sublicense,
+;; and/or sell copies of the Software, and to permit persons to whom the
+;; Software is furnished to do so, subject to the following conditions:
+
+;; The above copyright notice and this permission notice shall be included in
+;; all copies or substantial portions of the Software.
+
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+;; THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+;; DEALINGS IN THE SOFTWARE.
+
+;;; This code was originally written by Göran Weinholt for Industria and
+;;; released under the Expat license shown above.  It was then modified by
+;;; Ludovic Courtès for use in GNU Guix: turned into a native Guile module,
+;;; ported to Guile-Gcrypt, and extended and simplified in other ways.
+
+(define-module (guix openpgp)
+  #:export (get-openpgp-detached-signature/ascii
+            (get-packet . get-openpgp-packet)
+            verify-openpgp-signature
+            port-ascii-armored?
+
+            openpgp-signature?
+            openpgp-signature-issuer
+            openpgp-signature-public-key-algorithm
+            openpgp-signature-hash-algorithm
+            openpgp-signature-creation-time
+            openpgp-signature-expiration-time
+
+            openpgp-user-id?
+            openpgp-user-id-value
+            openpgp-user-attribute?
+
+            openpgp-public-key?
+            openpgp-public-key-subkey?
+            openpgp-public-key-value
+            openpgp-public-key-fingerprint openpgp-format-fingerprint
+            openpgp-public-key-id
+
+            openpgp-keyring?
+            %empty-keyring
+            lookup-key-by-id
+            get-openpgp-keyring
+
+            read-radix-64)
+  #:use-module (rnrs bytevectors)
+  #:use-module (rnrs io ports)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-9)
+  #:use-module (srfi srfi-11)
+  #:use-module (srfi srfi-19)
+  #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-34)
+  #:use-module (srfi srfi-35)
+  #:use-module (srfi srfi-60)
+  #:use-module (ice-9 match)
+  #:use-module ((ice-9 rdelim) #:select (read-line))
+  #:use-module (ice-9 vlist)
+  #:use-module (gcrypt hash)
+  #:use-module (gcrypt pk-crypto)
+  #:use-module (gcrypt base64)
+  #:use-module (gcrypt base16)
+  #:use-module ((guix build utils) #:select (dump-port)))
+
+;;; Commentary:
+;;;
+;;; This module contains code to read OpenPGP messages as described in
+;;; , with extensions from
+;;;  (notably
+;;; EdDSA support and extra signature sub-packets).
+;;;
+;;; Currently this module does enough to verify detached signatures of binary
+;;; data.  It does _not_ perform sanity checks on self-signatures, subkey
+;;; binding signatures, etc., among others.  Use only in a context where this
+;;; limitations are acceptable!
+;;;
+;;; Code:
+
+(define-syntax print
+  (syntax-rules ()
+    ;; ((_ args ...) (pk 'openpgp args))
+    ((_ args ...) (values))))
+
+(define-syntax-rule (define-alias new old)
+  (define-syntax new (identifier-syntax old)))
+
+(define-alias fx+ +)
+(define-alias fx- -)
+(define-alias fx* *)
+(define-alias fx/ /)
+(define-alias fxdiv quotient)
+(define-alias fxand logand)
+(define-alias fxbit-set? bit-set?)
+(define-alias fxbit-field bit-field)
+(define-alias bitwise-bit-field bit-field)
+(define-alias fxarithmetic-shift-left ash)
+(define-inlinable (fxarithmetic-shift-right i n) (ash i (- n)))
+(define-inlinable (port-eof? port) (eof-object? (lookahead-u8 port)))
+
+(define (string-hex-pad str)
+  (if (odd? (string-length str))
+      (string-append "0" str)
+      str))
+
+(define (unixtime n)
+  (time-monotonic->date (make-time 'time-monotonic 0 n)))
+
+
+;;;
+;;; Bitwise I/O.
+;;;
+;;; TODO: Use Bytestructures instead.
+;;;
+
+(define-syntax-rule (integer-read size)
+  (lambda (port)
+    "Read from PORT a big-endian integer of SIZE bytes.  Return the EOF object
+on end-of-file."
+    (let ((buf (make-bytevector size)))
+      (match (get-bytevector-n! port buf 0 size)
+        (size (bytevector-uint-ref buf 0 (endianness big) size))
+        (_    (eof-object))))))
+
+(define get-u16 (integer-read 2))
+(define get-u32 (integer-read 4))
+(define get-u64 (integer-read 8))
+
+(define-syntax get-integers
+  (syntax-rules ()
+    "Read from PORT integers of the given TYPE, in big endian encoding.  Each
+TYPE must be one of u8, u16, u32, u64, or _, as in this example:
+
+  (get-integers port u8 _ _ _ u32 u16)
+
+In the case of _ (wildcard), one byte is read and discarded.  Return as many
+values as there are TYPEs."
+    ((_ port type ...)
+     (letrec-syntax ((get-integer (syntax-rules (u8 u16 u32 u64)
+                                    ((x u8) (get-u8 port))
+                                    ((x u16) (get-u16 port))
+                                    ((x u32) (get-u32 port))
+                                    ((x u64) (get-u64 port))))
+                     (values*     (syntax-rules (_)
+                                    ((x (result (... ...)))
+                                     (values result (... ...)))
+                                    ((x (result (... ...)) _ rest (... ...))
+                                     (let ((x (get-u8 port)))
+                                       (values* (result (... ...))
+                                                rest (... ...))))
+                                    ((x (result (... ...)) t rest (... ...))
+                                     (let ((x (get-integer t)))
+                                       (values* (result (... ...) x)
+                                                rest (... ...)))))))
+       (values* () type ...)))))
+
+(define (bytevector->uint bv)
+  (bytevector-uint-ref bv 0 (endianness big)
+                       (bytevector-length bv)))
+
+(define-syntax-rule (integer-write size)
+  (lambda (port integer)
+    "Write INTEGER to PORT as a SIZE-byte integer and as big endian."
+    (let ((bv (make-bytevector size)))
+      (bytevector-uint-set! bv 0 integer (endianness big) size)
+      (put-bytevector port bv))))
+
+(define put-u16 (integer-write 2))
+(define put-u32 (integer-write 4))
+(define put-u64 (integer-write 8))
+
+(define-syntax put-integers
+  (syntax-rules ()
+    "Write the given integers as big endian to PORT.  For example:
+
+  (put-integers port u8 42 u32 #x7777)
+
+writes to PORT the value 42 as an 8-bit integer and the value #x7777 as a
+32-bit integer."
+    ((_ port)
+     #t)
+    ((_ port type value rest ...)
+     (let-syntax ((put (syntax-rules (u8 u16 u32 u64)
+                         ((_ u8 port integer)
+                          (put-u8 port integer))
+                         ((_ u16 port integer)
+                          (put-u16 port integer))
+                         ((_ u32 port integer)
+                          (put-u32 port integer))
+                         ((_ u64 port integer)
+                          (put-u64 port integer)))))
+       (begin
+         (put type port value)
+         (put-integers port rest ...))))))
+
+(define-syntax-rule (integers->bytevector type value rest ...)
+  "Return the the TYPE/VALUE integers representation as a bytevector."
+  (let-values (((port get) (open-bytevector-output-port)))
+    (put-integers port type value rest ...)
+    (force-output port)
+    (get)))
+
+
+(define (bytevector->bitnames bv names)
+  (define (bit-set? bv i)
+    (let ((idx (fxarithmetic-shift-right i 3))
+          (bit (fxand i #b111)))
+      (and (< idx (bytevector-length bv))
+           (fxbit-set? (bytevector-u8-ref bv idx) bit))))
+  (do ((names names (cdr names))
+       (i 0 (fx+ i 1))
+       (bits '()
+             (if (bit-set? bv i)
+                 (cons (car names) bits)
+                 bits)))
+      ((null? names) (reverse bits))))
+
+(define (openpgp-format-fingerprint bv)
+  "Return a string representing BV, a bytevector, in the conventional OpenPGP
+hexadecimal format for fingerprints."
+  (define (h i)
+    (string-pad (string-upcase
+                 (number->string
+                  (bytevector-u16-ref bv (* i 2) (endianness big))
+                  16))
+                4 #\0))
+  (string-append (h 0) " " (h 1) " " (h 2) " " (h 3) " " (h 4)
+                 "  "
+                 (h 5) " " (h 6) " " (h 7) " " (h 8) " " (h 9)))
+
+;;; Constants
+
+
+(define PACKET-SESSION-KEY 1)
+(define PACKET-SIGNATURE 2)
+(define PACKET-SYMMETRIC-SESSION-KEY 3)
+(define PACKET-ONE-PASS-SIGNATURE 4)
+(define PACKET-SECRET-KEY 5)
+(define PACKET-PUBLIC-KEY 6)
+(define PACKET-SECRET-SUBKEY 7)
+(define PACKET-COMPRESSED-DATA 8)
+(define PACKET-SYMMETRIC-ENCRYPTED-DATA 9)
+(define PACKET-MARKER 10)
+(define PACKET-LITERAL-DATA 11)
+(define PACKET-TRUST 12)
+(define PACKET-USER-ID 13)
+(define PACKET-PUBLIC-SUBKEY 14)
+(define PACKET-USER-ATTRIBUTE 17)
+(define PACKET-SYMMETRIC-ENCRYPTED/PROTECTED-DATA 18)
+(define PACKET-MDC 19)
+
+(define PUBLIC-KEY-RSA 1)
+(define PUBLIC-KEY-RSA-ENCRYPT-ONLY 2)
+(define PUBLIC-KEY-RSA-SIGN-ONLY 3)
+(define PUBLIC-KEY-ELGAMAL-ENCRYPT-ONLY 16)
+(define PUBLIC-KEY-DSA 17)
+(define PUBLIC-KEY-ECDH 18)                       ;RFC-6637
+(define PUBLIC-KEY-ECDSA 19)                      ;RFC-6639
+(define PUBLIC-KEY-ELGAMAL 20)                    ;encrypt + sign (legacy)
+(define PUBLIC-KEY-EDDSA 22)                      ;"not yet assigned" says GPG
+
+(define (public-key-algorithm id)
+  (cond ((= id PUBLIC-KEY-RSA) 'rsa)
+        ((= id PUBLIC-KEY-DSA) 'dsa)
+        ((= id PUBLIC-KEY-ELGAMAL-ENCRYPT-ONLY) 'elgamal)
+        ((= id PUBLIC-KEY-EDDSA) 'eddsa)
+        (else id)))
+
+(define SYMMETRIC-KEY-PLAINTEXT 0)
+(define SYMMETRIC-KEY-IDEA 1)
+(define SYMMETRIC-KEY-TRIPLE-DES 2)
+(define SYMMETRIC-KEY-CAST5-128 3)
+(define SYMMETRIC-KEY-BLOWFISH-128 4)
+(define SYMMETRIC-KEY-AES-128 7)
+(define SYMMETRIC-KEY-AES-192 8)
+(define SYMMETRIC-KEY-AES-256 9)
+(define SYMMETRIC-KEY-TWOFISH-256 10)
+(define SYMMETRIC-KEY-CAMELLIA-128 11)            ;RFC-5581
+(define SYMMETRIC-KEY-CAMELLIA-192 12)
+(define SYMMETRIC-KEY-CAMELLIA-256 13)
+
+(define (symmetric-key-algorithm id)
+  (cond ((= id SYMMETRIC-KEY-PLAINTEXT) 'plaintext)
+        ((= id SYMMETRIC-KEY-IDEA) 'idea)
+        ((= id SYMMETRIC-KEY-TRIPLE-DES) 'tdea)
+        ((= id SYMMETRIC-KEY-CAST5-128) 'cast5-128)
+        ((= id SYMMETRIC-KEY-BLOWFISH-128) 'blowfish-128)
+        ((= id SYMMETRIC-KEY-AES-128) 'aes-128)
+        ((= id SYMMETRIC-KEY-AES-192) 'aes-192)
+        ((= id SYMMETRIC-KEY-AES-256) 'aes-256)
+        ((= id SYMMETRIC-KEY-TWOFISH-256) 'twofish-256)
+        (else id)))
+
+(define HASH-MD5 1)
+(define HASH-SHA-1 2)
+(define HASH-RIPE-MD160 3)
+(define HASH-SHA-256 8)
+(define HASH-SHA-384 9)
+(define HASH-SHA-512 10)
+(define HASH-SHA-224 11)
+
+(define (openpgp-hash-algorithm id)
+  (cond ((= id HASH-MD5) 'md5)
+        ((= id HASH-SHA-1) 'sha1)
+        ((= id HASH-RIPE-MD160) 'rmd160)
+        ((= id HASH-SHA-256) 'sha256)
+        ((= id HASH-SHA-384) 'sha384)
+        ((= id HASH-SHA-512) 'sha512)
+        ((= id HASH-SHA-224) 'sha224)
+        (else (error "unknown hash algorithm" id))))
+
+(define COMPRESSION-UNCOMPRESSED 0)
+(define COMPRESSION-ZIP 1)                      ;deflate
+
+(define COMPRESSION-ZLIB 2)
+(define COMPRESSION-BZIP2 3)
+
+(define (compression-algorithm id)
+  (cond ((= id COMPRESSION-UNCOMPRESSED) 'uncompressed)
+        ((= id COMPRESSION-ZIP) 'deflate)
+        ((= id COMPRESSION-ZLIB) 'zlib)
+        ((= id COMPRESSION-BZIP2) 'bzip2)
+        (else id)))
+
+(define SUBPACKET-SIGNATURE-CTIME 2)
+(define SUBPACKET-SIGNATURE-ETIME 3)
+  ;;  4 = Exportable Certification
+
+(define SUBPACKET-TRUST-SIGNATURE 5)
+  ;;  6 = Regular Expression
+
+(define SUBPACKET-REVOCABLE 7)
+(define SUBPACKET-KEY-ETIME 9)
+(define SUBPACKET-PREFERRED-SYMMETRIC-ALGORITHMS 11)
+  ;; 12 = Revocation Key
+
+(define SUBPACKET-ISSUER 16)
+;; TODO: hashed SUBPACKET-ISSUER-FINGERPRINT-V4
+(define SUBPACKET-NOTATION-DATA 20)
+(define SUBPACKET-PREFERRED-HASH-ALGORITHMS 21)
+(define SUBPACKET-PREFERRED-COMPRESSION-ALGORITHMS 22)
+(define SUBPACKET-KEY-SERVER-PREFERENCES 23)
+(define SUBPACKET-PREFERRED-KEY-SERVER 24)
+(define SUBPACKET-PRIMARY-USER-ID 25)
+(define SUBPACKET-POLICY-URI 26)
+(define SUBPACKET-KEY-FLAGS 27)
+(define SUBPACKET-SIGNER-USER-ID 28)
+(define SUBPACKET-REASON-FOR-REVOCATION 29)
+(define SUBPACKET-FEATURES 30)
+  ;; 31 = Signature Target
+
+(define SUBPACKET-EMBEDDED-SIGNATURE 32)
+
+(define SIGNATURE-BINARY #x00)
+(define SIGNATURE-TEXT #x01)
+(define SIGNATURE-STANDALONE #x02)
+(define SIGNATURE-GENERIC-CERT #x10)
+(define SIGNATURE-PERSONA-CERT #x11)
+(define SIGNATURE-CASUAL-CERT #x12)
+(define SIGNATURE-POSITIVE-CERT #x13)
+(define SIGNATURE-SUBKEY-BINDING #x18)
+(define SIGNATURE-PRIMARY-KEY-BINDING #x19)
+(define SIGNATURE-DIRECT #x1f)
+(define SIGNATURE-KEY-REVOCATION #x20)
+(define SIGNATURE-SUBKEY-REVOCATION #x28)
+(define SIGNATURE-CERT-REVOCATION #x30)
+(define SIGNATURE-TIMESTAMP #x40)
+(define SIGNATURE-THIRD-PARTY #x50)
+
+;;; Parsing
+
+  ;; Look at the tag byte and see if it looks reasonable, if it does
+  ;; then the file is likely not armored. Does not move the port
+  ;; position.
+
+(define (port-ascii-armored? p)
+  (let ((tag (lookahead-u8 p)))
+    (cond ((eof-object? tag) #f)
+          ((not (fxbit-set? tag 7)) #t)
+          (else
+           (let ((type (if (fxbit-set? tag 6)
+                           (fxbit-field tag 0 6)
+                           (fxbit-field tag 2 6))))
+             (not (<= PACKET-SESSION-KEY type PACKET-MDC)))))))
+
+(define (get-mpi/bytevector p)
+  (let* ((bitlen  (get-u16 p))
+         (bytelen (fxdiv (fx+ bitlen 7) 8)))
+    (get-bytevector-n p bytelen)))
+
+(define (get-mpi p)
+  (bytevector->uint (get-mpi/bytevector p)))
+
+(define (get-v4-length p)
+  ;; TODO: indeterminate length (only for data packets)
+  (let ((o1 (get-u8 p)))
+    (cond ((< o1 192) o1)
+          ((< o1 255)
+           (+ (fxarithmetic-shift-left (fx- o1 192) 8)
+              (get-u8 p)
+              192))
+          ((= o1 255)
+           (get-u32 p)))))
+
+(define (get-packet p)
+  (if (port-eof? p)
+      (eof-object)
+      (get-packet* p get-data)))
+
+(define (get-packet* p get-data)
+  (let ((tag (get-u8 p)))
+    ;; (unless (fxbit-set? tag 7) (error 'get-packet "Invalid tag" tag))
+    (cond ((fxbit-set? tag 6)                     ;New packet format
+           (let ((tag (fxbit-field tag 0 6))
+                 (len (get-v4-length p)))
+             (get-data p tag len)))
+          (else                                   ;Old packet format
+           (let ((tag (fxbit-field tag 2 6))
+                 (len (case (fxbit-field tag 0 2)
+                        ((0) (get-u8 p))
+                        ((1) (get-u16 p))
+                        ((2) (get-u32 p))
+                        ((3) #f))))
+             (get-data p tag len))))))
+
+(define (get-data p tag len)
+  (let ((pp (if len
+                (open-bytevector-input-port (get-bytevector-n p len))
+                p)))                              ;indeterminate length
+    (cond
+     ((= tag PACKET-SIGNATURE)
+      (get-signature pp))
+     ((= tag PACKET-PUBLIC-KEY)
+      (get-public-key pp #f))
+     ((= tag PACKET-TRUST)
+      'openpgp-trust)                             ;XXX: non-standard format?
+     ((= tag PACKET-USER-ID)
+      (get-user-id pp len))
+     ((= tag PACKET-PUBLIC-SUBKEY)
+      (get-public-key pp #t))
+     ((= tag PACKET-USER-ATTRIBUTE)
+      (get-user-attribute pp len))
+     ((= tag PACKET-ONE-PASS-SIGNATURE)
+      'one-pass-signature)                        ;TODO: implement
+     (else
+      (error 'get-data "Unsupported packet type" tag)))))
+
+(define-record-type 
+  (make-openpgp-public-key version subkey? time value fingerprint)
+  openpgp-public-key?
+  (version      openpgp-public-key-version)
+  (subkey?      openpgp-public-key-subkey?)
+  (time         openpgp-public-key-time)
+  (value        openpgp-public-key-value)
+  (fingerprint  openpgp-public-key-fingerprint))
+
+;;; Signatures
+
+(define-record-type 
+  (make-openpgp-signature version type pk-algorithm hash-algorithm hashl16
+                          append-data hashed-subpackets unhashed-subpackets
+                          value)
+  openpgp-signature?
+  (version               openpgp-signature-version)
+  (type                  openpgp-signature-type)
+  (pk-algorithm          openpgp-signature-public-key-algorithm)
+  (hash-algorithm        openpgp-signature-hash-algorithm)
+  (hashl16               openpgp-signature-hashl16) ;left 16 bits of signed hash
+  (append-data           openpgp-signature-append-data) ;append to data when hashing
+  (hashed-subpackets     openpgp-signature-hashed-subpackets)
+  (unhashed-subpackets   openpgp-signature-unhashed-subpackets)
+  (value                 openpgp-signature-value))
+
+(define (openpgp-signature-issuer sig)
+  (cond ((assq 'issuer (openpgp-signature-unhashed-subpackets sig)) => cdr)
+        ;; XXX: is the issuer always in the unhashed subpackets?
+        (else #f)))
+
+(define (openpgp-signature-creation-time sig)
+  (cond ((assq 'signature-ctime (openpgp-signature-hashed-subpackets sig))
+         => (lambda (x) (unixtime (cdr x))))
+        ;; XXX: should be an error?
+        (else #f)))
+
+(define (openpgp-signature-expiration-time sig)
+  (cond ((assq 'signature-etime (openpgp-signature-hashed-subpackets sig))
+         => (lambda (x)
+              (unixtime (+ (cdr x)
+                           (openpgp-signature-creation-time sig)))))
+        (else #f)))
+
+
+(define (get-openpgp-detached-signature/ascii port)
+  "Read from PORT an ASCII-armored detached signature.  Return an
+ record or the end-of-file object.  Raise an error if the
+data read from PORT does is invalid or does not correspond to a detached
+signature."
+  (let-values (((data type) (read-radix-64 port)))
+    (cond ((eof-object? data) data)
+          ((string=? type "PGP SIGNATURE")
+           (get-packet (open-bytevector-input-port data)))
+          (else
+           (error "expected PGP SIGNATURE" type)))))
+
+(define (hash-algorithm-name algorithm)        ;XXX: should be in Guile-Gcrypt
+  "Return the name of ALGORITHM, a 'hash-algorithm' integer, as a symbol."
+  (letrec-syntax ((->name (syntax-rules ()
+                            ((_) #f)
+                            ((_ name rest ...)
+                             (if (= algorithm (hash-algorithm name))
+                                 'name
+                                 (->name rest ...))))))
+    (->name sha1 sha256 sha384 sha512 sha224
+            sha3-224 sha3-256 sha3-384 sha3-512)))
+
+(define (verify-openpgp-signature sig keyring dataport)
+  "Verify that the data read from DATAPORT matches SIG, an
+.  Fetch the public key of the issuer of SIG from KEYRING,
+a keyring as returned by 'get-openpgp-keyring'.  Return two values: a status
+symbol, such as 'bad-signature or 'missing-key, and additional info, such as
+the issuer's OpenPGP public key extracted from KEYRING."
+  (define (check key sig)
+    (let*-values (((hash-algorithm) (lookup-hash-algorithm
+                                     (openpgp-signature-hash-algorithm sig)))
+                  ((port get-hash) (open-hash-port hash-algorithm)))
+      (dump-port dataport port)
+
+      ;; As per RFC4880 Section 5.2.4 ("Computing Signatures"), hash some of
+      ;; the fields from the signature packet.
+      (for-each (cut put-bytevector port <>)
+                (openpgp-signature-append-data sig))
+      (close-port port)
+
+      (let* ((signature  (openpgp-signature-value sig))
+             (public-key (openpgp-public-key-value key))
+             (hash       (get-hash))
+             (key-type   (key-type public-key))
+             (data
+              ;; See "(gcrypt) Cryptographic Functions".
+              (sexp->canonical-sexp
+               (if (eq? key-type 'ecc)
+                   `(data
+                     (flags eddsa)
+                     (hash-algo sha512)
+                     (value ,hash))
+                   `(data
+                     (flags ,(match key-type
+                               ('rsa 'pkcs1)
+                               ('dsa 'rfc6979)))
+                     (hash ,(hash-algorithm-name hash-algorithm)
+                           ,hash))))))
+        (values (if (verify signature data public-key)
+                    'good-signature
+                    'bad-signature)
+                key))))
+
+  ;; TODO: Support SIGNATURE-TEXT.
+  (if (= (openpgp-signature-type sig) SIGNATURE-BINARY)
+      (let* ((issuer   (openpgp-signature-issuer sig))
+             (key-data (lookup-key-by-id keyring issuer)))
+        ;; Find the primary key or subkey that made the signature.
+        (let ((key (find (lambda (k)
+                           (and (openpgp-public-key? k)
+                                (= (openpgp-public-key-id k) issuer)))
+                         key-data)))
+          (if key
+              (check key sig)
+              (values 'missing-key issuer))))
+      (values 'unsupported-signature sig)))
+
+(define (get-signature p)
+  (define (->hex n)
+    (string-hex-pad (number->string n 16)))
+
+  (define (get-sig p pkalg)
+    (cond ((= pkalg PUBLIC-KEY-RSA)
+           (print "RSA signature")
+           (string->canonical-sexp
+            (format #f "(sig-val (rsa (s #~a#)))"
+                    (->hex (get-mpi p)))))
+          ((= pkalg PUBLIC-KEY-DSA)
+           (print "DSA signature")
+           (let ((r (get-mpi p)) (s (get-mpi p)))
+             (string->canonical-sexp
+              (format #f "(sig-val (dsa (r #~a#) (s #~a#)))"
+                      (->hex r) (->hex s)))))
+          ((= pkalg PUBLIC-KEY-EDDSA)
+           (print "EdDSA signature")
+           (let ((r (get-mpi/bytevector p))
+                 (s (get-mpi/bytevector p)))
+             ;; XXX: 'verify' fails down the road with GPG_ERR_INV_LENGTH if
+             ;; we provide a 31-byte R or S below, hence the second argument
+             ;; to '->hex' ensuring the MPIs are represented as two-byte
+             ;; multiples, with leading zeros.
+             (define (bytevector->hex bv)
+               (let ((str (bytevector->base16-string bv)))
+                 (if (odd? (bytevector-length bv))
+                     (string-append "00" str)
+                     str)))
+
+             (string->canonical-sexp
+              (format #f "(sig-val (eddsa (r #~a#) (s #~a#)))"
+                      (bytevector->hex r) (bytevector->hex s)))))
+          (else
+           (list 'unsupported-algorithm
+                 (public-key-algorithm pkalg)
+                 (get-bytevector-all p)))))
+  (let ((version (get-u8 p)))
+    (case version
+      ((3)
+       (let-values (((hmlen type ctime keyid pkalg halg hashl16)
+                     (get-integers p u8 u8 u32 u64 u8 u8 u16)))
+         (unless (= hmlen 5)
+           (error "invalid signature packet"))
+         (print "Signature type: " type " creation time: " (unixtime ctime))
+         (print "Hash algorithm: " (openpgp-hash-algorithm halg))
+         (let ((value (get-sig p pkalg)))
+           (unless (port-eof? p)
+             (print "Trailing data in signature: " (get-bytevector-all p)))
+           (make-openpgp-signature version type
+                                   (public-key-algorithm pkalg)
+                                   (openpgp-hash-algorithm halg) hashl16
+                                   (list (integers->bytevector u8 type
+                                                               u32 ctime))
+                                   ;; Emulate hashed subpackets
+                                   (list (cons 'signature-ctime ctime))
+                                   ;; Unhashed subpackets
+                                   (list (cons 'issuer keyid))
+                                   value))))
+      ((4)
+       (let*-values (((type pkalg halg) (get-integers p u8 u8 u8))
+                     ((hashed-subpackets)
+                      (get-bytevector-n p (get-u16 p)))
+                     ((unhashed-subpackets)
+                      (get-bytevector-n p (get-u16 p)))
+                     ((hashl16) (get-u16 p)))
+         (print "Signature type: " type)
+         (print "Hash algorithm: " (openpgp-hash-algorithm halg))
+         (let ((value (get-sig p pkalg)))
+           (unless (port-eof? p)
+             (print "Trailing data in signature: " (get-bytevector-all p)))
+           (let* ((subpacket-len (bytevector-length hashed-subpackets))
+                  (append-data
+                   (list
+                    (integers->bytevector u8 version
+                                          u8 type
+                                          u8 pkalg
+                                          u8 halg
+                                          u16 subpacket-len)
+                    hashed-subpackets
+                    ;; http://www.rfc-editor.org/errata_search.php?rfc=4880
+                    ;; Errata ID: 2214.
+                    (integers->bytevector u8 #x04
+                                          u8 #xff
+                                          u32 (+ 6 subpacket-len)))))
+             (make-openpgp-signature version type
+                                     (public-key-algorithm pkalg)
+                                     (openpgp-hash-algorithm halg)
+                                     hashl16
+                                     append-data
+                                     (parse-subpackets hashed-subpackets)
+                                     (parse-subpackets unhashed-subpackets)
+                                     value)))))
+      (else
+       (print "Unsupported signature version: " version)
+       'unsupported-signature-version))))
+
+(define (parse-subpackets bv)
+  (define (parse tag data)
+    (let ((type (fxbit-field tag 0 7))
+          (critical? (fxbit-set? tag 7)))
+      (cond
+       ((= type SUBPACKET-SIGNATURE-CTIME)
+        (cons 'signature-ctime
+              (bytevector-u32-ref data 0 (endianness big))))
+       ((= type SUBPACKET-SIGNATURE-ETIME)
+        (cons 'signature-etime
+              (bytevector-u32-ref data 0 (endianness big))))
+       ((= type SUBPACKET-TRUST-SIGNATURE)
+        (cons 'trust-signature
+              (bytevector-u8-ref data 0)))
+       ((= type SUBPACKET-REVOCABLE)
+        (cons 'revocable
+              (= (bytevector-u8-ref data 0) 1)))
+       ((= type SUBPACKET-KEY-ETIME)
+        (cons 'key-etime
+              (bytevector-u32-ref data 0 (endianness big))))
+       ((= type SUBPACKET-PREFERRED-SYMMETRIC-ALGORITHMS)
+        (cons 'preferred-symmetric-algorithms
+              (map symmetric-key-algorithm (bytevector->u8-list data))))
+       ((= type SUBPACKET-ISSUER)
+        (cons 'issuer
+              (bytevector-u64-ref data 0 (endianness big))))
+       ((= type SUBPACKET-NOTATION-DATA)
+        (let ((p (open-bytevector-input-port data)))
+          (let-values (((f1 nlen vlen)
+                        (get-integers p u8 _ _ _ u16 u16)))
+            (let* ((name (get-bytevector-n p nlen))
+                   (value (get-bytevector-n p vlen)))
+              (cons 'notation-data
+                    (list (utf8->string name)
+                          (if (fxbit-set? f1 7)
+                              (utf8->string value)
+                              value)))))))
+       ((= type SUBPACKET-PREFERRED-HASH-ALGORITHMS)
+        (cons 'preferred-hash-algorithms
+              (map openpgp-hash-algorithm (bytevector->u8-list data))))
+       ((= type SUBPACKET-PREFERRED-COMPRESSION-ALGORITHMS)
+        (cons 'preferred-compression-algorithms
+              (map compression-algorithm (bytevector->u8-list data))))
+       ((= type SUBPACKET-KEY-SERVER-PREFERENCES)
+        (cons 'key-server-preferences
+              (if (and (>= (bytevector-length data) 1)
+                       (fxbit-set? (bytevector-u8-ref data 0) 7))
+                  (list 'no-modify)
+                  (list))))
+       ((= type SUBPACKET-PREFERRED-KEY-SERVER)
+        (cons 'preferred-key-server (utf8->string data)))
+       ((= type SUBPACKET-PRIMARY-USER-ID)
+        (cons 'primary-user-id (not (zero? (bytevector-u8-ref data 0)))))
+       ((= type SUBPACKET-POLICY-URI)
+        (cons 'policy-uri (utf8->string data)))
+       ((= type SUBPACKET-KEY-FLAGS)
+        (cons 'key-flags (bytevector->bitnames
+                          data
+                          '(certification sign-data
+                                          communications-encryption
+                                          storage-encryption
+                                          split-key authentication
+                                          group-key))))
+       ((= type SUBPACKET-SIGNER-USER-ID)
+        (cons 'signer-user-id (utf8->string data)))
+       ((= type SUBPACKET-REASON-FOR-REVOCATION)
+        (let* ((p (open-bytevector-input-port data))
+               (revocation-code (get-u8 p)))
+          (cons 'reason-for-revocation
+                (list revocation-code
+                      (if (port-eof? p)
+                          ""
+                          (utf8->string (get-bytevector-all p)))))))
+       ((= type SUBPACKET-FEATURES)
+        (cons 'features (bytevector->bitnames
+                         data '(modification-detection))))
+       ((= type SUBPACKET-EMBEDDED-SIGNATURE)
+        (cons 'embedded-signature
+              (get-signature (open-bytevector-input-port data))))
+       (else
+        ;; Unknown subpacket type.  If it is critical, then the signature
+        ;; should be considered invalid.
+        (print "Unknown subpacket type: " type)
+        (if critical?
+            (error "unrecognized critical signature subpacket" type)
+            (list 'unsupported-subpacket type data))))))
+
+  (let ((p (open-bytevector-input-port bv)))
+    (let lp ((subpackets '()))
+      ;; In case of multiple subpackets of the same type, the last
+      ;; one should be used. Therefore the list is not reversed
+      ;; here.
+      (if (port-eof? p)
+          (reverse subpackets)
+          (let* ((len (- (get-v4-length p) 1))
+                 (tag (get-u8 p))
+                 (sp (parse tag (get-bytevector-n p len))))
+            (print "#;Subpacket " sp)
+            (lp (cons sp subpackets)))))))
+
+;;; Public keys
+
+
+(define (openpgp-public-key-id k)
+  (let ((bv (openpgp-public-key-fingerprint k)))
+    (bytevector-u64-ref bv
+                        (- (bytevector-length bv) 8)
+                        (endianness big))))
+
+(define (get-public-key p subkey?)
+  (define (fingerprint p)
+    (let ((len (port-position p)))
+      (set-port-position! p 0)
+      (let-values (((sha1-port get)
+                    (open-hash-port (hash-algorithm sha1))))
+        (put-u8 sha1-port #x99)
+        (put-u16 sha1-port len)
+        (dump-port p sha1-port)
+        (close-port sha1-port)
+        (get))))
+  (define (get-key p alg)
+    (define (->hex n)
+      (string-hex-pad (number->string n 16)))
+
+    (cond ((= alg PUBLIC-KEY-RSA)
+           (print "Public RSA key")
+           (let* ((n (get-mpi p)) (e (get-mpi p)))
+             (string->canonical-sexp
+              (format #f "(public-key (rsa (n #~a#) (e #~a#)))"
+                      (->hex n) (->hex e)))))
+          ((= alg PUBLIC-KEY-DSA)
+           (print "Public DSA key")
+           (let* ((p* (get-mpi p)) (q (get-mpi p))
+                  (g (get-mpi p)) (y (get-mpi p)))
+             (string->canonical-sexp
+              (format #f "(public-key (dsa (p #~a#)(q #~a#)(g #~a#)(y #~a#)))"
+                      (->hex p*) (->hex q) (->hex g) (->hex y)))))
+          #;
+          ((= alg PUBLIC-KEY-ELGAMAL-ENCRYPT-ONLY) ; ; ; ;
+          (print "Public El-Gamal Key")         ; ; ; ;
+          (let* ((p* (get-mpi p)) (g (get-mpi p)) (y (get-mpi p))) ; ; ; ;
+          (make-public-elgamal-key p* g y)))
+          ((= alg PUBLIC-KEY-EDDSA)
+           ;; See
+           ;; 
+           ;; and openpgp-oid.c in GnuPG.
+           (print "Public EdDSA key")
+           (let* ((len     (get-u8 p))
+                  (oid     (bytevector->uint (get-bytevector-n p len)))
+                  (q (get-mpi p)))
+             (define curve
+               (match oid
+                 (#x2b06010401da470f01   'Ed25519)
+                 (#x2b060104019755010501 'Curve25519)))
+
+             (string->canonical-sexp
+              (format #f "(public-key (ecc (curve ~a)(flags ~a)(q #~a#)))"
+                      curve
+                      (if (eq? curve 'Curve25519) 'djb-tweak 'eddsa)
+                      (->hex q)))))
+          (else
+           (list 'unsupported-algorithm           ;FIXME: throw
+                 (public-key-algorithm alg)
+                 (get-bytevector-all p)))))
+  (let ((version (get-u8 p)))
+    (case version
+      ((4)
+       (let-values (((ctime alg) (get-integers p u32 u8)))
+         (print "Key creation time: " (unixtime ctime))
+         (let ((key (get-key p alg)))
+           (unless (port-eof? p)
+             ;; Probably an error? Gonna cause trouble anyway.
+             (print "Trailing data in public key: " (get-bytevector-all p)))
+           (let ((digest (fingerprint p)))
+             (make-openpgp-public-key version subkey? ctime key
+                                      digest)))))
+      (else
+       (print "Unsupported public key version: " version)
+       'unsupported-public-key-version))))
+
+(define (openpgp-public-key-primary? key)
+  (and (openpgp-public-key? key)
+       (not (openpgp-public-key-subkey? key))))
+
+;;; User IDs and User attributes
+
+
+(define-record-type 
+  (make-openpgp-user-id value unparsed)
+  openpgp-user-id?
+  (value     openpgp-user-id-value)
+  (unparsed  openpgp-user-id-unparsed))
+
+(define (get-user-id p len)
+  (let ((unparsed (get-bytevector-n p len)))
+    (make-openpgp-user-id (utf8->string unparsed) unparsed)))
+
+(define-record-type 
+  (make-openpgp-user-attribute unparsed)
+  openpgp-user-attribute?
+  (unparsed   openpgp-user-attribute-unparsed))
+
+(define (get-user-attribute p len)
+  (let ((bv (get-bytevector-n p len)))
+    ;; TODO: bv contains subpackets. Type 1 is JFIF.
+    (make-openpgp-user-attribute bv)))
+
+
+;;; Keyring management
+
+(define-record-type 
+  (openpgp-keyring table)
+  openpgp-keyring?
+  (table openpgp-keyring-table))              ;vhash mapping key id to packets
+
+(define (lookup-key-by-id keyring id)
+  "Return a list of packets for the key with ID in KEYRING, or #f if ID could
+not be found.  ID must be the 64-bit key ID of the key, an integer."
+  (match (vhash-assv id (openpgp-keyring-table keyring))
+    ((_ . lst) lst)
+    (#f '())))
+
+;; Reads a keyring from the binary input port p. It must not be
+;; ASCII armored.
+
+(define %empty-keyring
+  ;; The empty keyring.
+  (openpgp-keyring vlist-null))
+
+(define* (get-openpgp-keyring port
+                              #:optional (keyring %empty-keyring)
+                              #:key (limit -1))
+  "Read from PORT an OpenPGP keyring in binary format; return a keyring based
+on all the OpenPGP primary keys that were read.  The returned keyring
+complements KEYRING.  LIMIT is the maximum number of keys to read, or -1 if
+there is no limit."
+  (let lp ((pkt (get-packet port))
+           (limit limit)
+           (keyring (openpgp-keyring-table keyring)))
+    (print "#;key " pkt)
+    (cond ((or (zero? limit) (eof-object? pkt))
+           (openpgp-keyring keyring))
+          ((openpgp-public-key-primary? pkt)
+           ;; Read signatures, user id's, subkeys
+           (let lp* ((pkt (get-packet port))
+                     (pkts (list pkt))
+                     (key-ids (list (openpgp-public-key-id pkt))))
+             (print "#;keydata " pkt)
+             (cond ((or (eof-object? pkt)
+                        (eq? pkt 'unsupported-public-key-version)
+                        (openpgp-public-key-primary? pkt))
+                    ;; KEYRING is indexed by key-id.  Key ids for both the
+                    ;; primary key and subkeys all point to the list of
+                    ;; packets.
+                    (lp pkt
+                        (- limit 1)
+                        (fold (cute vhash-consv <> (reverse pkts) <>)
+                              keyring key-ids)))
+                   ((openpgp-public-key? pkt)     ;subkey
+                    (lp* (get-packet port) (cons pkt pkts)
+                         (cons (openpgp-public-key-id pkt) key-ids)))
+                   (else
+                    (lp* (get-packet port) (cons pkt pkts) key-ids)))))
+          (else
+           ;; Skip until there's a primary key. Ignore errors...
+           (lp (get-packet port) limit keyring)))))
+
+
+;;;
+;;; Radix-64 (RFC4880).
+;;;
+
+(define (crc24 bv)
+  "Compute a CRC24 as described in RFC4880, Section 6.1."
+  (define poly #x1864cfb)
+
+  (let loop ((crc #xb704ce)
+             (index 0))
+    (if (= index (bytevector-length bv))
+        (logand crc #xffffff)
+        (let ((crc (logxor (ash (bytevector-u8-ref bv index) 16)
+                           crc)))
+          (let inner ((i 0)
+                      (crc crc))
+            (if (< i 8)
+                (let ((crc (ash crc 1)))
+                  (inner (+ i 1)
+                         (if (zero? (logand crc #x1000000))
+                             crc
+                             (logxor crc poly))))
+                (loop crc (+ index 1))))))))
+
+(define %begin-block-prefix "-----BEGIN ")
+(define %begin-block-suffix "-----")
+
+(define %end-block-prefix "-----END ")
+(define %end-block-suffix "-----")
+
+(define (read-radix-64 port)
+  "Read from PORT an ASCII-armored Radix-64 stream, decode it, and return the
+result as a bytevector as well as the type, a string such as \"PGP MESSAGE\".
+Return #f if PORT does not contain a valid Radix-64 stream, and the
+end-of-file object if the Radix-64 sequence was truncated."
+  ;; This is the same as 'get-delimited-base64', except that it implements the
+  ;; CRC24 check.
+  (define (skip-headers port)
+    ;; Skip the Radix-64 "armor headers".
+    (match (read-line port)
+      ((? eof-object? eof) eof)
+      ((= string-trim-both "") "")
+      (_  (skip-headers port))))
+
+  (let ((line (string-trim-right (read-line port))))
+    (if (and (string-prefix? %begin-block-prefix line)
+             (string-suffix? %begin-block-suffix line))
+        (let* ((kind (string-drop-right
+                      (string-drop line (string-length %begin-block-prefix))
+                      (string-length %begin-block-suffix)))
+               (end  (string-append %end-block-prefix kind
+                                    %end-block-suffix)))
+          (skip-headers port)
+          (let loop ((lines '()))
+            (let ((line (read-line port)))
+              (match line
+                ((? eof-object? eof)
+                 (values eof kind))
+                ((= string-trim-both "")
+                 (loop lines))
+                ((= string-trim-both str)
+                 (if (string=? str end)
+                     (match lines
+                       ((crc lines ...)
+                        ;; The last line should be the CRC, starting with an
+                        ;; "=" sign.
+                        (let ((crc  (and (string-prefix? "=" crc)
+                                         (base64-decode (string-drop crc 1))))
+                              (data (base64-decode
+                                     (string-concatenate-reverse lines))))
+                          (if (and crc (= (bytevector->uint crc) (crc24 data)))
+                              (values data kind)
+                              (values #f kind))))
+                       (_
+                        (values #f kind)))
+                     (loop (cons str lines))))))))
+        (values #f #f))))
diff --git a/tests/civodul.key b/tests/civodul.key
new file mode 100644
index 0000000000..272600ac93
--- /dev/null
+++ b/tests/civodul.key
@@ -0,0 +1,1345 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFPo4hABEAC6adMaPpwpJiqG/Ggk0YoOdUeRX5GOOpzR2XA/SoFZu0XWuhgJ
+InAARRKI6K9IO3eHCWIjeKvY+lyrxmNFlXx0Y7OH/BVK9GeL65f7996R2dCqSuhj
+5K6dxUzqFSHnpSDkM3t4v8L7vU8XKlW99DTBJT45RKyIVlSj7Ye6nsCxrMIRShbE
+eF5ksXAihBfXGxW5mozjvAlJCTQPoXPGb+jR3l8CRY4JiyvqU9IszBvkRbywC1MQ
+sCoEOGcJsKbHnSiy+dt6QaZKvCr5qSwcEqKzfNAEKRyGouQTwwAak7FvZXw8GcVL
+U/MYGlQ1ISAzwdYxGCIM4l/4VyI38c6TbspIETR713IMsXQAn5HSxo1SZWe2wuQq
+BgjGES7UpphzV4DIpBTwv0Z8oXG9LclxkLM/ndkvMs4RX4aPqRPrJ0raJ6awfT3D
+bAwIMi9iqqbaRPIeVKgUtlB4IF8Lg8kyy3QuimmZjRZJD9l8MCYznwa1n/LbQi4V
+w0Yvbd6R/6avaLqynU5K7SmiLYLamzOdDJR0kFEGD6nB6tjg6/kV81vV50qf8XIh
+4wEpW0Hu7U+q1IBA4baaVRb2JrV0gsMcE2ym6RA94OAi8a1Q+0dZ4V70yvwsDDR5
+2yRmh7w3e+TEEAsXLA2frcBo0QeBdttSmg8jyKAn8XwnzAKc6XrVg+GJfQARAQAB
+tB9MdWRvdmljIENvdXJ0w6hzIDxsdWRvQGdudS5vcmc+iQJZBBMBAgBDAhsDBwsJ
+CAcDAgEGFQgCCQoLBBYCAwECHgECF4ACGQEWIQQ85GRVioT9xp20DPsJCxGZPZrr
+tQUCXMa8zAUJCTojvAAKCRAJCxGZPZrrtSScEACtLtIhNsCHPvD3zFo7Jajp/5rd
+7a0hwyJSpwW7pq3VCKkwvIzQ90Ce50FyE7CX7Qvkg6v9axcmgtXA7MLGcRpaTOjW
+IRnjIMp1GzO8r3PPMtLvQ+EPbW08BBkTIoO8R+raINL15TbvRZGuzWi9eLRcnEoU
+erD+EbMeooNRSchBi7PRcow09GrrFQvrMrAqRj49xhu9mNXoM8+ULyrKJ7z40LkP
+E4EgoRlbK2r1w2s3ANUmnOyBX9qOXQ9sBbHvxGXHIQprLynfvLtfts9FI8XdmuIe
+UfZhdwbgQgFrkHH4NuJIQVB/qhWepPAfgmzMS4jm7VUIE/BLeX8nqcTGh6MdJdaf
+5M+pUMGcXDi3iez++WLXCMUivPNMDR6IwOno0NfgtoNtlD2JtPyMHAeZGMlQYkoX
+E2zcvPlBKuOdyx6ekVT+bq65G5263j424j6WfMhHBn1PgXl1pDn5npYUKxhbw2Qq
+AXK1xifT6sVn4P6Tv/GKfWgIwOROObj6qxRxbDj5QxXS35UMPKjS0+hpbEkIADz/
+IPOxmZ1C7rirzIzlaTtq8hElaCF9dfkoAL6PS3VYmG7Vn/sjihUAuv27xJwNgtAO
+IJTIY8l5+fEVr2nS+FHh3XqeLNRtPubzvCV0nQ5KWdO3tXKsUuyeXubEGUJQkTJ7
+zCNusvi1uZDUmQ5TU4hGBBARAgAGBQJT6ONIAAoJEHfdleLqUuz0T7kAoJQEMldt
+hy+34Tre+WZw0an6P9WsAJ9cMnrJrOwMuF+awipij9hfX9usxYkCHAQQAQoABgUC
+U++ZtwAKCRDcaGontDSBsHC9D/9+Q6F/cgrnt5xE/DTVW48F9OvpbngRzZ9rt0ZP
+P/uzR4rOPHuu18ykPgQdn9HdyxrQhmh4cg1iiiYB2YdVlW2UJ8wbPBIsN5zs0IQa
+qWqB6hB5VTm0K6hjjGhoxGtoE+aaLVLylvUXTCtlMo5yHsu27Lpgwl27AWl1+EpC
+bNBpwHXPPJm9O6a5I14s4v1+XIM0zxlIkX3tL/eefp15maDfzF4Eh0MQwMietzrC
+1yXr2fHkqEsrcxX2Rl0SAIPxOojoE5zFhx/UUOfzCRzyklBP940y/+wQYmNeZH9g
+HDHL+rruZp5pLhB0KUEEa1HwrjNkydDoPrfM/DAj9zZ4PtLOUHt8s89ycC/HS4Cj
+H6R1EWZWov5oKEhCp2TfrUfvBi4iL0cKVNg1ZZaE/rViUqShVW/036PzNmbsXLNs
+hNs8aYeeJ51BUU7L/GO7XlP5nEtk2vHbWta+T4Jyeap661+6AYfZG9/DE3T1fuQ/
+fylFUVBlyEMh8ZtbRv2UDif6cKhvcLbOX5vEFYxXPhvAmgb3Wdc7xKHHXCCt6lB2
+4eKXYr0IbW4rJUUZPkRDEXARVaqHudi5Pwxg+LnVB5qjKmOtDo3Ipe+qL1muhw7B
+tE0OacOOv7fDR3xKdfzQ3AazyQlZY45lDKicfamOyRBWud/HgJ1H7JippXVQ7QEa
+PY1qS4kCHAQQAQgABgUCU+9bQgAKCRDdwPU1iBL48kLnD/0R+CLb5XDz6qwzcw0U
+uma3015zIcduR0xzElvqNaFNpx0c5QBcVd/OXlpgXGcIlQFDN6KNZ06Eey86eeXx
+BQpNfXbCSv8PCeYwsT+e6fWNqZfKgADsh8P/T5NuM6f9VPf+yq4T9zM93r2BAJAb
+61StLGlhJLE9hMeZd30ue2ZfF+ePm1Fb/DmbFZI8OROAHkIzfpVI0oQDOPU0Y+ZY
+/oFYjVZ4l9tkbUR2bN5nXCmEFJwIIoxz/vvO0NhOvReFipGdMXFEtN8o+FoXC1ml
+uFkicyz8yXsRVAbeuHxHo82Qigv27dzu6r0nMPUghW5YVHHGyEtFtpnM/AXHoG+u
+npK7PucBr802Gq5C2T2pDnJbnpKIiwo0oCLsxeGh0Q9aKc8XR/Mu9rtYJRYdvswR
+C8BkIMB10saVKQ/H8H9SIiT3e7uCrktW7BA5P12pNQgD+DFkDqqQq0kRRQlLSOFn
+lbkQHGGSlWP7GPGFD7/5UdB0K5MpTyYqAb5UxcTQuqsJLR+IajfyuIDNub3dXoQo
+3NJOuXivYRISIRqGhaPz62EAKnNJCq8gb0kgvjo+O+N0Sy7at5H6uKM2NwSqWIDh
+XYbdThkumaKj6JVnHAn41crkvIbSt9de7XOAiVHUaiy2uBT9VkUNujno25VITk5P
+FXVqIWMinpOuZe6oM8GyIysvL4kBHAQTAQIABgUCU/DHMgAKCRDMedgKW7f8USHC
+B/97iZc3FzDHP6tav6jYL9m5lF6n7udiHKBhU0htfT1v8P2u/5BIQwaObRi9mRqX
+qaHsd1qt7zCEKSOBwbGyJlaDI8MDMVXItA8KxxD5m8c/O0IOU+6vzK9L/NiPvWIa
+6vlCDl6OURI+OlAeSBdXDuY8d4hiHO1eX1VCeCL42PH0iDYnThZAGfED4dp8ORfD
+YrWjxoHhukJXZWemBLwtlM1Mim+NAbjrgoHAyf4JNqotA0kfo/TIoDlxPE6pO5/v
+3KbtCraoH/h1tHpCuFRnXqk9dJmDzSZFobEjhS4yR1gk7KDJLOg5EcvoDOAfVTFj
+zEePvpCUuAuOc2f4hcfYOP7ciEYEExECAAYFAlPx/IIACgkQvzOavibF0obc4ACf
+YNmKPZU/mG/mV12EIgxfgWVMRukAn2N0Fw1fKOvl/TvUDQuuvLnPHI8SiF4EEBEI
+AAYFAlPyVK4ACgkQ99XJv3ZcYeNu4wD/alzBpG0B1tvh3HO4n65YzZTWjdSIW2Nv
+k32AN2eD8M4A/0A3EEObGkf8/bs+472F/rmy0IErTpubsT6ftBYILNX3iQEcBBAB
+AgAGBQJT86eWAAoJEI/xy26NiQWflzoH/jZ6tGQp8PB/7fZh6TmyArb9vlrNi/1a
+MktVWBEMKPV0OETsCzQ0iJPh4EjkiqzArwsQnz6/eNUkNh4+mgIKnfbJLBvaOCVY
+vBeuW0oJ7TUkQ4f0/TeEEabVP6TZOsQCFOnBwN+Kavv4kaGnx4zvcFel8GHKt5QT
+8lQ0G/aDAGmMQQn3VMteNf5OatPLHgaqg211vJ4Jmlf1B8Gug6aYIsKoqzSN8nbp
+8hjukaSgbLJdYm1VqfaXl/gyVrO80QE2/wwdla8y7Mt/CLWG4n71CteN7qaiw071
+hr8BAAZzUeL2mLetm1XX+2O4LcYoc/QoyhG+DeOkJn9DvC6w4ZihSAaJARwEEgEC
+AAYFAlP0ecEACgkQBG7e5ut6t02iVQgAkvn05vn7OXvUIxJEj5+V7wU1PFQdv9ND
+YnMReCwjwzjWEoyyhpkFIQOgd29bZKMouMTJ6y3sbXUCNhkU+VO6NmUl8cBXJVjt
+0S4XAC8FW3gUmKz3P/klMU/S19j1lrgeyF04balyewv7k48CkJYzg8eY6SGepTKc
+ixcYA4/Q87JurrXAcDuam80LnJNxqy2PDbgXiPsmLTq1IZWXk63AatNcB1W6JTxt
+pVpI+eInOdOll8cvk04JNNZH2AhJ9GyllYXalbKGahApGmfxUCblVAUlmcR2sS6T
+4LgijtSr3RCzDpn2GOgoPMPfqRctMCF2IwgoIQkD/AJyEI40cJkD64hGBBMRAgAG
+BQJT8b8nAAoJEL9gcItIQmx+HE8AoLVnkoAJ4jmGVbYuNQIWD6RjqcvcAKCVsck8
+2G7r/WxcERUyeOcnmueESIkCHAQQAQIABgUCU/SVKgAKCRA++QUjswSvCPTWD/0d
+pwmceNoQFwKd2iSrgKL1rdj1MaAAoUswuXJEGiLwnT1NzbnCEl2BUUKXNwoE4fsY
+VvNkV5AZv8Xj+G5QF6zpWCgwWRZnUzSt4dKUOVrY41ODbVjDZl/VDSbjR3JNYH8G
+REThd3tCmjnsch5wUxP4y22gAy/bsVhcmPgeDY7o1kSdRvJKgiPXcu2t5AUxokiO
+p+WPv1kIjSOf1Jzl9A4rN7ILZyPe3sQT9P/k7zKjodrIsCjbAK5ZO6/acF6WWUFs
+qiRllJu+4DfIL8tXAwN2/76TI1nzyhysTmJpIznsLC8l4obMkQKsPyabGWcQF5eM
+Apcpl0b7I2/LTRd+x1cHDW55sTl5RI2YBWTpHMmxAJJchs/xcICrGeXGhIu2ZZA1
+P8fnZOzGaOtELg3e5O8PIBzB4d0zALXVIklGOdM1/J8sQ2j2YaD+bKDMCotCeMPt
+n7ik3/2plSnYCNAFaIHq/LgMgs0sSDVyWb5qT1IC5TS7bWmQlWQLBsCmgmzuTZQ4
+vBcsGuFRdQDcY5fTdbgo6Qnft0n3cnq5MfrnAys8UJT386qnR5QU5fXEyvBF8D/a
+oZksOiR6CyenD5ey58xXzGeJRRdiT02//jWk4dpwqmegOx/8jBzrMvg/W8k4SQQP
+iF0AfZuT24pdsCipRgTcnq3tfSx5dJ9HhH69o3XnFYkCHAQQAQoABgUCVANUWQAK
+CRDQF4x2fQae5vGQEADHXQY//PSGWa1xaOpWuwokUPTBGslQailq4tvNRc194/0w
+XNw9iOkgQ48kXe9Cg+YvvoZBHX6cnPZBh5tlJdq8LuASeBpevtN2ztB5AaCfdRUL
+X9FcvFwWLy7MdUueDn5GKht37v24Uc0uJ+YPfNBF19zM0mq+8xhHVcZLNMPuySDb
+CQ5nxLxO89W9uqflASAnlg96XNpsBrbLXKG5sd+XKiCTHTQp2yw5vRUlTrRs6cxy
+1ev76sMOMoeKHWCaZO955JGJub3h/G4VkbTkjvvXMga7d9P28mAKc+QaM6X6LET/
+EnFgqsP4VvmhQwSlLWgH0paCF2TkCvGVl/vaER+sZwy98tYfQBiW89JSR+CCDYEX
+WgCjQjMZSHDc4xbtwny2HE4kzFz3fRcP3kDtHvTskh8ENeHv787Yy3W9w0SjXDlU
+wlRh7gdETeY5PNtra9bHl8vLnTO+BRBGjxVImujzGt72JxWHIPIx4oPEwI9s95u4
+BCTGxLs8YbjhCUVkLLNXAF5R1+OEEsdm12y5d07DuZahKyrLJHmlisBeSyys6NXa
+kHGICN4ubZfqt+1bhAbIFCviyB4Iac2C6tZ1WNDDbmQPUmjNSkdYQTqEXE/tJmJ5
+8DtZT06G/O6DRKaB5NgeZsCZQj8cQLgEyiuxFVE/N8yQXS/zhqdQPx6vpt8wP4kC
+HAQQAQIABgUCVAxV0AAKCRCnFVVnMnGZSOwLD/974JpXLU2iliqxkiTYH9u82Kb6
+0LXBlAkMoNydVcygjZSwMG9+7w03T6t4GwP89LSyX2qxx+hsQQtuFqhzE8YckUGs
+B1UYikmpAbHIOpiqiXSXt2Th4RlgRo59KuQflXgve7myPncyGU3CZi6n4qpEj5aM
+P5lM+QPPL+GBfhOBfXKqKsqGNgK05r0+9bYw1pAyTflyTkYcjiBWhjqYOV/GIfpz
+GvLebwHJG+IwQlED3qtDxs2EJwNd6Q/b9VP4XpTpvUNSvC5Zch0MmqA0hpfawr93
+XBI+fJwak5aMgEif2oi/QumASi2MhukmWmbxGevJ+Qy9kwhGliN6w5czem0Ae9n6
+3KS5FygvOwg3ZpXaCvPUrb/f49Y9Hewe2QAECzsjBbNxgb5DrFfLhNOfWZbuS8o4
+7QMt5aXm0v7BvMAADZdLkV61EpzgcKmP0mJzkmAfHkHKeeErsuPy7ZRFifUHmpMd
+iaJqqNYQg4BOZ48fNPTXBK6NbkTLcnFr86RPLVosTDEJnM0ADA6AuhG+1jKcBXzV
+qitKYPePgP29FAOlRwQTd/eBflNMGuRi9+WTHKlAflFQiNTVctEJZVpmdSe2MVVw
+zoinxnlGcc5Rv9+a4dHmE9oYIhjB3abU6qqCD5TxUVLM2yQUf8MDjHAZKvBUqrI+
+S2UfthMWuQZZ3+Yn54kCHAQQAQoABgUCVH3nVQAKCRDyhGsaDTLEQokjD/0RdkO8
+hZowKLzf6zhQhWqyYO4CPHBSfBKpRA3sZ5hGzOWA9ZZ0dzfyd80cjaSmmFWuiTqC
+Gz55GCYGIQyqqT4CLrONF9J0SPiPIwTDAe8KPjT1cTdpNcii+3ykk9kynFVw7B4/
+e+ksAYJDQ3kfuiNyLZS9ejb3tUIiTkYH7F9DAakacnEOchre6T75F6JLR6QZ9zyA
+guQDsaxjdn6jhZjQTFjBmAZcRNq81Nt2TTX7X/iqu7UAs7vmT4gaPKvCodwtCO/5
+Va+/GYFEAjiCfH+lgwRj5YdKU4wpbQfUMhEzampkZJKfrKfhqVw3Dtx++WjkcWdo
+D+z1oYiAxnxeue7b39v3yEky5+ipO0EWFLZ5Fdbp60lOp1d3+LjUm2+B7qonByn8
+WVPpKWgKhes/2kVHenFfDVveHSd7xPp7vFrz5Hm8I6MkWnGcjSnpfOH4Wgrp1+NM
+aOmP9px5Rs3Hn4ZBLWe5w6JyoFBl8YArMGfFfaZd5vaDQvX+rGPShbS85mAmnSKt
+Kj5ZpTMxiOr6hRBMNISHEqR7plQBgICgqfPKTPx57/7FLz4eO60jUbih2i5wortw
++STsvHEFy3TWe/Lu2W6yl+Lbts8Zd9FJ1qwWCkwbTL8XGjQnb/uhc2xk7i5FWBiF
+scyEaBkimmQPbwzsDoUFOVkoHOsKhU1ELlmz/okBHAQTAQgABgUCVeJ8DAAKCRAZ
+eliII1+srE+SB/4w0pyr7OMioN7lvao/AQxClncUtFQpD6VcejExVXPH+7JxOjmM
+Av/G5sBWRT5BV/StsRxO+kgMBk9a9UHqucwMKr3g/NYEiedqgkEK818waXYYMobF
+bTEw518E0T4I39hKlAjX4rKbR4q7Td3tOkGxjUqQ6Kvk/C/eHAnK92msRnFnlQly
+RaqxAyMX+z0ei4uM6yYJmNw5ObwPaA06OA7Fq7/6EqPxV8qEu2An/0VOxe/Nhf/8
+mhttOHY0dyM7rcIV3RbvGpTGEgdqBaCmX39EN+Gcs8hyVAC2/Wr+22zwWsNMfNTw
+rb3qunsRetHam48KG9Tjgwk9TLx07Kx/cKhTiQIcBBMBCAAGBQJWDbPkAAoJEJOe
+a+Hin8PM1j4P/1zzyzL4dM1rkUc5R8032j3Oa1mxb7SxL2RJQ7VXXucOnsKwmuQs
+6khWQjwPWf3jCSt4cK3pa7Aen8DmF35i7J1pNfxQjsTuBIdOVgyrkDtIed5NdYTT
+UEl/jezySHWX2Uf4ctkVTsu6HAQ1Ndtpy5A1/snm/O4p6bCD2eBDqqkuOlXB3c+k
+PKayzA/lDz5sWZAcYN9yP9Ye3Yk9f4RcZoJAhm4A10iLrDRSz4JNyUZzv6ThRzI6
+Is6O2L4p/S5p6dkmSHq6DhpLq1/Bm5sqsA5GuvwXdrs+TWMcWTpLN00Z8aNXFK/8
+5zMSPO/oVlcgTn+eR7nQ7CGLDKudeEBy6jqxhYX6yAukR/oDk5Oi7+ou2rW1CXeM
+chqdUgZKjh4z4CsKuNsVBlU5oyyBAhitL6tkgVqLrmUTXhVkx4Ake6+vQY726zRk
+uhTzdnRootek6MsU/s9bsNgFcziLySZp+5SRn2H0vqLnUl8vOAjTDDU1N6JlvLPL
+8NCJWkOOJoQHwq4nIlulUFFPx3x0PkL1C2iu94UPSCneKNHrgV7jQxeDkWkF1bk8
+2At58OVrBnVi5UyiGho0Mu49r3YfVtJE+6wNwChFfABk4hgZCx/hMARUwB72nVLX
+kw5rkmeulMG03kMbT0CvcPIYY/rXTF5e74MPL6JtefSNDvwpJ/KxiTMdiQI8BBMB
+AgAmAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AFAlPo4wgCGQEACgkQCQsR
+mT2a67XfzBAAm0xpjRc8KiJoz+V6BsGHMV1Tku8/ceb/TOnQ6ESxpNtajnFgIXHz
+CwDJGE/1+NT7id66m36J2T5zhFKeLUk8PfkTGpK6vbDCeDgrDVhRwjb1Mm5Xj1aR
+AOTYyKKY54btHrF4q3wMYW40CbKfPWkRY7kM9m1w86QIeN8B4IJb/QrcuPHN3q7d
+DNfGvMGU+Y4HZsTBVac66lr/73ZWMBzz6joassOdmR1xbyIlMIDNj1w4d/8vA/pU
+d9ViRWahkNW10zLVH/7ufqLIbfAHukawD4UyALEILNfTLxrACrg3aHSxYmEmx+Ig
+dOsGDlbtbMHdBhU1F7ssOIRpRmag4pNmGgtYyD6eZCqZhFSHtypM2THDrRe+V8B6
+OjbEcT4yV22m2ZRrJExUGZ+yGvorj3nSWezfAFJImnFt//ab+W41bdrQ8wLPLxM8
+ez/2QZHBmoUSf5BXnLEt+VOVENh40OUMP265tVk3lWkLNRPj72kRWFSsId3hbw12
+Ou4b9pNm0m1uGrAuun2AKif0WrAdkB7+9cyGfGIJxTppgQOsyjppMBkQatqK5nqI
+Ra0+aCGOQ1JZfeXP20ugsnX442yV0blQDVFhVMBMcsq8MEDon/kUdbooZTRcnf86
+LcrIF0i+G34ZKox+N73WScMH53pn4Ti1wGnuzbcd+gTV5M7joqMB87iJAhwEEwEI
+AAYFAlZgIu8ACgkQMnwe8431TDLhmQ//TzchUKTJYaM2CfygNfM8dSs+msQ5OMjA
+QE+/F+fD+fxCICJ+Ey3C40u+VA8KO5gtFR9wU9cFxSkPv9FsrrQfdfd9U6benr5b
+8YfyLOww9OZ+YUU815DquYWyQfjJax3jQD5Go02d353bpGbOmvd2rm1xfYocdPgU
+JJ+1AuhQSC9MOxPnIAr+9qKWaQxVEgPlmQAkrwYI38NUjFH2hPNX5zITdZohOPva
+l9V4LZRLL8ZMhrRForycfA5q2kt1B5vFJyUsDz9oufwqfKGs3YR9OD3Myvj+nsnT
+euI690Wkj7Da7hTCkS1dJCuGp4BAbTj33GJUt5tvd9S/1JL3dB8HSKbaaEyxwKnl
+8vZ78syw92eFbC2Szb+RDLb1Wo3W0dEBpOiBXu1SDfhj6jLQ4plx5mlhEVG6AcKT
+ly0VGm8vO+KxuWkeC9q2WE7EdQIE5/+UWi+cKvBQiwb2+bbudrBhTZ2Cw10nOW4e
+4CdqYKhx8O6yGO6kfr72xcIesPlSeZ+o6qlbn2HPgDMhmO4xmvCQA4aKu0DA9yoA
+iDOtFfU4FidZNtX2eNZVSQZS7HcXGYAISGlUIvVRknTuHojYxhPhx5NUjCOPSsS+
+7hf1NMfJPuetT0jpJunes0dU6Xiuo1rJfGDgY57nEMogbBmLRVsudMmyqtobRwCX
+vQnxDPUoIs6IRgQQEQIABgUCVmRPVQAKCRBh2FHZpoIhUytQAKCpaJrM+URAovUV
+iYnfctINhepx3gCfSBGA0fLauxqXlbSM+s3RgSaSHQ6JAhwEEAEKAAYFAlZjl+YA
+CgkQ/BtUfI2BcshMbxAAk/KEhbz/eILWx0TSZlqunCWkUdbNgQMpNDQSdYJ5auIM
+1/Aaemc4dYWtV3OAS4JqXtRxHG4CEGms41e+dpmnL+Hcb2U6jq13Brtg9oEks4Zy
+zJUw+XRbW+J67NdmMgYMXBr5nNg8C6vtYV4jXCzvWvMcdTmzQJm7TD1lyzCG2nO9
+XD8Ktq53QGPZf1c4f3u6uKWgq6MfsJH+ecuZT1t0VN4ZFJUCENmpvReV0QFPHjpR
+Rm8hyn5CWB1MkLkBwQxpYK9/akr0V/e0gdkFRrDS2ooTunwBQ/N3FKcgqbS8Nt6A
+sStPcvTICc6m0pO+Dd1ZHxc/Rpj1/hVvOpfZ3zGBTze68XJ0GNeGhskh48DqDjRb
+OIB8QslLo3yKl2gogY8y3wZrKk3gr61e3eQ+HLYuyGGB3loGc/AgYSbQcNFxwooO
+MFVxDKVpEcLsyO4/ggb1Afw76a7wWeKC5FNgccmS8evrCx06dHnFgG0Map18kEPv
+/FOuIf7OGuPlwULzhi8eZPOZv/glC1l1GvigTGk5CL+391J7Eyb0bmIAZnr57gWt
+YSkTww5pyxzFiwxFfv8+J+eqdNjfxO7uzrOwuRn0slE8gQ+nScGWL+7nyodT2aEO
+q18rz44DsimQeV5z3T+obrak/molcZJrE+h6ClJ/cAj9fPBjwqtBI46Gohwdc8SJ
+AkoEEgEKADQFAlZkocwFgwWjmoAnGmdpdDovL2dpdGh1Yi5jb20vaW5maW5pdHkw
+L3B1YmtleXMuZ2l0AAoJEBMY76xfu9vOtqcP/RSSLNEQ/hlEy54grVLRhvO8z3z4
+ucXmLtvtLQV3cfknsCZiXdfNfCNmSoQgUFxiH2EcmSZBoJ52hTl7GiSVDBWjp25F
+DcEnNcKYg2S4+0h4sZsc1ozdVcKlmTOJXZ5zcDU3WVvFXr5lowVW4lgbZTNq5JGo
+tX7pRrd6DHpP3LWm/VrpFI+cz3ImLgfXtJ70yr0kiyZErw9tayNweyHrVrvU+64N
+B0w92/e7pGYn82HQPkEoBOSxyJrLAwPMCfVcarILB/LpmaPs3g0hMZOppXcarGZ4
+ZX3zxwlS8vL/Tt8LyR20DpJeCkr9Jc08uLwrM0JdgK/bQNU1GCdGwBpUCLbwSOJV
+QW/ov7lWLkpT3jVNR+f9BP7CHp+iO5Uvn77ILhx14qnw5q9IoTLlzCRtTeX4akRs
+lTxbe25fPeXaruNBk7LXaScuv42xOj44fg64J9tFZIEFucPGUJIetMkaHURj9LTr
+qvEDQrrcYbY4D2de54xJVMgJyx3/ZOKG3Cco5315wbTEFs9TCXLCL+5coXqN0CAe
+/dIQn1UtKjgZknIxjnnOaoQGUmdiP4GCZyzT++Zf92zc4qA9ZHySeYc70y/xF9h6
+mhnwT/ao0QZpQ4Hsotcf5VtnNEtmJXXLlPzXlsMSYS5yhjjXXhcFX2vQ6N6w0lKx
+xAQeqg0oP/Ql7bKsiQIcBBABAgAGBQJWafPgAAoJECBnABsbZ4pj4qwQAJXAiKyn
+LnMeLJWLmQcWeBYAT/CBAB351pikLNdDXulhKJI1nmZgmU9CSUNlZtg4gXRxS0cy
+tyNJbFgdNO1UvdbyOWsDbm/rsy1jgUTbyEaRTHQLwVqsnfYCpYw9mHhTEmySloAC
+saCKzazkzRX9hAeuYdlkEVjOVMcNKw8PjLukESl1qhg8vg4Ee725f3TXBBIERGjr
+rSe7Oj1IKc4FYVMtTXYLICAODU/fAOHZYZMvuqXtc6NB0mmlZsSJqU1ep/6uceFg
+jERuiBl0Tvt1WZhtt4SGei6XA/pJE5PCUPlsaKEXIo+3vzZvyuOl6wtcZPSzdutm
+Fqi8s8DOEq333oFOKvg5j36djQdM8e8iIwki8uF/2ku67wG5EqBs62scnhjz2ZdP
+JFuARGi4p8SU2DuEuDE0E4NfNQZ4X9ncPtmVw4n5NZQ/g9MnMH2HiArshY93Ts9f
+HDv2PnyMqldtFU4B//Q0KHkKGYCvtx+T1Sy9N4K1xUjARVwaBGCTeE2xKZn2cLnI
+ifVBydd8BFVGIr7UYLSxQXbknWlIKLV/r1qiN2aBkVFiNgpGRDju4R1u+qboq8aF
+TOLv4SnVVeyNbeliLjQqFC7pdAggHBfdxcp0whgrQTQCoyMAkq2EvBFNuQRNPKUL
+Me1LY5qrmgxZnHBF5GP51wduw5Q7NkmWJTmJiQIcBBABAgAGBQJWdaVxAAoJEE+k
+V6GFFMxjZhcP+gLWELu+sxcT19+KnaWlmXzquhQb8LTwlpYX/R5lHeHKUBV1ObWL
+P9DiL8Qcpo4iL/q3rpqN4mLOJJKCGeod5RE12VhFh2RGyeIl4iAW4vuamLvWr6+n
+8hSJ4r/BZlGGt8KkxSBf63x7xvhsjBKF8mBm3cPQeDGCL44nbFIRyqi9p3mLix9/
+3PSDiWJG2jjiV6K6hzK08xYHRsCDwrw1csblJ9RfWqwpVMMXSYio8Ixmas19VQJx
+cYNDPZu6ZXaQsagydE4Prl7mJus/s78+VdqLMLrCTKZt2yYZAhyeNIvRNVwx6d2K
+1inq5DjckuByve2p3vbH6onELkdtdn5oi6BXoAvzfnkxrZpaylbUAahzGgleO8Gr
+T6jrRR1TMkbLAq21GVWlGmXEfKIbKTgzNrfse/qloXqsNdGUAGmfY4hWpCfX8x3z
+N8uie9fA/ADHAHQ/u9BRolUUaCJpDhFINDOauJWl5Ok6nL5AoU9CQMgQa0NBWOv0
+1ZxOumjmi6HaTdGD8b+E3pDh5/hpKY6J0SwqpSKI5HzP+iX9ywCcVKUhVabvtVqX
+VGlUCy56WFJo4pqagNuSNqfDN3NTafcOCoibzqRTZNfu9KjsfewlJbPPvNuY//yN
+IfU/MgabUhG4V8gyD45oAHFN1H2yRF7djPI9GPxH25du4rKbW+qGaMPUiQIcBBAB
+CAAGBQJWdsNUAAoJEKch2gVTdKpP67EQAL4A+xjOVZMKDiVpVbh83ks6EttOITf4
+TVBgKnbqtDER+F9PV1vdln7pHZVHhyk8wrxscY6azPGvejNDstwYULKTKNLdFr3x
+9r/qmYZNs3f+UHWdb/TMG5DbhQkWVmapNKpsD+tS/vPVGWMA8QzVKCqyxVxBRxFb
+H4lxSm9DByVQJ7789uzT0SsG80NcKgwJzuDGXGqB76rxurQYyHdz9EG9VX+4YQ6N
+h6dvLzvrvaMJc7q1ma57odeYD0ccqDlrWfF7DDVqvPsOI+ebBXwr3GSKvM2qqk1h
+ajn1X02pQRmfAFSN4KyIrRsg9gX2SVEPUl/C7TRYLAle/4Ktl5maafKIlbYfVmnI
+a/Y72f+lS30vUVdI2HdUtpg0MEenCRHMhKc+xUYuAXgbaxcdWDKz0CcH7sF9/c4s
+R3fHv3qYjbc5460+S/CFkfZGTMbDNSPeRqLs8uGDB3JMn5B7goXY1ol+R15Y9YRR
+rfYnyva4WbfLCWYo8Wmh47xhN29ZNt3Qy1d7P7IihV395TxHNWCKCRbiOiGsC80o
+08pJRzxhLPyyNzYk1fKexULwgkZXnaV4moEHlMLA0iRUbX1uMK1FnJvVZINkAWCY
+m6gNtEXwgnu6pbjYTt/HXiWvA0aAvGhjCP5Zs7XjJIUViQ802TqzIJktVyJJj0sS
+JUzVRuLzlAuGiF4EEBEIAAYFAlayIasACgkQ99XJv3ZcYeN1SgD6As9CFYZPEnBj
+8SXpKe0xzOywqHy9223hjAWMxgiCDrMBAJV7Aa6x3i6qVBwFn91zn2p3vm+3F1gf
+ntUP+vsfSgSqiQIcBBABAgAGBQJW9mqfAAoJEIOCyVwpAj35Z5YP/2ty5YSvGzRS
+CbLvNZkoUT7M3uQzItfGr+JQfePWl8vUrqYas5b1CCeHAU+h7Cq4U9hiucw5Ush2
+PDqg63RsqMKupIKjNY6BVCD/ZzB9X5RCaijyGoghyKDZDlJEIwaMh8sGJYSln25Y
++s2/1jW0eyZczV9EIVpNhJxlIUKyZ7b+wdz9bzZFi5jeoLQwj+dOjMk+GNCqTO37
+tXyk/TyBOaDYxcFjkQt6ouMRFS/BesubHjs2PCZWMs4ipvkWU+9aRiTsr81cEp88
+9yRKM/4CsOC3mwyRX1BvsKzzn5fHugtU0IzCbb0dSps00kKPOsYDu1OL38Onpuge
+49XphE93JFR/JmFrUO8wRu6f78m+MF9xVq1lfvHbpI0bvBbEDMAenf0CiNC+QFeV
+X3MG4t5eI+c6GFBp9Iod/W3BVtHCTgzFCllmjoyWRNRGwWxuWMMICj32ikW9HS09
+UTnbov3fA2oOHER8LhEONcCOBPV+dzjIyQYxaAlAusnkAMAGemS1I3xlamLl2qi+
+fDSY3ABAGTjW8PXvhhuPurrXR+durH8pU+vJtsIsQytF0NZQD5w04NfJYvIPMBuK
+b6kh9Kpzz0QbA+Iill4H9Tf+zotfbCrLM7kKK9/4+4GHk26no6sPsxLB8OK9AlFC
+9QVTtf0maK+hQCDiJhQjqYSrbILz6nC2iQIcBBMBCAAGBQJXJRIsAAoJEAkauFYG
+mqocJsoP/i1Macl1D58zaGoMA80gEKWn3eTkiemwNdnyCC2YqzLnCNXqR+LJGcXr
+WMeUpcu0xJTfPbZdZOkBHvppuwVyk3MJzF9I3nN6ZPXdyrep6e79h9HVIc9ZLudL
+mi+LRty52uXi800ro9xKGZ3xRqh+fa7SqC/eMTedj7pr8SPT52t454no5iIENd4/
+++lWUX+WTBHi+g3maNF5O2xTKJ+n9IIU+yxWvZI4mC4+MeJ9JHo47wi6f9DbvtJr
+GmEvXlIddIdEDnHacQZULlpaTyQHG1PWSaEQly/Uv7duivH2gqKIQUN79f+1tbtl
+jY0UksaGUPCPJ496SrspXw5cb4QogusvzU8YRfoGD3YnMTb99hvMHlRtgvUWO8BQ
+a/R5K9JmFK2nX57ASE1DWNFEHRu66DECuBjdk698zNtqUZY5ceLPaLzLJnaeTfvi
+LjsSMevFhBEwRLNfA2UtFyBemb6UmXWK6V3ceufwCQXU7Od/yW/LeI3LkrCmZCLE
+yAK/eM2yTsjteiGlRntDYzUsyDBh2JpH92+ftFHxWE42aNkZzlh8EeJBuqJSB9Xx
+b+91+IEq3k4KYAopwxBwhzdPQLx8VSBLM9+nGPMQdqQXDDPemAzO6xQ8M0FmQila
+zq2JIS8IPBJtvrGBHkFJCD7+Ej1ptTlqK9Hn4388BkXa2DQQil6uiQJCBBMBAgAs
+AhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4ACGQEFAlYiFEoFCQm+ADoACgkQ
+CQsRmT2a67WlVA//QXwugaeaBPXOI0lQx2E9EiqnQCGmcB0SftalGyvp58SY5bt3
+Rr9qT4GObzZWnqKp69F97n8oJzaEroLVdfXfdh74rjQGgt+lLk55WSme5+wQSYPH
+wvNkT2qMkbFyjHFH9jB0B2jM/VU/gTenc8oiBY0tVfi7Xwoq/uercfSdoy2R7cO6
+qTE/XWzoPZpwr295vRXbDnG0q2z5dbHrENGFGyPbPx+k8IQ2WvRt76I0Iycx6BH8
+Cc1tWvrP6faJO7+qwXRb7wWMo9Am7SSAo5p31BCuoWNZbCC9OY24JPF8NbxPegCT
+cX3hM4UazN52VYgN8bAcCgW1wexUDNIhQLTkfkk3iZpOg1LOIHtNuOXuYh68AXhi
+1Wqdq4cVvpFZmzj3xSiszMXkhrXrivjuPLA8f7qj6cWH+XjSBUBMDF7crnQ7MaV+
+cOoHY413KgGbFsCdFr6YuAxN36hA2c7ZEMTvmKMnJeeUjzBFMGHIS7vrlMQPlgvK
+BK1NPgqRNj9O9kd4BrlvT5v+Xa1ryJoQ5UK6jUuITpns45d4BNbFdMaJxemKWYeF
+SXQW4laFGiy4j+sX2YVMt7AiPkNWy8S7GoZMt7zBmpXWfQz/ccXBgWnGLPKnAveK
+KImCJwQUW7cEu6o3O8JxFX1HMrQQpRrF0FJrPfH+sgId54WGdrwr+XOuF66JAhwE
+EAEKAAYFAle2DbIACgkQKhdD7akaNba/Vw/+PNgINOB9/IK+PX1DMY/O/mu8D1+a
+7Z2woA9UB5nE6QBFFlqEqsSBZDHgerP7GToDQbZZgrsTLKGBUIARzC/NfXZlAMW7
+WD1ovSGo1A9W4WDMlz/BIu4V/KWatXULv3PxPS4BCFlt2lK1fzAZGGGRIo2Sjg+7
+Ja503Pp+TPg7UpIr6PkfYzgPn1HqTB4A+1YDmYgMkLuNwFICaxjXMbUMVjnAmier
+jMIkePJxuY6N0J2WpzVvBHUE/kJfdjCoZPzF6oOQoKz8MMfoUvCzoteoswGHzJmj
+H3KsKacP79jwArEwdpoMYLxyQPddJGe3BSjQf1IxRBMgWu673wU9W4ZKf4Fu+cFT
+9dmstPt73dH6/zO1me4oITZz+HvzLUGu4/N5IxLEzLNm0f8FKMUM8XzA+6yLEjAl
+NfjjnuZW0c1lldyd0tVDoYdPvjb2NJx2++GpgWYZ/ceQ0EQcVF8mfJGslumXyKCP
+2p0dk6Ynv+/Rr1UlH5Xk32Auh/zUJRKPXohebz9F1pQidOrCePxj13B95SsKJ3Nj
+vJazso+IB3FnNU2LwgjEKXSfGeRjp9tQV5bR0bFYAoxWbC/mEnvhdEeFswuETAPg
+rI3V4jtdeMich8nUyG+QZ9CWIU50VW16pVb9V8eSYay8RWXrszhRdoCSw13A0lN9
+tysqajQeyCRzKbeIXgQQEQgABgUCV96HKgAKCRAN5KqcVEbr9CjSAQCfOkNiOWor
+y1Cd+PlhkUFBkUpn/W7f6ciE5oY0OcxvRgD/akJbAUduvv3l6HSYrW9mZIxXRRbr
+zMx7K4nnqD7rlB6JAhwEEAEKAAYFAlfNJzwACgkQQarn3Mo9g1FN/g/+MbZQC3VD
+Bp59cQcCRXsBRZhmbtEEKBFuVozDZ0ouhB6OB1Xcu0j9/z1ra8SAG8oB0HHyFiZE
+VTNs4oBVnVHBDcCO31JpkMK6p5916lMtspus5Zv1ERpsO+WL3KJaYLW+8oFsH0AD
+7fZUkwLbmeNHDqivahI/i0mEgUD8gw4mB3MYFsskoFYG1OIlRs0K27H8KDoFPmCg
+nS3fLigz265PCe9RBYaOHiq28bb9ZUsOsR3fiaTTx3s2IvMiIbhjfq13IsqGoia1
+OApdL1/QE/odrulkuVSsA9Fs4Rc3qIpELYRNU8CeSOtGKRezxdwq/ALTpGGPGdGe
+w8+HfE4q6C8Lz8SCqmHYM6ytjzX2ZsfA2ghCZjmDTV8jetBNN0XjrZE/SzKA1OLL
+03UUR6uOj2sZvDlqJEEnyksT54tMsB3mw8OJEpzSBlHw2jWbylWlPUuHoLNeP14P
+vASEXic4s0j5M0SJCx97S7mXDZ0yBQEpwsT9n5N21Wlzkr+lcgbbhibdbhKOE6Q/
+zS5+oLcvUyEUUrM0fK1tOp62X3W5YmXRRWsEECfeXBWoykRmffgQqh0uxHldDEvD
+2L+PEicSJh0uncXxyhwV8+lpbVJ+xdc9WllLcFKQEumAwer+I3BfUdnM8iTKeOxi
+JR9A8HsxsrE0tug3Psi4ecUT9W30R4PIrsSJAjMEEwEIAB0WIQRPcW+aj6LIDvG1
+4bpeNfIx3hrF4AUCWJ+6cwAKCRBeNfIx3hrF4NDiD/9uqaVABbGfNvZktLOHCK1N
+FacIaovF1iuX5uYWSRtOBqjKnqMbIJLsQitT8OOxLAwDlA7ir+aJ08N6nKLbmQ8a
+RNIxnKdigFnJsEL5dIF80lqV0TdEAXS01Ax6OWU2SIpIUQ/QFd+TnQfCrxzpdHHE
+v78czK+moOwgD/eAm5ASbkfAnXH8RnDZYgnHQ+b2D3u5WWye/Q1OCKD009N77Wvq
+w4gnnSll0imMfZOHczac/lk98gFO7V8OmeMcygijLBj8iHzST2lqnAR1SLqONsec
+s+d+QQr+A7VPXSMOVkYp0FWSf4mllEnqwSB35KktD7bCrQzi70nN5se8XuBVQjJa
+s1ewvGRRRBC/WIXrTKbtAHzwYRLasST+sF8Nek4Vs78dnCyoMIZLUzQrl0uJHymN
+PgvE2kVYtattJ6ASS30uShMTwST5TnKmAfyGvAL4u2MkL+BwZz1kARlvx/UJxGAF
+QxWWi/0OUccEwlVqt08Cam0bEZVmwqrpg5Plfn6fXmF7zoGsCgedzO5zMy5B7TzH
+rnGrXaCwzzoAQ3touDVzkN061KJFxHW26DDsQpaiX8nqNoa8WEVl23VlEdhwXj8H
+XYZkFtrSVazmo6ZqnoalzWNAAPzPseu3ibPYNPsF8h1c/HCfgnOL61kTXsDN+tGf
+Icfju04zmAyYEBN57PoTy4kCQgQTAQIALAIbAwcLCQgHAwIBBhUIAgkKCwQWAgMB
+Ah4BAheAAhkBBQJXPCu6BQkFNH0qAAoJEAkLEZk9muu13ygP/A62hHrznluVCRK3
+apWjnHSVJHljEpBAet/qABXsPAa5l/yVUdVGMv86fWzMPb2IlbV0+fxkKAsH9lzB
+l4m7+D15iHdV+lH0ZNR4HoY2AzWYocrFYDayjzdVaFss98E3i7KDU3aTX4q/2XDV
+ItkTzVbE5w62sMT/zs0c3Edyn3B+TLLb6cZBWCqBtxVZ+xwlafCqaBYbKSgHqIAD
+pryhGMteCOEzS5wnMnwJE3YYW5osFHJZt+S4/8AaBkuo8nDQF88fPs2TFpqUvms1
+9CKv4OdAT5jkuT5yT2Os3yXEHis0n4ZJ+pyq/jpV9dj8L3KDOlsmoqVsw104meon
+atRdnvST/O6gjUwYRjHV1mWrUifxouXFJOGoKBNCVDog6WNDDqRETwA2Oj21YLjg
+Umh+V10po0FFBdmNSFfus+pr/uJCyVejdAvh1M+mYz+06Zh4tcJl8ekrda/wJynA
+QJnPnjfEyxVyql5tveUXIbPdGaofpc+N7QnMBAtz725g65GTzW9sRn15tcs9Z/Ug
+N77rQNdBx09rcJSEG6f0mknytyLoi2FHFFFa866CEbgokNqDHRFwgPm9TxtHYj/2
+JC6YqyX/+eRt0++zF9Z1MBPdoeFebgt445mvjcbwhE/iL40bXXdLuhTRATkxk0AT
+B/IpccxL71GnN39ioiTADrz1qrBxiQIzBBMBCgAdFiEEHLJ9vJhhSy1YQWRtCDAt
+tqJnBCgFAlmmi3cACgkQCDAttqJnBCghXQ//X0rOutJse7EawSttbc4rZI/oaOLO
+3RZ3uV7cuVv49b6KfIOpxkUx2O+Je1+XOTBxju8ue0ysnLmuDYixv9kOjgPtkwiA
+lt1PBFv+/hgD8ZCIEXral4uLgMK4DOqbJcXrhh1DIrHyV6tuiaRdvy+E54LNfc//
+Se9X9jG19UtXQK186VllB2THQledZk7cqgylQa22xgZr+azC/c35gBWS4NWBiGvJ
+pMob5CWSVXUdAYm0y7F03iiAAc+7LNg+urJywAG1fqsgs6P8bkmnyiZV6fGMTEad
+EXhGbG/UY/RsC2wfKvhRfnX3t3MTAt3hnaMqCPa/NhfOBIgYn9ekXo4sDkzSNTLT
+V9A/FI3sccyiSemzRK4xyVejSfaJ5gV9HrzmWotJ1doXP2Cl/BTjhlsxFEo0tOlX
+bX716+4fVakMNeQiteJoaKYriwYNYuKvdgPBwWDFlwWJqRi/S/CGBqV6UfQ8xmP3
+flewDmxGxFMTjYLpNfOLhVoye6V+SlACz6Rc+MGSxNTF9I/88si06xHgH4ChpTq3
+/3hTQjM4hwEb0/sIMnrdRBx5bmLlnmuMRbEXtd1AAZnq4znwBP4raxBO6iZtYg/5
+eoXrlu4n9+ctxzF4x+WsVGeiAptln/c0/16JSykb8xSFBH/FsJ/eer6KqCKV+Xm+
+WDS9oBOwRk1rLMOIXgQTEQgABgUCWarMDAAKCRCtzJZHPPm3gkaYAQDWkNgInmgo
+5yEzqmEOcvsUJv4UcNRPIqqYqx47ncKeRgEA+amgkRMSVsWoU3pNdll/4GgtX2ta
+m6O2H4uyuaslFfWJAjMEEAEKAB0WIQQ+ie7nRY5yDZdU4LJeKKM7C4T1dwUCWbwf
+fQAKCRBeKKM7C4T1dyB0EACmxq/gHPABbXUdZ6jFWsYDACJZw5lEwFiiVEVU0Or+
+HDD15x/5q+W7llOwiTnqSAYHYYiBLHqVnwm1uRn7RYg2bGsWRfSzDgfX0r6HjbHn
+23MvigSTIZLrOq1FkKxi4o2Ax5zJXg4MsQkaR79OszfJkxuGYipSpCFQkXdjppXi
+YBr8l2i5CiZubibzO3A9UM0kDJErch0GjUvVhkK+CWvUXLDaooEZmMrLT2AXrYEB
+Hobxag5E21JBbq9Px+zVXle44I060xoUzzGWMFWDjF4doLhiAMFd2LuXXiqUCdAH
+TRqeCznurFaxHT43KhlrK7ZOcpBYgC+2JZMiwaUqd0NEEDT36mBpZCtCw7Cfqkkl
+Y0raEtA3zd90Zg6YAKku4zsQm+zigtUfkOKS6ls3O9H0SEppwbxJuIs1TKxoSzn+
+2CIGBJGmr64blk+YV1U8q9Ql8GVKugjm7byENmJmNry9gYIQ+7g95k2bPqZD59sZ
+B0+0vjZaZmEAINSdVCE6ccGMJJm+xKVtXbwWDUhtNcR4MnlgHI3xj1QTGjVJTcJU
+3Q09s+47tg06WmdWYDcwF2oXhnVQ5+w4qgnxaIH63LyhpcwkZmwL2KdQoZ0oQboG
+zlRRlngeCVVmk+Pjk6xG+nr3GutPbsXypkQyh0Q3F7xEbEmhWSgjcwHwzsYHRnvd
+GokCOQQTAQIAIwUCU+jiEAIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJ
+EAkLEZk9muu1AAUQAJVggkL1OO5xusj3/WVlWEFDKhuXyIVog+nWEO2h057xtpRm
+juQLYn9KQcOMaFf6QOK3jZWHuZuDVnNxNVrcCB58I8AWb+oTARjukhiknJPo4hTf
+4JgjfXl1Qpa12OXQ349lUCdxaeEa4WEBnGBhyh+MmWrh0poQbBbjuafpU/Fm1s+2
+FoMxcIvkAW7f0evLhofD44k4bBeiX8xFBCLLy4IPeK857mX5FnLJUfSmpDqwmdJZ
+kZ74EFaVaOE6F0QDPqrK3ZvEAqmyQfNCmFWXcwtNNotsKyGHJbUeyhfr8MkteY29
+QR3y0uLtFw8NZvvymjuPdJvU94SrqtVUMPumCgbF/FfXddydoPUEtt936344LIpk
+qa6Z24kOEDHlrIxV4gG4nCvP0Bbp5zTOwLoimEv1S7F11zZlG4L8UZtVBkS2j1x2
+UQH+E3jgbZ4GHMqv5hc84CRu0coPqizonoB/0Ta5MZTkVLiV33RiaILoqO6jQi2j
+nVNAF2qKxgVi28VrEELhqztl5Q36RTf7NmmNkrevwCw1YLsTLCJObRy0BG6ZNkeQ
+7nz0bkpwn3oX6D+9ufsFMJzaS6VTWqzozGgsAP9J60CtxFYxDuL/VxK7df0wxWcX
+xyI5Wh5OOTzZnn5TpNrBSIXxEiCnmCKLNXM+4WP/+J3oNcTnSDAIIN+5uAD5iEYE
+EBECAAYFAlm1FrMACgkQimdxnC3oJ7Mp7wCcDF5VrsJWFVhLdlKGUDm6ahz45HUA
+oIlnO4wSJnjvjbAfSrFeTINggI8liEYEEBECAAYFAlm+L6oACgkQimdxnC3oJ7MC
+mACcDjbe2GVWn+OT5lO1b/a37BKs/sIAnRTuz3S9ZkhzTbg3Q42w8ru82QlMiQEz
+BBMBCAAdFiEEvKaJtjZVOAHDxiFQGXpYiCNfrKwFAlnFdY0ACgkQGXpYiCNfrKw4
+uggArWLET7jhgpvHbCSUVI6FrAF476NvkogQC2PTRo0WcR+c7hBzkCaf9YBS0hVl
+//C25k9KJgFKxRY1ddjjJiBL2FkDgI0SRo9wsKmfsX6HM1PC4NR48rz8jJ8X4GlH
+Gn/U+A3Z22DVPyuMhskXB+xgmccEuDtZJQJjCEib2LmjDpMaz+RU9GT5NqPEVrdI
+lSu18pEGBoEVkIN4GLQ8dk6BYR9Xbis9HLlZt1imq/KGDtNnmXT3sQBnE05o3+/d
+6e2Di03VAaGo8Lj/D1KSPPASFzuII6Oj+CCrYl0/kGPByxeSmZE28sVfOxU0rVBc
+1gw+qs6Iu6MMrL758zIOm7FpSYheBBARCAAGBQJZ42uvAAoJEMjW4VIB7p2hPhAA
+/2Uh07qlk42ITS3nr7ZfqCPoF0gSc0R1FHohomX+B/FcAQC0ffiMq2SbnVYApbhp
+r2QUYg49riiNg32X4RrgeJ2DeokCWQQTAQIAQwIbAwcLCQgHAwIBBhUIAgkKCwQW
+AgMBAh4BAheAAhkBFiEEPORkVYqE/cadtAz7CQsRmT2a67UFAlkHORMFCQYLpQMA
+CgkQCQsRmT2a67Xq+A//VuF+/+ev1McShbY/bcxJiT7+XNQzD6w0xPF+b0I5H+go
+rOPcQfNI10aDFZMRzLLDqB/Mf9rsHDM6xo6t7/q7SEtyU4JY/buyYk+Nckwl+OW8
+IoyBhPEekZWC2vBJpB7dvOtv/DGVwucfSibqJwjWC6WV6bv5E2ZJFT/mzBZgerhb
+cu5m9QoKVj6l9WAARjQn66F4lJqKnG97QeIAWVBMT+9z+04UjpKyfpcwgJfk5ozz
+FRmrg6VzAuLNvdI9AxrXU2J5MQqbndn17bNNyJQi7zI/HruBmv5Vjhv/miBruOGn
+fekHFW5EkMwE/AEbEOItp2WuW60ypNzwe5DqYD83123pTFyJQHkOC4jiptxHCScN
+3RS5hm6lO/ccM80lDKiUdTG2Uv+NZi8KCvWAx6e6ReKNOZNpJ6i1WRhXpUbNHhP5
+wOh5q9zD4fVUwHsR3v8R4Q8YfbIlpGdwXdLNyu/ONO23FlUin0e5Jd0o6p/CBd/s
+q3kDHm2kBrzjKsnZnbqMVjvNnDGNjIGMwMIhCOeUTFYLKhaGFXkCUc7sAS59EXwk
+5D2ZlUaWzb1fcauMTny+INEWKp9ZR0t9jDiFL76hHU+fS9ZXuLd3Y5ZCFTehTDZN
+C+I3uUNQR38mb2s+kYLsACdDAqRnTbxXuSm+eJuKYG3uzUgAekpOy9NGbAFvreWJ
+AjMEEwEIAB0WIQTL9ZdVy+fn7+8YP7HdQJoV2CJGnQUCWni3GwAKCRDdQJoV2CJG
+nZHID/9kvOrnWCM9k/ocWIJuN3ZSqy1xcYAcxlHEpyktiU70GUSuPeJl5XQFHbgu
+vNydOgP+hQx4Kemj6cH46LN4q/OYlIVeCWGdO/qWYzua4KIjNxoRp5bVi2UW3+gv
+RY/ErT6qItrXPIKsFpRKypn+esjA4edzwutjul5gggMRhFP/JicQsls2EZJqtKmL
+D5K1HnJnNF1NN4fpeXVp8k8kU8STnpJsiG9CDxC0rrX9ombuQtVJrUXYP1pNCvxI
+BBJxe46NZC+AQNLTVZZRlCvOYVdIo5S1ElnHYNVcCqNjPHWk+WSl9CTScE+HP4V3
+fK/C28F6KmEtJdNmCasAkZqVH3ufwwGo8PIXZtFTKkn+fzu+tYmtJoGH2POHy18I
+ovyYIn9gwGwFTy+An5xZaPnXvxnzX42lidW9jqRRklyvs0PV9oW5SJiuq5GG7gCr
+FmOId6Hpoev12dt3tPEbuDh5ycT9hVVnWYIMVCxbuDAr+YB224L8omWHSy/CJRmC
+emb2JohzKDwkAnhc3y+kKXcqxW9cFkCYog6dfi2PgUzEenTK0LxMz3xiVEwqQRs4
+JBz+1p+775phPzdlqyXyCuEIxACUQUsOSHoONhGskuCTdlVK0Ayw8wQR6l6I2aRz
+CzIoQ93zEQ6DfCItkWYInf6kCW7Z0wPMfO0QDn8UJCr+eAYDbIkBMwQTAQgAHRYh
+BA44PyE9ajJdesVQ287oV9uxZcCiBQJaeNu+AAoJEM7oV9uxZcCiIs8IAIKORxvU
+Q9ZipmO6nlnX8xlOt8n649IvujkJzS30AckFM3JaowsFSEtyoPHssadlJv5Awf/b
+jdLgNWV+JC/FfO3SKJBFljdEIn1J6DpkhmKoRYzbGB4TfDpe8R5McZO9zatoCSnL
+nSUyz8W89NKphKKI8fsLrdbHzvnZTTNqr/oxQFDaj9K4YIZkIsyIppSO21Ybx8wQ
+GQlhR4efh7rAnhaIQzKh02cdtXG0sot7Z/fLTsKDmVKjCqm4Kge35URuHMAw3NOf
+VElrEQ0p7TwCf5zjxLj5n9SRGXcRfznfc+tM+I9P/Ad1fOPx4sSFqsy8cP+jP7ll
+r9Z2emPBx8R0ZhyJAhwEEwEIAAYFAlqJL2sACgkQJQapbM9jCyER1Q//UhRef2M4
+P7yecyhtoNPvtr5XnR65o+FSkSzS63bV8ZkqjCtjVlkp7jUye6EQiAsXkqt/a401
+lRC31+JDV7jG8kTMCmSQoeicyOhOa1kZ3LWjonVMc9pHJ4n10pEWt1shd3hbOF6S
+2bU2qvW+WjvBo8+qt1O+Dryvz7nVuV7dPELxBD+sBa9wGs3hJ1jGmOen1WDA6h58
+NLOw/iiYK3SCSh49CMPz3n3BiczdUi5p+IYF+y7bVJpbecG69DpPsKOht6FYh4dF
+WsjrFObW5L5dsRRajYpQTwBrosNwJn1p/2IreumMrU4saITKMKevlLAfgpqOEiXb
+TSQiqgQ+bpXCZ6sK17RsCNe2n8avtpTLq3dg1dByZ2jVZvc4gFVsHAzai8K/LOcR
+5DYfgQZV5P7MaVbX9FqnNVKrHOOPFkv4Z+Uj7SPxNznQEuk9PLC3xZ9mMRnQyyht
+t5BKVuyrTvOdx9XbTW5gxpB52EVc3htktnJiJPamMmXnl9D1LmhhDcwyZkU30gUo
+883DA9dCka/Dmyzj3P51wB6+GURPX9NesxJ9ShFVScAxoMEBpj2ZqMEnh08yW3o/
+1yGhbRFFOqdmSz6JSKKdmEjW74LPiWzl+M1G6H9r1bXjPq7v8JZpCGk1Gu7T+jLx
+DbMmWEhi7cNadB6DcH/L6pGPV1wO1LkDm52JATMEEAEIAB0WIQQpWvmRb0b4oTSw
+KdqAhjhC8P7YOwUCWpbg8wAKCRCAhjhC8P7YO1tXB/9uStyMqAPFK08Sc2Ts8fvZ
+JPQg2lfmgEuQJWtazBP2umKY/uozN5P4kOuH4YAoYRPB4+AW+h1AZl+hDBseEiL8
+rV1Eps9FpBEdQAeI48g1wubhJDKKuMnWyo5+sLZ3oyOh/KqKXE1x4W+0iqz0oBwX
+n/S/LPfCK0oYLh/71gPFIK2JzXCvWFUwcIZRMJT25/wrfDB+Xpld+nKlssX7cOLD
+D+ig+/B4TxlSWm9TWeIxa1TsTDbnslvMlOVUq7Jnmox/X/0TfLkXhvyzqs3OBPsg
+OaKp3cB3SfWmdte5THmsiGTixaQd1vHef03ol6nAelc0f/qEkC/HJReaWOS27/46
+iQIzBBMBCAAdFiEEIGkd/MLJjEeVKYTuAAGMIjgadZQFAlrbnL8ACgkQAAGMIjga
+dZQlsBAAi6o23zyO6bd6l/yWIFOx24t9q9NUEoZm/Iw2BOp857VSIOJhALr1byG2
+VqRgNKXHI1sVPOdJLrb+CVq9nKiAaKATYngSMutfl2HXP3na5DgjPOgIYxusn8jE
+wmGRYVgmwB799GVEsA7ZRycXMuO7uxZ6Yq0cWnK90IdCUB7infJ6DWMFLrpKdDQe
+Wk9EH61MoJGWVuFx0BjJo1Ej0S0YPocg1TIACcczooHCH9N0omSjk9B5tjVuVo7+
+rfcA4w2l4rQApd2XLpmKV0wuJTGIfcxSxdK9pWrm18LFAmXItTiwm2zhQeFvFEHi
+IEGEL6hjCVp1G1oRvFj4NnMoqFTcd2cj1CsQ3KdVVGZDER88/Pg/WMBM+mYAt1he
+AMGJcM1gRWcpZ6eOUtjwyDICgpFPQgSW/wxUmPFofF8m53sTX623gd6auGfOVATN
+hU/glRnTQDtHvZUSEpXP81KamZNXHcv45aE46DIByYim4GxByma4RjCscJqxKfrs
+LWr9AjcXyS2VAirHrSkUJhwdR9XAZy52e9LirPOUX9uYfjN1epRp/a3dNWt9cjSW
+TcwzMBIzLiwsmjUUNUPAa83P3VTSMJZh423xRE+rvvvDwMmZChkXdqInmrw5WMWz
+2Gq50ZecWvZ8v+NuBTSQWj7PWV2XEV81v3IgygywWymSWnK9xpWJAlkEEwECAEMC
+GwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAIZARYhBDzkZFWKhP3GnbQM+wkL
+EZk9muu1BQJZ8MKdBQkG9S6NAAoJEAkLEZk9muu1LiIP/3RmE7/D+qUvUl9B51CD
+11NXP1tr1JralTQj9HrtBtzSO1YRNOAbE4a5FBGs/4eRJArGPv4n+duN01oWvKb2
+XYRmo+4Jdzt4X9pANHCEVtWxz4nBDk1f22hxIO9juuc11XlqToBRem2ajHRHJemW
+D7jw/jI+CuBZGv+6OBut28MK2D5WKkWUWR+I3NjJQ7N3knpPDLtCWQfrESaUvY4W
+c5nmPRVrbZFnBBB38tBf3RxUaapEEgg6rh1yTfsOanPQ2JqvT7vqG0Sx0i4G1UQm
+3rsybDLMW0+o+8+DkokaeTmx7t2RXQNyH1gxUPoNeH2tfWgJ31MVkap0lkJXEkj5
+jMFiKz7MA2NeTO5kYFGVCfCzz7JEUVMSujUHNc7gVx7JVWckEdWP3Hs2hhImx+Ro
+lj+5wsWhhXfw61iHGDcwKERbXVRRjCK/893w4CUj9Y8NlfDCqt1Ygb9jxl8xlfGS
+rMt9X5sJmMEkTrtvCOb6L3nC+CP43/BdwcGwsr1FCabrxBEXGHTXlSKCn3iR04PE
+n+VnbJHLdkLr/bndO6ukC5e5LDSqhjC012vA+i7cnZSCHBukIYSJrxa4l2nv/vp0
+12LNoBnYDoCGTqig3UheIJBNDRD+uZaiFuF5ILKx/cHPYaNHX+P90T7hhLbIyWGa
+hn2YfRZu4mV0wUT0kfgqKyvQiHUEExYKAB0WIQTck4iltADvsyxsIHHh9++BT5Kh
+DgUCW8d1ewAKCRDh9++BT5KhDjijAP9N6DAsVqrSePeuPK7eDwyJ3W9VYmXQ+Y65
+UYKASaB91QD/cSF1Dcbvet1HFcIf1R7dVIeOx8rc9XRpiK2xltE0EgyJAlkEEwEC
+AEMCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAIZARYhBDzkZFWKhP3GnbQM
++wkLEZk9muu1BQJaxcaFBQkHoqV1AAoJEAkLEZk9muu1W9QQAK4cjijD0BFF4C9y
+Kj9/hy4hns9FLTy/CI2Mr3Q+dOWuQHR91xQbEfoqdZjxz5d93DrLWNhsetICKvRQ
+R7mZJdUq9Ok7BLl0w+pp7j+c5wBM96No3MZRPxtDNH/cDrLI85n0lZTc3Sf1GGoS
+UpW2sIisw41R4d6QC7stme/WjjUdiG7HHs6ERx+Wjf7WOWf/eP5ymb8f+MktVbK8
+4UM9+ysuDzA8WK+CsqF/S0wnjLhhXus068l3yVzah7dRAa7KgbV3bpDervEoWI0k
+MZsXZ+u8Xjx8kKawkcbem0Pqoz1oD2K5yS5lORZQDdsVjfvKq9SOGHWjYsUjE0J5
+7F2Z4qb/mwr/Kyktwu7CP6PA6RZancIlBTt48y6ZLVtzqSz4rwbcevpjO4Y1Zenx
+thL+uCfR5pDJouwuJFvhDu+EKIovwBdL6pSVU18RzzS68mDUto8WgXbFqtAHIRK/
+vQI16iCl79r55ffy7IQuA5ozM9HSOazf3xOKbPwwnFlJgSkHIEW+6RYXfjnwD8zu
+6Q1dymMd3VVX1oXLZ1avgITcEeDJToBe89xM8WZdpcREM8oOb53G+uC/P0eqc0Td
+ezOHV26QQp1mgwhf3WFGrnAfSDaH1nfS8DBNP3fF0oCAcS4MKufvxkGtnY7K9j5w
+wjregupUR9M9sEWs0EDYMwvHCx7DtCNMdWRvdmljIENvdXJ0w6hzIDxsdWRvQGNo
+Ym91aWIub3JnPokCVgQTAQIAQAIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheA
+FiEEPORkVYqE/cadtAz7CQsRmT2a67UFAlzGvMwFCQk6I7wACgkQCQsRmT2a67XJ
+IxAAthvCKyHBw+DI+Oop8m9vJDZuuGyrVfWqH3E6G9svexxQHKecTLw8vA4GHaaq
+JtdqcKLEm9Hw0SMmdOnYn6d9p/ZASp5Gb9QCbComrsr5Nu4zFiMaE31EHUTb3Ebq
+P8vnv1BsvP+HSvDPl3+blR2xavxNrHSfoC8m8ZU19X8z/S9J8Ghh5ecAFltSEc4z
+uU7+LTV+RzEdcnTlTPQqG7ZLPE2jKxB7c4XtdwxqSlbG9Sg4bXNo5a/69UvJGvYG
+pZXSAwweTzEfHFisuFZftU5JZ2QRjaj+2EZ6mpND+McuD1NoEQ1/0yDK7AmsDPkR
+Pw7K06nKbnqVA2oalwl82NPexCu98jmCEKbztbqoyYJyM+jTkkrQ09ss/NxsFjN1
+yxFWtq5Cv7Fa13SmyGqkO78biO1r/2CjDfnqhD25j4M+FeeY21OvnfaH7KbFM44c
+SbHYPKioQqfiAJUkudf6pZMTE2rfITSpDkLbx7a735cEmAwM+aLNkF2AILeYUAnX
+9AMjsW9xrWJUQ3MBSQyXaPcZBwqjXlfQxTcJ7kE7EWKUEWQfCVyxt0fb72Z7Aq6O
+o5ox0t0YLAYHDCCjYuVd8teke1vFgaiEvgCVSBSwGHVhLR+SPTN6JwI3TYOs/Uxg
+vISvVGaWy67gKKvUa9NNu0hAZ4nHohKsqZKNdK/EHJZV73mIRgQQEQIABgUCU+jj
+SAAKCRB33ZXi6lLs9ANVAJwOzBsbf5cDHPi9m+4fb1pCjEeqewCgnOaYXEWiNE5L
+hFuQo328Z5OUiMKJAhwEEAEIAAYFAlPvW0IACgkQ3cD1NYgS+PIuOhAAkjOgjjEN
+uySghD5mQ2EWSYWyUM0guTQgCLLkyQqFuqpYcNWuiZKQEEgny/DQnq8uCN7KVi7q
+nOkvVoZDXMEbHk1O5jgbrR8yVYSN8JyyHftWpgwWEUUGdtoC4T1OBa9imSuI3V9I
+K4HtbQDTFY/VT6oyoJ03zGkRsDWJa2MIHHXYrDnFLbsSl5oDagA5KRTU6NFzXkvj
+/aLot1Gdxrja6fBu39u+qYW7X8G9/b085y58FMIBDSDaHTJVFrn5UhN2kAPWqDMQ
+Sxb9T+VlT6vCF6yDA+1F5TMCoQkQDqQSmzhX1dw6a0kdHpaPXqra7kjMzWE1UGZ6
+IXjdrrtjQqWnK3F1klKRa5mTbfn6I572Ev33xTAGVEFjFd5Q/ZWm5GgqkJwf/udy
+G2lB85xEwg/8Y4yV05xifEsTu16J1fCg8B8hMq6/PCrAOKZyPUk8AAL9i7OD7jie
+pu7PXRwNeNuB8yVDG4i0n8nD1iUrgUUhnapLnTjMpHmxeruoW9GZkiNpbE79AeBa
+VmZh90yYQ5p7D1MJZPqgRC3cLXrL4j/DNtmzKs63HvYJsVGIOgzvjjP1nYjoJhKn
+oNaANPA0OoTVGMC7zB164OOfgSEyd2ixONlpqrZTPLhMhfXyjkuewobpEv1PVpiE
+PeO885HciZYig4R2U9CRy14EvN7dqGxrE3SJARwEEwECAAYFAlPwxzIACgkQzHnY
+Clu3/FF1FQf9FaG9Lez/ji3GfQIcTEuWwiAPis/2wK519d0u/70UbsfqlO2xKonp
+Z5AIba29z6epyi9Y4c+D6kpQwzPggt6gLxFU3ZKfgszCdjmxZ3VEow4XM2jZLeTm
+/RkCgb+GQUN9Ile+MMEp5/ImZO8W/9ku5hJUYMFysPsSVZHEqWQGgB/uYtO7pAdh
+y0bliJD8eAyJqh0De1k79uOkYPqhlgugQDIIjuo0llZ/bsc5nKkbdnA5TPlNe2tW
+KeLWs0b/omLx49oysE4+1Vn/IzzU60NDJgJQ1qmpeL9l7hSbPTB93Rr9n5i136iL
+8KFTVC/j/YQW9IYTSJHgTpfZJ2rnMDXoB4hGBBMRAgAGBQJT8fyEAAoJEL8zmr4m
+xdKGt3oAn1VpqgYUSwNim5ieck5ZgZAqSGLHAKCjTieHt2VCpft/7wq6WD4Q2yGn
+GoheBBARCAAGBQJT8lSwAAoJEPfVyb92XGHjxAkA/3VUoRB/sO8vzASVs/6ma88E
+ILD6RXRFv/Wuq480YShCAP9GCyKRchFhZI+sNdz+Ixg6T73Z+4sO3DocDJR2AuWD
+aokBHAQSAQIABgUCU/R5xAAKCRAEbt7m63q3TUWHCADGXQeTD1TjNHC3ae/4xhmo
+yLaJ9AxNfHtpsJwjOmB9YF0rrDU4H8+1YX2JiQ7VxYkmZ+3xMhsN+ZQ/5FTcynAX
+6sTBgd5HdtOVS4DaXouHK+aJSvVUGIdHAR1iVNtxm6uMKFvcVdzn6vqdGXQ2bgAT
+6tKvcugJSYTqJNJeKfdlRfoeGmhpkV+JuZTgNvNi4CIdfn+JtXrK3ZagHm2KKUBJ
+FBKT2JGXjGRqQSFwwQ8X+kUGf58/1QOK+sWhX/XCAJVd0Q1QU4NGIfvv92x7nquV
+rayrUfBP6hVTsUKVeeIY3htg9AKm5wLhdasJ1HcRQ6gKEv1/myMJks4APK/uygno
+iQIcBBABCgAGBQJT75m3AAoJENxoaie0NIGwVC8QAKXJROjBvAwjAZghx+RrSjnu
+PDvzTdZpuim9UBhoV+ZSd5lPZxdQiC/4EKeA/WINsE16FMbUggKnQiF/FVk0cyui
+O8ytdAfIt9K9nKf16r4C2Y99/+I2HQYgdoWMoWuZl6NVX71cP0+Nnwx4F75EBAx9
+7eW0TXQVtcJuEGRpnCcuK6+JYEEld84gYlkL1jof4ICM1ZriHt9Jmg6Oj+iZoKor
+UeWF8jHmezxliw+8jHj6Ek+cHzzbCDe1j2YGK8Kcg7FkL6VGWsPVbr8elngGFdhU
+ZMNeUNvGam87RDPNSScIV/ON+UHY68ANJhODrxLenxzCUy829V9998cfqJJtJTFa
+qYe3aTIFrwn3thGwnQjv2nJ+uwr0Fc/Oplg0ZKlUPztLuEMfZUJpDtsMjiIB6NTL
+ZGkkcftF5yTnS1QOproRBcRL3UZf9+tqEA3WkiO/NUIrKc13SQPFOCsuY1PtvevS
+5JJJpX1K3dcOAY5DvZqkomKM7SQpxTMZDQNzOt5uDoN+AVScT47O9zSfQU3W0U86
+E3pt6PqgKzDAvwo3oQgErE6V6hjlrMPEBUUeJeVrd7SJ7/X77v1WBiqk8jomFamd
+ySIafTny8HSsK0YwWpdvEza6CJ0IAy3wIFrtYc9YYPXKgebDAVlzJL6Gb5pfEVIK
+Wac5pgXHWH/qJuJ9acfiiQEcBBABAgAGBQJT86eWAAoJEI/xy26NiQWfNA8H/iP4
+MToS3kJdRJ3LGShbmWyffYajIYhYSpOVjKfFRUDwa/JjkJNoviFoA3H/vmcDInE9
+7GBHxxcy0tDojHOxrMCIH39tlHh0uDLyQIYo6t9T8h77IO+QimMxRhhDc29bafzL
+Fi7jTP3AnsArn00Yq7+O8yiF32WyBNY9wcPYPKJB+O5vJ0eZYdMThF/UPkVF1EaV
+dcpfSpKdp5xLBCqkvIvq6YbvWCt+rBuYcrNcCB6/+3hK54Yjrhc6X55/fFL9wMee
+19R5OKowgQ+q6Luo5OyNn/2MDda6W+/f/obRC55IFWJQmFBkEHD3saEf9qiscvdl
+mpPK5Xj2Q8H8zvfBL2eIRgQTEQIABgUCU/G/JwAKCRC/YHCLSEJsfhoiAJ9ha7Q7
+5Li+xqohb/seZ3HL3xGyaACfWC408npj2g+OhDKjnoNJ/HIIKjWJAhwEEAECAAYF
+AlP0lSoACgkQPvkFI7MErwiAIg/9FaOQK0yi76ZaoyLgLNRgjQOajtzFCB9Qbz2M
+yppVuc6GmwowMCoMklk3CsdjSpc0ZaT0eMHxtri57m/1iBPJivhyi2th/gs8VCRt
+Cj1lcFy9qWlSamxNlb0pBfqReUn9sKz/FQY1tnUk0Kd/yTUCLfSwFBi8o6lwmMEE
+d2UWyg13ahGo/kl+Yo7Dz1HIji5o/xEHHKM/cP0MAtaKR2yH9gfv+g5p/GLdvha4
+DypKKFTxZSzjKVsOkuW1tAEqYdSBnlvQMJgNyOLf8sg1WOLLVqU2aMxaV/eLlIDe
+wjY3WKn1TvPBitK9Ao8t2PM4Rl7KwEFwKimZsWDu2C2+XP/joU7SSu7VdEt2UKYR
+manYcWC5NQjJMgk9+mdJYdUTih/ng/RKXoshwb6Gshd1jxGhPnvgw98ukwjz3X8j
+Ti1Su+/e5KMI7x1xMURgzRV8giwzqvHcCjnDoIqEpG/Uf98oLFcO5OjK7q1G4eWt
+lDTJo/usjyRcoRjOftZsnVqIaBUfBCE1oNgRMKoDozYF5WWRNovIiE6J0E8Q95FG
++3ma2ADqZHRdhiB01+c2ueknn5HAdTrQ8MgI5eRntlsNa9lAWfCS2Qbo8XioXmHi
+9wXQelu5dwmxQcqsHxSmGwe9L2RZVivyY+FeQbqEFyhfQZNx3g2bykZTE2DolBv1
+NzsMHvSJAhwEEAEKAAYFAlQDVFkACgkQ0BeMdn0Gnua7hRAAvYo+7vgkSDvxbh22
+dI9YijMWN1Gyg631Yp8bk+E7obpwJmib2QtoEVVXyO4wUexzKrwZ3t5nxwuFeKET
+NVz4U0hX8G/zerqKyUbVQiXo5juTbDV7MreJPcDaMbPT7HhXIZjh4HuylydESAgY
+B6b+tzp/Nad+yeeKaIGEz3Z5lRJx+JVKGiNis2HWqZkW3uBattJTSOFhsOv1OtV9
+ddtKpLClVeFqlrAWTP0HQTD4MUFDbgozzv/sD7GplY7gkXalz03PNZn1kA35K8LK
+mGIFV1N2fHuYBIpOBrEgCY5l7yHtt2Kn2cI6v28sSFnwGak5TmJfaci5xNnZJtg4
+dKnOxkdZvbkm0vNJal1wZb2dER5hsfpPL3XY7O2sQl5xFyJOBCG5iA1TWINDSgR5
+h1WP5bKl/mY6tNDV73p054BKLiIwcKcy31IE0pE+1egIMmhc5YOK8J6KzsDgjRph
+4+lYwy0uq8pAxIv0a+K2M7QxGmx688qeESDLuswaO1ELt5lX+UZ+jc6Ain7OPZAI
+66XD0ICowosJJpMU0mX9kqoN0XLp31q6owmDRiSFfZxU2eno5cfL4C/tVHqxIJ0N
+prQ7aOmj+U58Zpx+2Z2FKls9Uj8f52jtdJ85xy9nqo3oOJlQFF47pr+2IiWN4rJw
+2oMmmN6j5rMBRw+HVHyw8JnVXmSJAhwEEAECAAYFAlQMVdAACgkQpxVVZzJxmUjl
+dRAAraj/Rv+kFYgTMEl1+kYWK++3wPoqkmL5Azae6CwZDkuh0m4EFGITzvOo93gy
+fiTblNQHErF1WAVGzB1m8jW+aXca3x5ARYKKHY8m4jQcsazZpL/srNk8IH+0APLC
+dw5fmWoJmZB8AgxhgJOYRB4xxBeUh/65Cx2df4WlnmFtvYe0TAVU06s8oXgiIyLH
+CQxAFjOIqT2kIyRnZ/I2vdK9Wl6/w7P1ThhasgC4GTkcCaALO5rjBTu60logMVao
+OnSCoXIx4GGhgsePkjujsg0544VLmEOczK7KmtIFn95SVQn96KZWluBCXav8txB8
+GsQ2IbA6CrOQgAGfwejewmUG9w+DpSV2jhx/L8DkcaGiubkbkwko5rDCa3jL+e3m
+VRt2LuQavWGjpL1O1a5Xw9IM/Hrla51XHi7bodwFfeooBtF5Tp5CYaXkorRCHbMR
+sH9s52xEXDFFaWbDVL7ofPNCe9YbPSm8hYBh3s5R4SwRPnWt3IivoTlqk8FUWpFB
+aw/wYpnpW7vMt/u6PqRlodcEjt8yx2MHHWv4ceyrUQs4pA3xF3/OFxJOqvvDRpxl
+HGEgj9/SJ3eNz+ZkPJA9F0hELGQn+kFWTz2A3WEsQCK3IEg+KVmo5wpHN5+ni+rE
+LH355AwXhRlIJhtCX/M2C+WfxzOnziDj3nrITySRT+Ebja6JAhwEEAEKAAYFAlR9
+51kACgkQ8oRrGg0yxEIT9g//Rys8e9K26rBtIB5tnTEWF5tBb+EYWcjTqrGYNzfV
+uiKqPNaUXi21JbRHSsizZ2dqI/G6kU9/jThDuw45kNMTbZ9vbjT3L1yCbyDmtdhZ
+l5j1GA0jMdwyjvvCeioT9ON7eZOil1GO2j9oJEdc5E812FWNblQJEsX+VQDCNOAN
+/O05ZROCj5+smBSFzS4CRcRG8Z7+jREVe6hvNxuAOBbM0KQNteqYo8xeo3pRXYCP
+L02YXskF66aRwCqW04uQNjVPrnD1DZnldwGu7gxOnP9PUVc0EzxAD9mS0SqaWhQ+
+nhRfc2ThEDaFaxBpqPzQM9oKTvfJwdnXCqVFlAcOD8qqxNxfrRzAiEyiNXoBsCRk
+lvCCBIWLa0AkezAH4hCr8a4Q9UtORwmk5Sgc62rHmFaUBeTl6XwL/nFAWjo77nxl
+tBpvHwRpp6FhdWdURV3eMLuMRsS3nv5ry2EtT5FAV3AVPWvsEabdBH9iLxOeK6tb
+LYU9/ih5t33phdsu/+wSq2kdJlnuVS9UBJ1L4cBFbQ63ChV5kcFJvV55RhyRXkOZ
+9/xyAHcYEW5YiGAgKjZHfV9C5ZVhYMJ+D1WJkoKtW63qM3QrAXDse/ah1dgHDdOF
+sjaVDdDC0SMmqi2hdJEAeV/zcloJWyef9sa4jssiR/ba8MBZfq2l3BNkEtY+pzVb
+KImJARwEEwEIAAYFAlXifBAACgkQGXpYiCNfrKwLwgf9HgeAYyuKPx0rbw82hykj
+OYyH98prgOFENQZFOCc/nTHs0Y/Kat++VNMGungL4N5kV1aFCdbAKQdKBcv93KHE
+gULTkGu3S+8E9kxyewCbmqHTq3zyPLCCHuLwxKOxsGSSsDbabfUDNaLMvpWXqbsf
+uzNtF2dhxviPjzoUKoE13mTuAb6igfk15WOUfbhuZaL7Jr4PNwRbUKMICfP2O1Ob
+Xbt5v6vJ9/VV2C4R1fYqqNNdL2JXmEyJiu9KpSyLJIk0h/M60rZNldEQzS1jDyzT
+u5CKiNarg0qX0+FjAplrHr0k9+sUUGduqbInMflQ8Y5tQ3ONFa2EBDFPRc5sR6fn
+tYkCHAQTAQgABgUCVg2z5wAKCRCTnmvh4p/DzFJZEACLTGuPqJtL+ni4QQvPT1g5
+QN761hJ52J16pEissbVjeZWktoJZBnXd1enhBxN/7/kMuQ6W/Z5q0ZRHZnxQYZp1
+OR0vx6aGq5EXteWJFCJ4Wv36nGTBEz5AguCQl6BfcgW0gIOYfnS1uKUivl3RL5gb
+vpJNPq6DH8CkZz50tE+HR7rqaJvII83gAiubO4kOR2ieNzyyPfgng0OCYEvsApDg
+JzXGRRTF/FH1qKRii1uldBW73hNCwS7508F7TPJFA5GOhiGyrw4J/x8TGPZOnoEQ
+cJZImGFwPXrdTGjFlSLSgobVqNdIEPgrHXaLKtJRErIOAr8wstLOq+z2JJyZB+p7
+K/tEws5y/V3tMuIFA+GYu2rADMoQzbtxk5BPgwaUuO/EK/KGArBNcUsBFVpv+CeH
+X/U6tx75uInG3azu7xmKDHZlc16hUIqKc4LyDA3Vw/6sHD5r7f3pLXzvbY0WTMor
+ZJPHJlItZcNKg1wbXtVFo9DR8b8hFXaLLu2liOAq/H6ZkewqYoEn+bio8UkGnzH/
+7yvGnr94WOmPZprybM0+ggsM3WZOBGQ13h/8Et05VZXB3qSS+4wSYMdBNqooaunG
+HbmhqMGE5JDYy/kia8xIqhavvJh8SQJ1XBMHVs8vo137NX8dfEE3jygghnz/v0oe
+hVYo/T0VZCoLGpVsKzbZ+YkCOQQTAQIAIwUCU+jihAIbAwcLCQgHAwIBBhUIAgkK
+CwQWAgMBAh4BAheAAAoJEAkLEZk9muu1Bf0P/RiTWsMR8p+B2I8J3FDtSZh4T4h+
+w+5Ys2Wpp8GYsVNgSC1LMOrA1bwe+X843uM5VUHA5u+HL8HSwndXRXjTEfTHPxJ2
+fdjsnCo2CUZZBMEX46puJYSoemnzyBGCvDbTdZCeP4qi+OF26Si4lWfA6I1Tm/5l
+OAUUCY5oCqDMkRowEiq/3mBFKKxZswUXrL3kEV3MQzST2ZAHvwRFEeGLIDYVl8sx
+ALm3d2D31CcxYJ8XdGZEOVZscaNhlx141MnI1aDci+D+zGSiPa6RDTaErJyC++FB
+venJA6wZSsdT54OBlVAmEEV4CHlAwdvEsJntF0uyhQ3zPYus7J3NTwJyvidh+vOl
+yZ/qdNQqDeAtYQqGAfKN/7xQEE34nV8TGzlvu/u5JI2VS++Jv4NCNJ0xhwCb3d0+
+LfqddZ6rKIaK3MwPTi0xNlZwgdlULyfZ/ZcjpjVClI41e+KXoPIGXyt7Vsxy+8VR
+QH7gBwTWsElnoWRHKW1uzRNBfKA9d/cAzpKx1NY3p2KJ438KplNRAi38szeAeCEz
+84Htlv8J/XuOe4jDmjRYOsTC8jEUTvmCMsoQqE9AJlvkBx8btnFwGMjcQNv62TVR
+DBO8tw+0QXTKGz6tbcB41COqWT5ROkXbDguM5qcTjsc+MUytWIaauHiOynG2DY74
+6p/KRKt+lxtSaheLiQIcBBMBCAAGBQJWYCLyAAoJEDJ8HvON9Uwyh9sP/0GVC4Ea
+iQEPu6wsZpNT0KaFQErTDpExFwNvEv49tl1XsM9jQxi9SmY8UL43ZxIPQvb5Zyth
+Ud+82f2tCGYSVLQUf8e4cwhjwJ58C1AUitqxuJ85GLAiintt1Dicaev06l6VMJFI
+GXIIhdetqqw6voR6087HUTcxd+QHbQuoZLcY7UlITEonPwqwC+wjFRevbwGYzijF
+9eNT6S9W1Gn9c0JYTfw0oPn4DD/kUczOodIgKvVk6RDSKfV9GdxPr3hWOUTKWI0W
+uLWDZYUxIpTkVSgPXfgZxyatlmc6fDLGovbglOR/h6J1rKV+17m64iscB9kK20NB
+8zWKNEatnFLZSBZuRgoU2R2DGhBD4i7AEfx3Uma0L9HG0z0TaksLHK62UBr/6fwQ
+Q6JOQcVwx9d2fYft5ncCiLqtnh67K1mSlA34vLt8uFaqJdR6FWrPbOZeAh3t5UmX
+XZuq5wex5t50NQa2gN889ho4/rNM+fdNt7+Dkt8h4ZzOZKl54D/GjDwpXo10gA2L
+HsA0IgEZBecTH9dat99nWzyV51XG/WnUZt++BGo6N1mwS+zM/lmDE+oLMk0vcCuO
+2YlnAiHdQjsoM+2N0Tr+HjqPkHHdOKHJrLcD3JJgcmOLXwQryzp37jxRBniRQDdc
+GFSa5XQy5sfSOJJ6DY4XH86AFS68PXEGJbI8iQIcBBABCgAGBQJWY5f3AAoJEPwb
+VHyNgXLIFE8P/20risLStOXihqKgnj683YhIKd/3PprnkeEOnuc4+iB7gMJsaBG7
+FO6r7mFvw68CxF8pH4rXcxDvOuZ8NjDJ5jzUt3iAY/h9UYRGWarV1Nn/A27v3Msq
+SNjtkiH3FACRkPFQq6JlNxhWG+9CMrFRR7LtMJCaDbHJOI6ki8aFMwWmu+yRrAJ2
+Ulb0Nb1+K1EpW3MHggPMVWz1ZE0g6tAblC5BPqajGTD6vqWnR64nTtges9v693V6
+O0eUO04QqB2B2Di1sAfZ9uiCwpWOfH/305KYD/z8Szm5dQyxaE6Dq5LuFiANc2A9
+EH4uGzr8XKcKhmYRGW8iytpK9FV6SiLv9WP6P5C/pcDTkiiTj4mtpnQ4m4r//QWq
+7UWiRBiZIO+2g65kfXLbLEjPyQYxSW0Pr7wcRWIy2X64HzsXOTFhFovQEnUtJGnN
+K6W4ofXlNcQl/0N9JTYTj+ijRTGG40EQxqezmAuYRR2PV7UP8AZT3fCfmR2620Pf
+61pEC/yHZyeAOJWRbJn5iHZExF7qPL4fvwWVte/XJnuz5RiNooMQc72OHtqhVnVz
+kXGuyLevIxpSSKMQrOhGyzsa9UtJLPyJImKCDs82fV0XGQfX4XhgWSVITknYz5VZ
+ae27h40YHYiBRRAiU1rGofMQ4xuyCpNHnx73CtkUVH7yXwcq6WXC5/8xiEYEEBEC
+AAYFAlZkT1UACgkQYdhR2aaCIVMrnACfUFY5tWooobw/w7Jeo/72MMBrtmcAniKy
+QVeBQtTZfoN4NCfRugrGupuoiQJKBBIBCgA0BQJWZKHMBYMFo5qAJxpnaXQ6Ly9n
+aXRodWIuY29tL2luZmluaXR5MC9wdWJrZXlzLmdpdAAKCRATGO+sX7vbzh+KEACc
+bBW+fwJ8eBCPhq/wMnOcMU+1doJ5O4Dn8ogcTMmJ/YQhbuK3vsOL9cqFgUaYA0Y6
+rPMKNxcJ7kjH/tMntDdaAicqvtlr4sFw3xnYoflLpKlV4uC6MGxaRP0LNbXzEH2F
+tdE4ZLyLMRDlVyOD6r/Xuzn71HEwPMRCqrkQ9KXJKzWFnqzoNpz6bHxHopMAMeOA
+lWqwDb2IDT2yKXKKNDRr4QdgziaU8HPNYybSUc3P0IXaJnoD++XXUp/nZHGzQTnN
+HWuS1qPPcnLQ5om9ACG5qf4ghpkNjJRjVd5fd1lOkIBA2kYSslaRLvqjSrKLM05m
+iK/AOsPXI0R5wPQ6TDJHBE4B95Rvaoi7H6j+y31yEWorOhNjWNxF25fNAVEbzOIK
+bEEi5D6Ep5t298EppbNBpLM1huk4/YeVrm0msQsAbhuAhYCkTV5tlKgbP+Jh8bA6
+OEOiVNtgZ+98a5tKevpCDGOMiuXoZ8R81pgjeePPRpBoZh3PTfc437b+/R2g3JDG
+8yGwO4sk1oQHYO0y5Udphwxtr1myXZ4Z+2kTR7UjuVVP5Ij1A/Nro8vB+Va9w3Iy
+4DJniv+Mq8tPigFeu2lW9X9FtXnncnNNtspG4tlf3A0iUhbdkrQwnyTu+ssL7pcn
+0oFmn1cvWW8TqSv0+xXJ78/df8ipbWHz6Sgqln/pfokCHAQQAQIABgUCVmnz4AAK
+CRAgZwAbG2eKY15PD/9Opx/JD9Q9ACZCgZhAZvdxlfCaiAOXD8VB8gGJUgf1X3TL
+8ZRE6B4Oy7imzjBQYDcBUQQSVqKI4+qG1eOfTEVjRSVOpoqgfNmf2tOr/S3+tDDz
+0cw9B3fU/jM4gn4U6o5pVhSF2pyUtKEmjEbDmkzM2rLAj/vTafhIWSwQ/jvj3r98
+LUGl6nRaNT5AsRRaygwdUky2bE5KkSSyjTES2uL4fLhn2hn5FQnYOMZEP1jefjsY
+2mU4qAWWihQOgFQaa64r1kNK+CcJ2uT63l/mWHW0igTYC4BkGCDCjQ8GnJXUVUM7
+jRmeNnolMQ3l34qxLp3M/91BbrsxOMpId2RsKSqMSc1rG3XFFf51iI5x2Vby+t90
+CmDprbsrkOYlMJrptPl5dZ4+U9itgzbLb1u5OAacDBk0ygn2g7kgXz1DCo/dzLMT
+tav3M5R65KexKs6K6nqyURsERDylPx76IJKVYTXiPDD4T4SDk7FmX84V/TTbY5m6
+2+p1R4qrxRlpENh1KAzB7+xwJLhYbPCgiK4tCnhcgFV9jEp+734lmoZjvcI9NLnf
+rObQWiX137/5mg8bY3a1owOlXzEz/1ePfZJTJF4Z6JaI96YpdACTwT3BWHpBQ/zU
+6/zn9t3z6FlMW09k4CQlaNdiiU/9112HAi0cbsStcJH2wMb0VaSFqGiHis12+4kC
+HAQQAQIABgUCVnWlcQAKCRBPpFehhRTMY47CD/0TPxsW1YcKRkGmEonbmL05c0mX
+1Cyu7RWX+Bc10SqNNdsIq1AVQ593PFi1pdOuPTpoz4lPVpAw+6bfS1DVTTc+OvMe
+9zWp836oqZ5kZdfZXP5S48/ZfvDqIpr9DQjQU2+EN1PZ7LyCAsNqani5S4rLyIRT
+1JaEvljBheMCHvL+1sl6slQw3DG1XjhofFrW655pRBS+3avAJnQAB08AObt4Sq21
+BwhPYSzPX6Jhv+zio2fw6c2xd4EylARfmeOXK7vrGt6TqaQJCtXHUXvWgWtC3RMP
+bjYoUVwYcm/jMhZwcFLob4TOcb/H+riEA/O71BL7z61JFhjAxo6lFQHRwULi3+DT
+5ya6pRgldIICMdGDGavRAq1Uv07xdMJvIt+0ePZgFh8/wTSkOOOrk2BaaHQphJms
+gx4YRJy2srA94bpekTPBvp6CjqkpPRooeZYRl/aq5IDYRSH04uR9NxhrBmoJb9S4
+2lvqt/i/UfMKJ0mcGGH7mk7l9LGLFfxdKwrdggHBOhUv4AznYUqPuJzl5PPFQqVu
+M5gNZwpCdnyhTQGrpq5N+A/y4TLZZ0+gELQPGr7l2AuFDfeuIclgdEekOn+xfi8Y
+tnkpmaQU/mEG1pp5i+OCWw/fiJ7w/xDlZXHCsmW+MCiabFDhMp9BoRgBEzCoCQg8
+Q87X3JezGM3xnKROw4kCHAQQAQgABgUCVnbDXAAKCRCnIdoFU3SqTzNIEACiW8If
+IfNIGRzLyTZ9aoomg+86jY1Zg94Z+Q0NN2tm8phmVv2rFdju7T2mRGwHgt6te4xX
+gUDNAGClMQSXtoDmdglBCpZ3uPExSzsWbmbTVtwjuI9bzUcu/VyjSoxa3VPYXlLT
+1wJ1sKsIgM9F7RO4hsOR+DF8d0hOGV9AGQlrl0OVDpc28LakerSoSIivb33x36tt
+gIsYdchqS95zBlXE3cER0DSBOnY6ViyIdafBO0CH7fmIwfxaqnWwFCc21qUTXhXw
+9X7Kpq4UKO8TauXksE2lK//KxJllvf/YUcGRXgLB0pKgcLlkeQ5dEICldnRUF+xR
+0RSK/7Bwhro8A6JTFIHHdbZgfTVKV0hjZ8CWwFNUEd9YRavqPHDcEnvO6pXrcNXe
+4c8MyfBARrEMj3XbSBXrmRpbbkWTwqsC0WIvt/DQooiuJsZC0QfrONQC96CDSxOa
+uqteUrheK9vsIULh5EaDOSlD+kjo9YNw/9WtJJkQ30bHAa44aCRjXdCzyZ+BunoK
+NtwHeSxuZ46ofDQW/45QDQiICtF+MwnEJA6XoZPNdFK9nSo75voEgK/1Qsbqw6ZT
+DTJ2gzAwR8iLmBw29YaEIT1C7qetNoIJ9YVZPGZ2hHQ5KQquO6dhWgUqrHSlABxm
+9sUuv6QlJAOm0dYlbQyOgNW9NroKYNa4gP19U4heBBARCAAGBQJWsiGsAAoJEPfV
+yb92XGHj8ZsA/36Ymb57hJGdnM7H1UufMrQ4+wKFyVM22IG0nCu2eR/MAP4ulvCA
+9uEQOOKOZhDqE/bTHY3h0dC/wmS6UgRFvz6HCIkCHAQQAQIABgUCVvZqrAAKCRCD
+gslcKQI9+ScNEAC5FoGcJ/X8FuYCIh+V2vLWy93EnXpYTxQcAOa6BXJAWqlwxCGm
+YscNaOEkp6hHuHoP9VSJMkHPv22LhWwGFBt91BEFLHAsa18LLLT29drDjotWrACb
+19RT1Je8O9/PV1dv9G/CbObKWskRJV/nCGHe+O5BG48IUL3AuGX3vHZbYiqf7QkT
+7SLwF+KNDUSLMXNCLi9ge0xl5vKMveqASQfe70kcK7AlItyYMRuiiaoKAUXAwK1w
+As9omUbLmLaSQiRtZE/0YCY37hMa0A6xJtJaffdD5cidFak235NshOvfohO9YFTO
+4FL2R5CpDA+DIICajzwPhVN9h4HW85KL9ANvGGEAxYELCil6oelJXwIg4mLdClWO
+ImAShAvrl0bECz41KGCtn07lncIIe0hkz/x1eaNpQ5H+yTDANaYcPCIXwMKrlDuF
+cDTfD8ARKKcnWYznLVuf4kS01eRtS1Roz+1kvXm26UgTksXDVH2OFCBAJjrrTxvG
+FAnxXGS6orBnxyD+lhhdRZJuaQlZbN0Qz7gBvzBgvVGpz7MyjkKUykO2jo5ePRdO
+i3Lmo1y7hdv6kF8kT/K0Zefc4+7UIiZyVv+PAm5yQeQRAIMmO5/IjN2ftNDNZFfg
+eKQUZGvf3DilF6Z2gUJO4v5vB/LzA9ERteiIhOfT7g7mIfWTEd35zMf3KIkCHAQT
+AQgABgUCVyUSLQAKCRAJGrhWBpqqHBL2D/9UXBfFfPdv+MDZfYezcfUojyZAc8Ar
+WzBzsNmTeA+hdj8Klqm/oJKULufROesu6xIQCQOcjhGdMcdnz6TusZ2BLwlZiiWX
+AXPZD8uOcRGHvbHHL1cMDIxbU1beb5Uk7LUicvCkZx0mszRbQNdlcj8A2m/6+q5d
+iZtKh3JdwdyTwgUkPw01/j2NnDyVZn9Zh5gxREIlrFCaxD8S33X5z72Q+gK/BygN
+vMLlx9LTNUyInPhbpZet4pD31C1xWKHLoqc+/qeCcD0DjKiPEFFLjgcz1tkvYaBc
+nyn2nygIIbz8EIuj0cl/3zeVpPKf0EB4p4ufLE/ZWdpZq+IO1lE9lKkFJaSIwVcF
+9qmsOH/SVvgMK5hRVVnOilGzkHj5x/nobavLZGQeuzdfM35630c+7bfECGWX5muN
+tL+0ZG6Sh+zTS8FE1GfJ1ghOk8WVNR2M47iocN8Iriyc23fOzJ1AdEQA5ykbo9Z1
+MeCFbmpSVyBJ7iDqLwPKirkCddi2Mk5vv/+/4IKvXyOaUOrDCK5oL16/fz3lUuFO
+z/ItCBPamFxnvvXc+XE8Duzh1XZf+jHRnTM2io1vT7MhRZZMUraF/hN8mcYynhVj
+1f13W3pm3MMzHXhmPkN+wVloWYvl6HlPaOeDWJmzaLK7gFnC639iVgb9+8zQa13b
+vi6Mpedqxb9plokCPwQTAQIAKQIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheA
+BQJWIhROBQkJvgA6AAoJEAkLEZk9muu11zUP/3gaJAJTKjdl5Q8KOUWySG12xta/
+fWq3sC5hbA0vJhQcVx11cCvtlQ1AAzQ3aa7TQcT6+a0fBaw1iz/zKTNyRvoFXa+0
+FL7QtvvroILSiY7i97rCFgeME2UypbEWHgtYA9+EgTAzn3xujKih1npZmzbqXQLh
+sRMfHJUsHRNKsXSDGbWfLTNIdND7YRR2GWlGbPxu2csgIXqWzAau08YCrHmLWbR6
+FuWR10r9D2EwfpOb4da3T1omPP0x1A+xRmcw3rvy6VqObGiRiRt2/K44hv1oGUCu
+1OxxtkpO4Wx51Ut44PCoWNwj/TItYKAKla9gJtpaWGj/hGeXNDEQaeAlEX4Ul7Yo
+el5UES1wbwaqf5Xw1NY3OfPfB9Z1T1SAXeyTS+EMcUwGsmyfSSopD5yF14Y33cme
+ouQC1hmk8bF5cpKY8TOHXCcxn2xaI9m1NeF1hky4xx9eq24xXFCESXPc48UsXFHJ
+O/axqFO5JzedalwQDyj8R/SaUf3300eCBeO6MifIWNxiHGIAfhcIFyz/5vzr8PIY
+4tdtkS9rzLi/HnrGiDtsXIemhIgOOHboYalplN4eQIpDMAVcjhD+UCiFyvw393zk
+2p8KEoAcEO9s3rmNJO747HRK7FX7aI8k18wvWrCVly3WJSQPTONTBZx1X61C2yCx
+qNsmm71NbQC/Sf7EiQIcBBABCgAGBQJXtg2yAAoJECoXQ+2pGjW2Z3UP/i0XjdCI
+C+06gVpCWADZ9MXa4QIrm+OLdi/e8f4+qhWBKk9TBCBjPeex0alHaWbdqS+819Wk
+E8rv/068+tyK9TMhx02L5bhluOG1l//uFlrpyEJpPPzflN/u0ndKER5fZoFd6t/y
+r5K0rmv/QW8WSfOhyv38HLIITvhzPbHX1uO/E5sI7BD1ve9EHfpMQ2+ePAYt7kM7
+0xvRF+abnOvOqln1SQU3ihKlWRK2nEyF0Ekh84IMPJLDcvhUalJ7U5tVFQU8l8Xt
+ImRBJdMoJ63Bha4sY5OvZI9Gi7/ov+xZUrgiRrK1XjQoU1cosSqxofQSF1xr0Rsq
+++VctOZH6pevYuC0T+9rB1aryDDIRd94M/kACyF24OpRIj6I1+Vx8cAmqAeNnNcu
+oRyKFuT452uFQLyLq9hQD++IzwL98PxQeAY5nxp/5Q/9MyNir4tDyxC2BnaQ+TGt
+WUzJKGo7Xp8QEHvuV3eE+gvByudIfe6j7AaLKeHVFel7wegejZOppC6gXx6/Rd0w
+7H4lNnGSZ0SN/ecowzwfjtRhIIy0gVIaJ0gdmc3n07wRl4v+n+AbgSi87cBx6RLO
+wZJOgLlIcbweWVJHIzQ4dnUCUW+WPbSBKG2Zq1q4Zle8/x4PwEbXrsaizzA7WsM2
+vnz7g4+sQKbP19ojfJ9Rn4eU1SFJk4wVG+gkiF4EEBEIAAYFAlfehyoACgkQDeSq
+nFRG6/SZCAD+NBgHeg4/R4mhco5LxNsBRjVbqL4V0XL721rM9p5RwT4A/2r8jXtw
+XZJzOQi6+qdKC5eb65vc15LTSYGxaMsDHxYziQIcBBABCgAGBQJXzSc8AAoJEEGq
+59zKPYNRfuoQAL0Ifh6EinJDN5h2FJh6WaHJh4I1FGGT03bZe/LwbSklHKI0OKM2
+U+QJOqIMIveT/XT7v2NbIMUZ0Wl9XeCwVicvxmUNEnDm5dxLeOKJQsty3JeUIjEu
+SnZtEbIKeEmx4RXGZ/NHBZuUqTl2MgRt10/ADQjYBqQFvZ76ou5692bbgwBGiPLJ
+ovJjHKOlmGjCBIEoNS6WbSUAkt5CWCozqupu6d+h1DKrj0tqfhD7Nnodjf7s6ESS
+TfVsF1kCnEmzv4rDScROMW7ICd/XEepBXJ86Ft6bEutGldixmqX8IxOj5A0asOpG
+vcxiPPA0b9CJcTT4sKx/xhXrFol2w/PSixt4WqI9qvxGHrRGzdhaC7iKFzuPYgLz
+FyfRuniz8JMswjwBpdeiIFRW4TCeGpAYKs6887Y24yAVoIz8bbcirjK00EtEJzBQ
+37Bxcpy5K67PZPpVoxJkTus2LXhbJA6+08ED3Kgi0NfcLpiCMFvxgU4kKXXGdPiR
+df/kAC7qgU2y6qko5qYNNEE7WYDkVZTfxeh4iXKsftRQEGuJSEYScdUD+sA+1eX+
+Wfy71xISqXLEnVOc6I1xZ0/8Xkn1kbBwuJmXyjPn8QWTBUrPCWraOZxcBScwabHY
+MtC5rJqCDSePtaPFi9tz7uE73bvrNsaetohlYJP/1w9aNDUj9E34xYv3iQIzBBMB
+CAAdFiEET3Fvmo+iyA7xteG6XjXyMd4axeAFAlifunMACgkQXjXyMd4axeCMMBAA
+tCtG4aZY7tzAblp5JfAGDoY042JxsD2SzLiteKfJDXTGrpDLtY6MqnTrMPD9zPJ3
+rEItWkm2bBkZcUJyQuT2v5zgczAiIVJ6bpw4KgIeAg7R4S0WMyfS5e7oD1nsZkg8
+GbgrvEUUVfUIrt/i2BTrSL6R9BTK2KWzJsLWxA+dlOVwQNVvZ332BHihFEVq0B2x
+DX8wBHUYZw8Jb2LMubgwol7N1wx9cyW2SSUu7V7/3gcgtb+Mk0Xo250iQKTMTuzq
+Rc1Lb/TRUFOo7qgu0aBAz1aRm/X68/Hvdr7UtUqwThQzOh4jASlotMKqoaxC3gaa
+dfSv21UhhgKzkMlW0T9YXkqFzwYUgcQCKk9jj0n/46Ba1g+XgbQClcqozd+el4kb
+hfAG2DzM5Cky6mKCsszNibJnocsAy2PRSszgEI8BcqoDlu+rmbaYO4lowkM4YwJB
+Z5eidjqXN05vFpgnMeaoPE0HOzr+vph6Bvq3PfPtYRQ25cf6wkhs7tTcqeDBciSL
+8x4RJgRE997E39MWZPPz42sz3YRO6eJrBTiwq3pQ6UKwdpmWkW9WIqRPjePw7ogo
+SI+YhXlnMh95EjVKz1ohZPwpx4IljpOOBAmDNDPt4rjxPOWnF/8ZuKwMcDVYYwgS
+SJrorgyxQua8DPT8x+NKvR+TWb/n50iLl/8/RbW2Zh6JAj8EEwECACkCGwMHCwkI
+BwMCAQYVCAIJCgsEFgIDAQIeAQIXgAUCVzwrvgUJBTR9KgAKCRAJCxGZPZrrtUHU
+D/46hJEa7Zk9NLP5/wvMUqwmQTb7IIRXjUqsL2Dzyu01RrVLJEdRTq3TLDc7vsMu
+yJPJTXcXj8B61BNJy+LBxUk6ZvlAvj6jyct4sZz5VRqr/Wd1DDpw5/lfY8SNaYzM
+cSbvzXZr7pVYtMiJy4rN93E7ZEMaFi/BRZ8XF/JQcvkI1eJW7IjMTGIJPFlN1Px9
+0UXgwIga6sM3jtapQtn6P0AIY9ZfFQY10VtwXtRdOf8D0P8ZrlptQibQeAYtZuAr
+7WzIWVuPSgC05Uc4Z8MUnEVXAXcOQK+qMPs11iW5gz4hWerMfFPPLlNeOiXAZt/C
+ebEdlSl5WRDHZmSr7QdHRnmW/4txnwGq+u4M+e2KPllhkZacrwDUvzvAlupW5K1v
+kpMg8+xa/VhfY5NE3gKU769c80HOU+hpPOhbC6zODlF3cXWENotm9x2zTSGKf9Vd
+89YzVDrCxySTU/nyTrUo2IEUc7X6m3Lrp68AJn+I8flzYlwEbhquXpU79xup83cA
+hTW8UewlVVFz4al3VQnN14vjFRwvCcO/nBF5wAmFgqbwc9OLzPKOT8X3yV5qCJey
+poGQTRP8Ao9Wz078bMmdrnr7psUZ0E/+xO3Ctld8M2CaMogFKJBEkM5dXOw+iTVs
+Hh9VtJ2LEkuZp0z4AfoT9QroR1n0hDofv4TKlCRASKDwl4heBBMRCAAGBQJZqswP
+AAoJEK3Mlkc8+beClE4BAK1abwUIylSeTGVtqhrP8ZS+8zAaaC6fObNDi73xA3oR
+AP420a74TmUJJiDrDIqszzAZH1yptCh8OMqALoi0Juo834kCMwQQAQoAHRYhBD6J
+7udFjnINl1Tgsl4oozsLhPV3BQJZvB99AAoJEF4oozsLhPV3N9sP/AufjQbff/bx
+rZ+40PGxTKxVpL7sAPV6253N0oCHjeXdWYLw4IFxaQlGSgag2Fusw3C5ipfRyuGU
+jx4GCsGSB14WyruHtPn8Kwyxc4o6hYjQRDP15bWNjjVxWRTUyMb0n6IBjQr39V57
+cdQWqSoUoRBlcG9wLVewSFRtd2Hf1mhAXJBBaKs420H24ftvVUi3NOANqQMHeCle
+cWS04mmwnKIqw9KmkBEw6wvpTD+GSRzleHtnKElNlnRHSrwVoyJJK/2w4Je3GViW
+jHWB2jf8kVOo0WueMqbTTSqVkrCzjvXNAWdJm5b9s4vUANpPRam/CiD4DfNPGzr8
+/6xTqiBgCIBkmN0tbDLu1HWo5wiTxeH1ZLgOjMAmW/ZZM+gNMa3mqydTSDDLWHMt
+EM2pGhkxcb9SdYASbNwRsjx5JB/oe8+1f8cfSqo+4Y4FRV1f847j4eRKYeOcVZXv
+2h4a9HmmTF2eApc0zXfs0H0E60HpoWu8muppH0xqC8285T+oXK9Vyi3Y6eSkfZdI
+Qy/vpkqVa8FanF4IH0foJd1ntAQ8sX2PrvVYynbAbzxdFVYq6ApaZ2eoen72OQH3
+IQK2I68YD2uxYrxKp6sWSDBzVjwEl4OpTDCzYL46SkfOsQ/GKwVMXRwuJ3cXUyCM
+IAZxYTy3KKj8mfkHqPwb1MgmCS8+zEq7iEYEEBECAAYFAlm1FrMACgkQimdxnC3o
+J7PNTACePoGBoO6/XhOeyxrQ+zr+uPP6fuYAn1PZZiaMvoXITE2GljptKSj1Rtth
+iEYEEBECAAYFAlm+L6oACgkQimdxnC3oJ7MREgCfa9daxMJvXh2ocKwBzEHEri9Q
+JT0AnA9RuktkOnp5T8gfgrKLROT57runiQEzBBMBCAAdFiEEvKaJtjZVOAHDxiFQ
+GXpYiCNfrKwFAlnFdZAACgkQGXpYiCNfrKwveggAlSTePBmYX8p2DSkT7Izs/4pm
+spf0TG0yBpLrv5oMgCaPF25HzC5V/uHJM6430VOs6ZatZggi3Eb4uBpkIOjJjv/j
+vd8MaiNdEyh3oP+kAIn07GMgQN7bxkjOnFVkEaC2We5H/Pa+I+8zAGeL8NYhHWYs
+5goXEIn2VPkYYzS0s3HZtjSmAtGlmPsrHlK16ds9ZXPshDUt65yYZ1C4kZyCRIUM
+bN16o7miHOhOhQUxapAhxzOge9Xmqr1tVA5nGFZV3y2rQ9Q9g3gQkrpHtsnLMomo
+AaFjxtD+CU1dsd3ANn9wEdAgWrb3Qwr6VwSZWwFZGIioSfjkQkdTZ87WJ6B6oohe
+BBARCAAGBQJZ42uvAAoJEMjW4VIB7p2hsiQA/RbRCGomagp7jDqoYGErJmVr8iuE
+KSsHIFynVe9GwpqXAQDt+4600O5sIjxNfCPC4MqFOxLl6Oo+1zlHR9JQB2VdgIkC
+VgQTAQIAQAIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAFiEEPORkVYqE/cad
+tAz7CQsRmT2a67UFAlkHORMFCQYLpQMACgkQCQsRmT2a67WUxRAAh4YoRsUgVDHZ
+g7J+RYzA7RM5cFbr/GTxYSmUEC3sFuLdK4T/JGBsYOckVOVUYsYRpY9Kgnb+SRcD
+7zKFKeFTOJdX3RlEWTFjbNDk4ax2EiMy/Xap9RPzCU0HYUZG0dOit36/YdywUhze
+kzH0OD+oEYyUT4f0LUXAMfDZgkerX+SKW+HJKrznyZs1vMc2RVuWVyM4u1GSgfIq
+YYK9HbkYGrTUBLHXHjixclktu6gzydL5Qni3PBimJXc1PtaTv9oBfFmM1ZpJhMvQ
+kGEAj2860IradRaygq8KcapNGzsiPguKHWPBCxkkAwbGB9tEUQyNAQGAcxloPxct
+hFRnHVY4OIDVYMog1muHVMujEbbT4lCjK3FzV2siVednOw/Hrk1Pwl75OYUoxxBu
+o7BpwDxMb9XxRYmyTVMx26m9n4WDj7P0tlR0Kv8baM7zm4qm0/V4FEj963sVwEuL
+lheeYA8hOTDXOUKa4GGkjUW9sRonTAE43Zp3wLNwlsky5lSHYQXhcQYcGkTN5jKM
+kWYR4zxYDL7QlRPIl34boAMKWDIYmIQURfvSdWHYF81TrHbSe2x+ti2aJVb8UL6Q
+w5o0w0ezY1pNodGe0JalXN3nLvlDpcEA+j1laEKsYYmwxoM/exmXlZqf40UK4p+C
+RleY9vw6EHpYhQ8IHegFsg9m/HNGWimJATMEEwEIAB0WIQQOOD8hPWoyXXrFUNvO
+6FfbsWXAogUCWnjbyAAKCRDO6FfbsWXAoq8RB/46FEroSfCiNOzZisoo5koCnaWJ
+Kb+iiU+Ba4KOgDQE6nOoDkoCpY6r7i4LO++hqM76pXeSMQZnzGeqOoKU+SShrGoQ
+iHwEkfCYLSn7wN1tsbVldBADXWoYmGlf8d9yWSRbn2i0JvsCv24Es7AXRwAw/t07
+FN+ouPHx2pjQJxth1No+P638W99RQUl33mFdpWmF17B4S1HClfVea3N4qTYYaW/S
+YmTDN6JGADxLU9AxXZ6tp2c3QKqS2WOc4lhbxO2LoRlxYV0r/fgxl6qk7T8E006X
+Iu6G5jiK6CiKP8ocEzaGL8OKic3DYO5MNQGxL1C3YOrFCp8jBgL5TSxOw51viQIz
+BBMBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAlp4uTwACgkQ3UCaFdgiRp0L
+ORAAw7w5GIoxRFQGNrxPR0n/4d5ifZx62+nR6HEKOsNdLlgWs6WpDIVVZrWuhTkO
+aGFcdui9q07yrDtMnE4EyFRJJaWALaXoS+CiV6lTf4fmJRcb+VtusR6dkqBugEEd
+HRJFPuQ1oHnW/oOSe/eQay3fvZFt/bpU/OtfGK9b4+vyjejUfY0PFoBEJ/oc2ltO
+Gj04fPBhjpKUFMDEBuq5kMVpkkVRLugPrXJhHtU4SDvxk0PGTQa0kjbc5KhSB6Po
+nuHvkHOaYqq/xt2qjH45Uv6mXIwRx7GMLGjAbxSlH+gT9Oost26zmOFQ1SGegKS8
+5rh1kk5Q6uq4NI1diQUigDB6xYWpI/F+WqVLSom4TUC6lp7YL+wGqXAacWSRSKWy
+T6SGOZhx6S5f6GbOcQ4mbigJtPjeMB5DAihr5u2f8U73Z1SWbr12zozntZRQea2x
+HwTJ43LiMsuFnyvvQX5XnbSu9Ji2Pivo9Qsp3e1et5AkLq70gip2EQ5VAoEQxZYw
+bf2Dbs30jmFA7mHG22igODBYxJajej4TBi71IZKyjU1t5KGanVYwwoQnGoYbT5lc
+LWJDjbjM3kDD/K4uVt2hLl8D+PyGa4+YcCe4cRSXQwmFu9/cfG2OmHZvJXwYQoBt
+lCql5rixYpJUwJoLPoQkBGK5bRFSQbRYBN7nSuu8lk4fP0uJATMEEAEIAB0WIQQp
+WvmRb0b4oTSwKdqAhjhC8P7YOwUCWpbg8wAKCRCAhjhC8P7YOzfcCAC6IhsPCUk5
+DJM7Xof0xwGr73iGCMsqwq18+afbNo3PzYhNSd1PWzXHlsDsYBzjJqXZLf0wZeiS
+uh0E/0HlZjzstm5Q2NwQPqM7Q8oBfoIBEKOo9PpRQWkkDPg+3fVniBhZCJX0qj/s
+R3XSGknWWdCcWZ4YYWw5MGfuyr16HVReescgI2ZjNTN5E0FPqGaW1xRcle45TNgW
+VkXBdkWt5FxpTKiPYXkqzaprEWLD4t+HJf3ghNRbNIRqKqH83ly0D1pVxM09SU7L
+XnpWJgZ0lbCzMdZyJY7XGOqI2YcLxwXyR+7iuO7K0TM3Lalha2CL8Bwp0f/0n8FF
+Pri1RhD1QMWkiQIzBBMBCAAdFiEEIGkd/MLJjEeVKYTuAAGMIjgadZQFAlrbnL8A
+CgkQAAGMIjgadZS0zg/9Gc72Ie3odgzEdTHKdaNUAxKrlgbdk9TyD4FHPBRQfCdp
+PKuLahGifxB4tlrABAe6LtYnH5pA5PnfC0cn5MM86CCN0iDrH7LhdllhyiSqa17X
+N+/ouz+Br5mHW4ieSKgknoUYvlF/BSXmgMOmTwHW6MGE6WRu4N1xaGVrwP41y7+g
+FPTUzoflYPDFIq89FS9nmWw3ogE8Xxgx2dJ1UYm6zUV0JVHZnq2gwqs6CnGhCjAe
+SrZKJG7qJQs14iO4ZtJcAN/Lj4Ug/YkXDjTf9i490U1Do7liHOydK0B7KmV5QEmj
+VALbl8wnRAhuIlkVIIFStYl5xHGud/aUStVsUVRgOmtxHNMIJaA5PceiTIeyOWb8
+Ss4xrESfSZc+cFpdJ7sYYv8+vGBuU41ZwmOt7Mh1K5C5IavT45pUBdcH/sivRcUC
+ky6EeT3IET8CYYiWPbvokQpFdcs9vZW0AJvDlcXGfd0tT1RcSDCp0IZFlHT/pmUU
+ZL6wbuhuhyVJhJxuPTi9tvD1BxWyk1VAl4CDWR6yS4gk2l2kWyunKv2P49uI4SQ+
+sBMy4ofsK+A+bZbD4nGx2hO5AqW7h6skcSfP6bRmAuml/IH+aQ7ycXNx1qIjlZPb
+nXVaAFBAj58MsD1eSlOxG6f6kAOyl5oD4bfu2kn9kfoFfHqUqg/26wewUf84tz+J
+AlYEEwECAEACGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgBYhBDzkZFWKhP3G
+nbQM+wkLEZk9muu1BQJZ8MKhBQkG9S6NAAoJEAkLEZk9muu1ekIQAJnbn3GzWJTa
+/WVwFVglNnbCVfep6dTZiYbhSQCVq0+lOuLELm9k+DIWFU48ZT3SiewJMtcQekLf
+nChO8cTHbVa3Msqo3QPPTdjjOdHKBXrWLDg83mBjXIP3jaMFgM9/Z+GCd1LBn+kV
+CMSX1M0wmY6MOYYPgKT8UjdWleQ/iPYcJYvVmPQEWwab+Bkc7vKktHxG7cQQSwst
+EehHZGCjBxaCPJEnlfQPHCXJBU9xHHuJ4ejiLFPqE6BvERzVosJeBznz44KGzqHg
+lzU8hkGho1HVAOgl7/u3nfSLZ9sWQt8yJN6dNU9n+y8SHvpGbxCq1u1hEMA++ELI
+DK8p+nqPrW1erTHsT4wq+TuKr29Jg4/C+zmSsL/VKn94F43bizFNI5Ff0DgsV1JU
+Q5EyZN5Qhzu/1Ax0SNRhoOnja8sfA2RMFxrVkqF07e+NZk6vXG6jbcfYCBg6tyB6
+pRzI0lE/XxEhUbk3QVTGdT8/Eul7HFHx54RfMQE7F0LQvDDI1Ofu1Xmqw6YrKbFm
+MhFzEu8X2+BFC02TCHz+RAml9Z1e09aZ/OJ8WPZXApm/3q3cf/+amB3PbG1uDKsD
+i7EVdGzNM4eHvg4ZnS1VM2AtWXW9VJaRa+64Ha9fGylWDKyDViUHSqvQM5XVktvI
+lJxfL2YvQvW1M26fZuW28eDCUVqhkupEiHUEExYKAB0WIQTck4iltADvsyxsIHHh
+9++BT5KhDgUCW8d1ewAKCRDh9++BT5KhDuNcAP0b9SOU8wZEVmoCgpr0EkvZTg59
+jP9deTb6h1kFebrEgwD9FfAhke10769gWkE0SzHSSkNdJlv/UAda1ERzcnYZcQSJ
+AlYEEwECAEACGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgBYhBDzkZFWKhP3G
+nbQM+wkLEZk9muu1BQJaxcaJBQkHoqV1AAoJEAkLEZk9muu1kWsP/3+Kl4/RB6iQ
+7J+YZOd1DRb23KKgUYx1mLAarBcHvlzwzqp45SoH28mR9LvwdOCO+xqwxqUPqGbk
+HOB9cDO1Zp9en6tk8VWHOGtNV26z69lttqnZzm3CevFfW550rrNTPMXzJhKaO4ZD
+pstOoT/dahpT3DqGxvm/tSf8mBg5egrte2I5crPQqS01pjY83gVVOqarEJQPYINO
+chf2+1myWTu+UsRJdNv4tJOyLz9bKPaGCawZFPR4qn0eMcFPPQfRrBwJ5X1Tuwxd
+S16V0O9IJg2dQ/c624RO6c1jhvkRg8eREh1Tg4kBZDNOosV9+rou05Ro8sfxk6CB
++trOe+X42K4Nyt2c7lgBp/aZD263ccCoGdSPjAJvtewdn2JijGabGsX+W2RonmUK
+l6fqD/0jBFAzXhDYRSKnLB37xHUIrrI9dcr/JN1P0pbiLsPsObd9yXt0trzN7nd1
++V/aiNIPM1InEKIKnAZkx5OJSNGNk7ZZzFLeZsGfjZ4D10UiNw1s+BdF3WhJGRfR
+F2jRucJPkNYhahipoxlNXCQiLXDjHj10x7vLosPcRgtecBUIgoLt+TG1CWDZLvDQ
+2Akk1bB3Rhii59Ew6ybk24lo8Tra8TnA2k5Mf3U/aDBOBPVHxsvO7Ucmpn5/6DiF
+5O4iJ5FZnJTwxx6h3LA3ii42/NeQw6KftDNMdWRvdmljIENvdXJ0w6hzIChJbnJp
+YSkgPGx1ZG92aWMuY291cnRlc0BpbnJpYS5mcj6JAlYEEwECAEACGwMHCwkIBwMC
+AQYVCAIJCgsEFgIDAQIeAQIXgBYhBDzkZFWKhP3GnbQM+wkLEZk9muu1BQJcxrzM
+BQkJOiO8AAoJEAkLEZk9muu1jMEP/0pwutkoDwXI07eQRKOfhFp6I/zH94iqg+qk
+O5vDZUeqhGLbhEalF7tpiyGMeaKt/1zRhUXaeWeTEzWyKNQWJJaIBhn2t6AzRqF0
+ZxX6w1GoS7VZgsuNkVxpcyh7q/QwQkevHvnFlKX08dn4Exg79WjTMEFBKDywYD8N
+6enQRTiQag4wbbd4I7amqHGkqghM+HjsCJeEHsBUdnIWaMGqBp9bMQsSA9DYVCHv
+3i+5gYaXOCEGNopE3gW4Da0Tzye2bo2xXUnBVKBWnuAD6KZaF/zyUgKZoO6hYvtL
+1j13yAao3ugYSUHo1bo7lX+SZo6rFSIZQnywYZKd1SZ0sW+7LTGIQyTvZWcTxZB8
+aJO6D3/kEwij6aLo6lPi2hGnoBGkmgLk8xUmtZGlGDuEjKsle3Rgt9JFSLekAPek
+5cVfnQfBxT0CdDq1rOj4FGYPgyIzSHJ4H2j39AFFNOMFePuqiZKerceGi9WqG9Ct
+V/vHtO62HmfTaL8/1ezzjW/0GHLmjitNy37OwH3Vji/IAsYjjLroDWy5awIdsPLy
+dlWIwsKiT6z7VTx/BCK1VDYR16oL4lfvrijdNxx6aOuF0DzMbpke/JKCBML8GJcM
+iaYhIY9QkX00PFkgyE1VYX1+U+MC0pMnnnUGrRNUSJXdracGigayUeJVcHioRVEJ
+zeFFSkNSiEYEEBECAAYFAlPo40gACgkQd92V4upS7PRpqgCdHdDTJNfNFpIKeHof
+bkCkVMxYs2kAn33F3/b+XzBCSAsS/25mK9h+9DuEiQIcBBABCAAGBQJT71tCAAoJ
+EN3A9TWIEvjyCCcP/2kVbS+Bt2USLynhwRqyT4RZBHE6RAMakA9McElHfA53tx57
+HNEd3jyoy7VsiOePnuztjbtiTVJ0OclaTJkKhYAPWBH1f7nUQHBfQB/jRF0pAKTz
+AktwQng4GVa2kC20gBG/FWc9scaUvbzxt5rcbXd35jXeBFsXJtjV3D/Urpph1lOF
+CyeNj9csuIczn5C5YzYI9in+Pbcyc0w8nHNE5VMhwBQAFgkd65OeUzj1pq4oPEYM
+1V+E1/kIRuztlgIm3akg2XNWnFCP3QGnTZhu4B5ZMiGWrzycaxuV21/lYGEhf57a
+BCIf57Tzc/g6WHg9dtNqOI9Hb5NBqRn/gNF6dUL6whUSRqBKLRpWg6kyoNo37UiV
+Fc1S811rqIR8XzvIxX/9JIki3ZYa75KAyTz+Q+cgckOtT98D1B3ZGSgoS8XoDUjQ
+mza+hy5KWJ3XTmq6IdRXysoaiD0akr5jM2pFgX2UvP0I2Cxdu7mLUbT9eNK4Z054
+vNDFsUz3rMrzpedqXL7ItHDTpq1eFoGL0Hmd1ORcOx/NPYt06lK1zl7lG++099Am
+96iwbuP5qcfdJvesmrZnZZYz0K/XjzT4VAV/RChBouBrNVQKByiidVknmOmh/8mj
+YBxtHAZr3HZlNiqFt1FaT5nyCuxvzG9/AOMQzSFbjNQ6+njW5DfnRLiETHGdiQEc
+BBMBAgAGBQJT8McyAAoJEMx52Apbt/xR8hsH/2HpK/iPnRuHcIZiQwDVxM5zH4Vy
+lQ+VptcQjFzMGngIqLuB2G+Q632VRZHgDQCsSLtDocdOLA3c62wJdrL/4alA9YBr
+axMTaKyMHDVZ9QNUFnmCFnLc4TXw86AIl2nnInNt5qPFlDA9IHHnH+MdJEgK5jTZ
+2IFHtre8idPiYeQIdvf24+Hecs4Y75LmlWuBQcY558NV4Th5CCdvfXD1KRZ1sAQ1
+oTT2gFbe4Deq1tojHsVTBHHGXQyZtzDgfumEpfhe06QWKpQq9V6U+Y2nuBPjZZIc
+vhEK5bd7CnyLSiW0wequEF62guG811AuQacoiNP9nMiyQTPAJ7pPXnikdCCJAhwE
+EAEKAAYFAlPvmbcACgkQ3GhqJ7Q0gbByMQ//YV8E6uSlVoKCa5kfrJDEWg4mhgmi
+G9V3c9Iz1Tsl9RlOpSFWjJPcJUjVpmJJ0wBuMbHXOb5yGxNJ0JonRwN2enJ3X/38
+cEFY4j0atbvMFCrIs56dMsZS97jQPZLj6PQUCpMSM14ysYR7G/q3HOH7xJvGObKC
+deTXoSe+V+5ZjIMoCWk9OUzjznP+6YQfh/oAVh5Kyuz4zXo407wuX/0kbcQtdzY6
+CEZVESAcZkTX9iYFVSWll8DRGZuFZ6kvze4Ldo7X4dRG68+49OEvseTW0n5OPrwR
+1syn0/EVtPOgu7vPcMW2FuoO8RxvH50mpgCKzZXUttwqBKx7u1DTsSoz21MS1wxv
+P+wZ+R3Mv4JM3++zF+EV6ceivIt/3kRbdW0ZUqT/SVrhT/mgtSL68FgjrLnlosNn
+cv0OHOZaxcWLAuhonvJa+I/uahMWQ0aWdo/AcTPeKmmEI6gGedcBMl+8jWMrI+9T
+3ko09oBQbb7svjJTkrk4N8w9Bv58KhOpO7vtXiMQ8N3TMNrTVgJeUg9KO3bDNxG+
+eyHtxe5d2938xdTt8C9gxxUKr1WujMPC8ik7Yuxj9eYrVOhzuHAIjp1uqR4IDL4t
+pJoUTCTqvZtWDqB6nls7/CUGxC4ofn5H6H/0bt+PSOj7yjHDepd7yNsoQMsfLi1O
+PRxtGaKRF8j4EJeJARwEEAECAAYFAlPzp5YACgkQj/HLbo2JBZ+/Lgf/dklSFotm
+qlCsviJHIEq3fB1fdj4Oa1G1X7knZ/Fnhiyql0cTW71vtwMa/lo28NWt+0WCtCso
+HY73KzWnV3CLTkdOxSiRVFoKSrJzbM8LLy0ojTCwiou5WriAhj9jv95iL4ii4sqn
+hUMEpA9MqedogTOtKW+5ELiygiYTh1u5QhRF73GS2Wrd1USnpOxoZJrpBBWwt6fb
+f+2GBjKR8iQOVc7aBPUvbzjJUD16+0kWXTf/1mb6UvnS3tKVDjHNo2FFLGAg9kI+
+y6HU/K+SbjThKBz31KBysLisRDvK2L65IFyUoLIdVZy2YFuc3MKD+7ySTGYgUYgz
+hTHPmsAwvsOAyIhGBBMRAgAGBQJT8fyFAAoJEL8zmr4mxdKGFQ4AoKVe7NAGmJPS
+SFMy3NcvFVsWoha4AKCRcVoy9yBgM5UcNZQCBH6+9KuA+4heBBARCAAGBQJT8lSy
+AAoJEPfVyb92XGHjlhgA/1iY/hHViepXECMcGS0E6FBFjlFol9Jt647XUyp8l+2N
+AP4x4pvt9GFzrCjxQMfObZrM9rOZ+KQt4sBznJc+0m+c34kBHAQSAQIABgUCU/R5
+xgAKCRAEbt7m63q3TXVeB/9rnXeRG2YWwyDVhE5TUIwSCvYhU+vxqBXLzd/r+hOI
+cUeErLZQ0mBiJb3WJKdOS6MWATEi89urDdfkEXNhj2gylhiAV0/onFlErMwuWFaJ
+m+to8Z7mwdn8ckm8C35I3Mk8qUGjc/xPDAh4oL/5F4NpTN/7vpmd5gZKE58fxGlt
+OwTppIkYdSCi4Q346Ggs11xt5lxNEqUpv89N/tvx07E9PRUt/JYCW3GZ2S7+CfEU
+R6Lq8pXmJN8yx1LziNWRmtWrUaqNUxc/xGuhJqx6d5gLghwxDyt7ClHWJEa1v+LT
+O5gnSTzjmWmVFVYGxttHmoQfIcJSpRQYMgOK6Sw79Am7iEYEExECAAYFAlPxvycA
+CgkQv2Bwi0hCbH7TEQCfQ/uuroqOkNrcbO2AVRAglRtnQtEAn3ZcsdptSytQqXg2
+P+kt2oukG0COiQIcBBABAgAGBQJT9JUqAAoJED75BSOzBK8I184QAKN1nQOTvKHb
+fboQY6IxW0if6D5qc0l9qVi7wSI98sf38phSf4QJRWxhUhhw2pNjM+V7tgaiGp0e
+clrg5I0nZf2La0VlnBdnHgSQV8x0CuPR8gfB2wCmpEOTd6bB+D9avtQbOqhiD4zr
+l9pqn2udbCK3SxzsYLIDYU9MHrSQ/4yWO1eq4UDYpVf26CjpGwjBqV0PS4azxrqt
+CsctGm5CbPtz8J/YJlniI+GADCalEcAvTuoUcz0kPvX1nqXovSS8o/NjB3iwYx9I
+3hcQBCKMI6GoaHNPiLHL29Tiue06mPnjn6KpMwkG2JW36GemSjPBlHrU4JjzXavA
+AyUACRO6YGEopndeqAnm6iyWZNXziy+r8IWM7QWgsEVtqg09JwIDRpxTzvYEf1LJ
+ZVTgVy5NChK2X/ESAgdZ0MRc7XUW556z8K1k+74h3Hn0b5Pri57PdRTDukERYzOz
+AibOppPC2V0hkzRI3hQ6IDBdVETkwQkNfVZ/gW10Q/ZOpB9q45qAqd7NwrHBKlgH
+DuuxPYnEWteEVAN9S94pcztXWaWVMAKdXHDVOcLHUR47wfbUSX7KphddAskeD/VD
+A2/ghP0oVuHsyRI92Gmi0/63MvPG2LZDusMJunuTJwdtybaGvDbr8bHMCOfeENMS
+Q/66Cz62mHeIA+6tSQoVePHvAI0DmwnmiQIcBBABCgAGBQJUA1RZAAoJENAXjHZ9
+Bp7ms2oQAJyan6fSiXp2Cn+jIu2aPrhhztE/9OHBfo8ABQb+s+xh7oIgOlMR6BX6
++4c6zmJAYFSWPF8lBPq25Amnx263EKOGrnWg9qSAiPGuoFpJDXdjGlsOBAr9xJkx
+mNA6WZCyJEKi4hXSGD0C/O0mfteO2nY6qAQw2IZA+/Vsgx8z1wxvFqUGXH8s8nTA
+tU0HRyqPYtV+LeuUcYUUFWJXpsGiKe8T3/8bdlPHYpgpMh1lKlGDvNjdesZn7fMX
+a2wTD7ZjPE6wFykCgsJ5E0kLW4YoXUwObTDijxO/Znr4Tjyr8Np0vyOjErsmWg9v
+Xr5aDxTkRkMGC63ghkMvOuY7mSxr+c+MtBeUgrDeQam2jNLlQxxXircra/+FI2sT
+KPYaG/BQhL01y0kj1vMKCZn5hkmewsWFw3kUsFpPsds13dicjgGOVbpjJ5j0UZtP
+ZNTjD7gzvKPybJG4/7KG4auvvTwIs8HFzdlXmyOf+1H4c/WCx8jci1+TvuKsbl/K
+owQa267N/6IQ67nXg5U3itMCrJbPrHctSs4pUOiy2LQiwxVm17YkK32mNmoaQc2h
+pEN6RgcX4khesnzMnzBNoAj54D8pQir3eMxP1JfItO5PdXNJStE5a94GQMy2Yf0a
+CLkHNmxi4V/wusZlZCLdDFpJhpFlmWrOHrqZp11IYPRtgSH7a640iQIcBBABAgAG
+BQJUDFXQAAoJEKcVVWcycZlIU/8P/jysec8NQGffxymSyDs62EpRATnI08vOw/Jj
+zbtNR2l1BcYjJgcgbBWzcF7n3hnD8ekXEN3eTdKCj/HBMT7jxZNLhwN45DLGQxAu
+ZsVLSbDy5x/Jny6atzty1iYblrjr8XQO/NmCtvRByQUgYOWDycjOMYf9Qi3jYyNH
+pCsHarDyvQRYqhS6mSyFgBDh5ZcshBsx+lapLrweQpxh0uzZok7dh/IDzEIL7UYn
++wFk/eyJPW+2g5lNGe3v9tJTTLLfpLXw7lGSVrdvCkrrWkAyTbtgbe2JLBtZI7lX
+r+c4wqP0akLumGFngiXs83AgCq9PQcs3kx4CB9y9/PFbm5TZN+VhGwTavsPMCgcG
+/2VkR5f7prmDUhfDypkHI5St0MyT0fIsOo+tM/TedYZUNPClAgbhu7HWh5993zsz
+4KwF4snekRiGLnGsdMxWfDHg0oHHqIh3wZcx7tPWVFFLNYOK2F/+IlwQWZNhdp7l
+NDoQvXfgwxoqstcVr2UF6YbBILPCLtG+UUxB5sBkGgtuO5gch2Xi++jqUMbpZBTz
+4zXsdwydDs1rn60nY2gYShtMs4H7VfuoGJD/dcgcwhI7Tw6cD7rOhU/evh33/PjG
+RXgngQZTt5he6FY/mr6xgro8FfhVFrjrs3chTN52seVkAxfyoKruAGKCNdxE1u48
+eIreC7HeiQIcBBABCgAGBQJUfedZAAoJEPKEaxoNMsRCMa0P/R2SOx/QHuipuBu0
+HBqiwp1Jzms0althG907o9PD92H3K1WNNWZ28YbQkSuiyuBwFL6L2yJrPFti3f8v
+3V5qWp+j31jUTGvCWuafktQDzij2HbxVMitoL9XuUHS3dsvY47MFdtEoc1F//tpw
+5LZ4r4FmVAjfolA5il/wjx4q05d8Jo1TtQZZAhROWUTSHQeZTvVziwMpj0fJuDFm
+UZWSAa0vZ+V/ifemgngHfQNh7KlhOJJEbq8+HWZ3uOXs4Jsqx3UirwcriPAUk+lK
+fgefaS/4TbvRtzrLgatOwDKTf0wOmLft9ceMpp+Sg8Jg65KJ/byVIK39vYYCEfF+
+fHaqjlgzyxY0LRv9jmR0PVghmgxzAR94+GkLyD+FoN5lHUSVVHWrQ4/kxeujO0YY
+HHps/J46IoADEjVjsuZlsDIrvz4tnhmY7utUaq7zBG/Yyr/kl7sX6StYqa6curTp
+Oo7bTYbOnTqfIdnI6hsXjjBdPQWcU3isqTPEqbe8tVzxtNU7RiY3xZ4HJJSs04EL
+Od9bwCoKB732DtPQnYBMhm4JP5vjb5xiiLUw/00O8qcRGpvBnhFZOCwPBj90XO/I
+usl3RZN1alUBLOhuJ8Aq0st8/kEZNrlgqoXRrSkWQuU6n+fpJCQf5xRgO4odE6q7
+uZtnorx1fAoqtj9A5hgjTTkf/0SfiQEcBBMBCAAGBQJV4nwUAAoJEBl6WIgjX6ys
+EOAH/ihHL2NLHWHMbrCcV0AoAGnLocwi8m7A9MSweqTVapKj1nz2NoyJRHcAvMop
+Ik6H9vGJIM6bpPPjBhFzZPK9ROvULG3pTM3I8Q3UNxsC+29v3rU77BgIwfkDYsu1
+1kAb97cpRa74+gzUrShrnp0NYoirpXU5ePwf7T+epc2mJOfeX9aaTT0nyZvxYfjr
+HnsIBwoWSgk/eV0WThat/7N2aXwHPMJwjLc8EvtCqTLxUKrClhEHPBcCMjogh8As
+VvFkVYR2Hpm8aaO+hGtkdH3N7F4YwBVpzs/XqIk4ayqzWRL3pXQ7WGfqVgTY/PNt
+uNI1bdqQ6u5HB3A1RUHB80Mg4h+JAhsEEwEIAAYFAlYNs+cACgkQk55r4eKfw8yc
+4Q/0DC4osIxhwkfz+t6Ly4wCatnccCDXoCxk5ZIMQhzmwyEujU9rjNSuayEb5dZ1
++FXzuqmFqu4PKy2yRGdOIVpdvZZiQ0L9cqPwZK4weJDOJOKbrQeqov813rqN1Ep/
+pYIS6AD5hu9JG6f2oJucdGca6NV+2DzO0yWUlt64LZ1pjKEjrm36fu0tc0Y0cFnF
+W8o+FHtDQcbWBZTR7LEYF4aY9dqvRO4x2HhBwWsIUmTSO2uUAE6c5RPMbc46IKRm
+c8vkUcU5bX4fDonpb6zr6q2XaDUY1R2MDEex1XYvA73aSlNw/DXYPl4/LPEENE/M
+IGqjstdb+P8iQNSHvRQ2CgKQ8ff1RPPdB0d7e6CAyi6dcEouU4fwqX055CZUR5C+
+KdSM7UDe3IIrSNpxa3hodMu8/rhay3C7sVUqy1jMoAZDVkrYatvh/EgPjFPh/toj
+szQAJM1tnEHUcT9xNsXGD2JJYsCrxxnLg4bJM3Y5uNCq/7zI4cC8OWEap6FqFNwF
+zSlrI3LKj2M2/DgQC7/82lLYdb2Hf5Pk620b9ousRR4N5rYCNk+YgQ5g2y2R1la7
+0ziss3+kSwY/xe1SZf3HkhOrJIekJtR1nKv5SdcZcB4+P1JxRz/2MPghnHfA7DAG
+JLEroLGsoH1CmFHxf2fzv2X2OYJRlt5gQbdc7kPHW3elL4kCOQQTAQIAIwUCU+ji
+cwIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEAkLEZk9muu1wLcP/REy
+UVsCaatwpPTxGV5QgpViQLQoSM6+Sg3ipVui8D4zyimCoGAckFmjNoM32SF/zNC5
+/Vvg7P1oEUBjroffQKCEVVuSL3z6+MmegMm3fXStpjc7aiAxpAqVw2o4k4laD/wz
+OIVkx3v0fmdFFChMDt9zVlPYfPGm9PlV34nJBwAro8896mkddrJT/O6/8Wd71DCa
+ZFusdbpvskuAXaBeYawqSb29FfwQ6HPcj0+/OqyVzoxkEmpMtgVi7Isc3BWNOOSm
+ilgOk2mWEcCzlbCZ7HqUB7rVmQrDlvgxDcyU+9mRw3tF94VCW97CuURDeuz+sew0
+YwahobgzBmE4dmwgQoVWPe3KDYDjpYSuEw7UPmiSgZdpHoX2jHRJ0oWHfruJbTJ/
+xgUFfCw1jpVA+dt4guFjlFbDH+qOa7kAZq90tdWWZWUdmWo0wmMS8f7eJdVtH6uv
+AISTVafqXY4cWWj8C3xuO8nFfwWZEHhwr2RrlIJfpKdXPSSuUo8ip/oKA+FP4ZkG
++o+IP3InvfefymGloBP2tewdhDsFnCDLxwTH26tqdyhLkUga2SuowjI6HrWyCDqW
+t1c1jDX2L8hTx5YhAeRzdE/7ApjYgbhrkQOO4DAarEpUodHmdecNZq5Ho7buKQ2A
+lyH9/0lvNUkk+lunfQajJ160YN7VIOVhCj0nu20JiQIcBBMBCAAGBQJWYCL1AAoJ
+EDJ8HvON9UwyufEP/jjhaTtmvMzKLvkKgNLGXSGvmeRB3Hua3VSc4sODK1iwtw9L
+Mp9XDsOUKoRYQkQlhntFoHy8Y7GD3jTrspCfDvf2fnS3qhkv335FMgSb6thdmyvg
+rVA3jpWwbozdNwzUTZh9P1fqyoUWFA87n8jLEUH6j8eMdRmfEciblRYNB40Pelh6
+JOWyfyA8p9SaO9GW6cKR2rX5eVDtXfV8l7fbf/dQbWczoG11kdyIsWzlP3NY94Ct
+fYztteA+N8zjNyN3O+tzlaJ5VSxBBP1IMgDvIW35vIEeIxzBdAc/ZTZcMrpLQnr6
+5zVwv5i7xlIXsog/bzr1FSecdqRm6plXJv29UtNqpyYVB0HjtO4GLPl75iu3LG8b
+HpINi7KhuObKY4iI8NaD1tUg/0TDUUwUIRLB6i+fXPVwH+O5roSQ808PHgzh9ZFN
+EKC0H/VnM4mf4AGZkiKchCI0ycIS42lDE3DsIIPNKDMW6gE0hWXV8zglzFA6Gp/z
+xnRdLXNCWKXoASEja1ReRBI0H6YK4X+DbCmO3U1KMZ6a08lDWrI8ba/zqP4tSC7A
+7C4ZKqwusqYNW+zxqtF3LbBXZLlIbbef+BEPoSzVIIzhKgaLy8D7UXtOSGq+NGz1
+4wfvZe2wCnzJswX+sZImNDQ5CRvCd9XcS8fdlo5kM3FQqi+3Vdq5DfHQidSIiQIc
+BBABCgAGBQJWY5f/AAoJEPwbVHyNgXLICIgP/j/3xcUKk2y3OHzeEIAHUOCrWb63
++oyaSHh9qu5KwbdXDPHbmOVUOw5ziBzp6myx3AoThZ2AvDY3+PElIjsNl3hjH7vB
+hns8/O/WY9zsLx5X6/Y2SKKJh6WjgpMwXdoH5i80Mf6i7eK2OB7M3twdX9jcsNYX
+RElmTMIXJPVENXbuwXcTyQRUSn1FqHlhBSaOBmZROQulH7Yf1hMJmTzt2aZHut0u
+BGFe+rVQh4olfFiTIT9T0OEk1UZDbIiXW4hEwraHlVVYypMD8brZ7zWcmqNHaeSy
++VJuGaQ2ByeUkcxHtQkzDHOZA8HK6mfpZxS+jcNLsNrQJvYAM99KGtyGRtMsiyR8
+dqot7vwO6X30Bty3Z21TrnG15fBy/ka7nvFnancZHEWBXdijJxVvuSeQnNyP/5Ff
+rjOIUGkyGwNFnp6TsFqWoOnUgwTiRRgw1pO3pG8qTMAfAFUGdT0jyV3w/LXwp26i
++rZt9KkRs6sPR5FQDJ6d6ZcgKlqCQVCJnDbDeE9K508/vakmqYwtdWf3aSu5/J9M
+3fPXaHC1+U/SBL9a5G48Xb3VXFntBUNY1kksaxjDN6iHOLTjuzl81CKPDOqpTjUR
+HFuzS0o4guZRNqwqZdVVu7OOi3hJHaQ/xnGDSm2pPuzNRGagAjjMsiS/Rd8E8gF+
+piDtYu2sYS+hrrc/iEYEEBECAAYFAlZkT1UACgkQYdhR2aaCIVP+0gCfaLVPaBXI
+YgtH6sEqd9GWqaqdJqkAoIMKo7gHv3erpwrx+/4OCjmmdSGUiQJKBBIBCgA0BQJW
+ZKHNBYMFo5qAJxpnaXQ6Ly9naXRodWIuY29tL2luZmluaXR5MC9wdWJrZXlzLmdp
+dAAKCRATGO+sX7vbziIIEACr36EFtmGtNlNYS1cCx9q5oaaH2r0Uh8ensIpogwqP
+0gt+jBwroaPtekAz981jZwoEydR6iuoZEBz8R0wG7aXhP4PXY0DUdFd0K07I18oa
+u9O8HPYm5Cj2fVKNPsCJ8bASoObVjTMd91IRDaEKz9W0Z9baXzkflxpheeLh4Vud
+0ZrUEqD6AO/45h8zy2+GMhxckpr1DIfdiTVsA3UjFC2mUVBEf0iTB4bgqHj1uRFd
+iBrhV0osfKO1xeh6+PSN9/uJedxqQm/la/D7UBiqeUC2Bb+C2HVag+gfRLTAX3Gn
+AmnMHJKz0pgyCIKMSp+Kyxu2O0lcUNuQrbUyxG0Rj8RsMGAPDa3X2ZDVFiRt5xVO
+397T76yDDcK6NJcaGLWWodiWulGrZ/hNFhoSR3z7HxtBG/BOKjuQOAAY8Pm4xQ1v
+L1as8YDmS55zKDMARwjR88Z05lexjrDHQkXrT4vpxgpKV+a0syxPVbaz6ooNdqpQ
+t3nsebU2O1eKRqqsJZ7qyYHrWeDXzbKRTd2FBk0lO8aZgNVHGvzsZmAUbd/Y0RIJ
+NxetydTcGO3O6sO0AJImMmm0T0R+NQFP0x+7rvN3vcpq9MH3MOJnESrEB1JuVvLx
+0vUFho65rgfcdzl8xQnZWVOgvBcVnZYHICML3voYgcj9b14B/BP1biykLCik57BB
+a4kCHAQQAQIABgUCVmnz4AAKCRAgZwAbG2eKYz5lD/9z3JwnujMkt2cfrI2by+Dd
+jRnw0mnLJ+G3BpiHDYPLe/IrBXthIIs0K+IFffoEQFWpLId1RrM6pjnLWETONOQF
+TTkui9VngcrAJ0SjOiL0FfJkI1R0CIkPlPzY8g85r7TD54uGPOhCafZWusABn44S
+xmTx5Aty6d7bR4dgUdT4omT8kAIrvli5WEBXj+SN1Zjyd4LqZ/7Rf91ffnXEppTZ
+xKaXCslrkhtAcVoCDlQyJ++FhTx4gw4uCF760COQ2r/Dgg+oZLjzi7m+JW9BAg9C
+H+ZQ9Ratuw4jjoGUaaW/6uglzXoaD+0UCp8rw0kZliudpeFGQkvKJHcyOnpV/GWB
+LbiwUZG/bIVXVdgQHI/7LE2x8deLqp6eIX/EflRrtzERsbkIAmqVoK7czXIjVKj4
+17Q7pAsm2SNQXkMk2ySLObI9098u7eNCAd8Bc3qmmwilZozJAjmvotcnnhyXk0c5
+a+Ao8YIbpo04CPgvc8jij8ZYNgS6o1oq8DyY6dGKrh/Zug9ZVt14Sj/yecpsJJeu
+tEyD6smj7pqoE1piUoFKnELMWZUSp1qEMFx/Zicfgn+qPGd+dfLBvOBhY1RIEvQG
+wGEJXHXlWGeVHiuIZvOV4QKXzcO9i8VQNHJCdiLnNZBlvh1u8KsVwGpRFCF3sPfS
+rkzV9McXzFJxYFH/FaL17IkCHAQQAQIABgUCVnWlcQAKCRBPpFehhRTMYwuDEAC1
+QDFUIS1k7r3K+bEPYmIYtSU2X6mlJvgHj0NfmWj+pZ8XX0yVgOUR7MridQVYBxpV
+C7NsJNwl8MS03K+RTD43/0HZYfr0HCY68jGPws2CbN77xJR8mWXMF2qOPw25saVd
+jpcYqXk6kMG7Gm3ppJZtD18I/ifq6tvTXCuXCAx5uNx+2oiAqjt7Q60z6QvsETN6
+N/M1hz9TNe591KnepBo1OOmYEmenCIaRNYwVl7sbh7fQUfXlxOd/k8MbZ8e0VLld
+yEhPX3fKXjlVOPhAe4hGuDONr3raDJXpouzQ/NHfbMBW2Nc2XiOP+8colFrmYQiK
+ib2RIVzi//2vfvqctI8r9CLNh1u2FRmSQyjtKZqL7GYLJpQ+maRbCmGRiIPwaH4a
+f5pgQzoJnc7QDf0Gp+/ytX47ZHNGQGeubMqGKp7z4ya06CAJA/2QwUBsP21YbLBA
+cI/RVdFoOqr5b8LdviotYC/hpyJKdntz0TPWoIKohP/LgPcEp99jc2atr2OwnNCn
+H4LLUEHbdgQslmDbvR1S1oIOAABuQe//+8ewGNiFUmHScMwCZ9Gvya+QzRVrTUvg
+OMyXswX9yigJsZR3HfBLh5u1P5CaDdb0/GwChR+8zWsvv6v8dHZBnZDzdElKiKp8
+qC+4V+pVAStkkp2TzsmprGNKoK+hE47z26cKH3I7rIkCHAQQAQgABgUCVnbDXAAK
+CRCnIdoFU3SqT/rbD/982hhJDcIUrSyOyPswwJsgu3ygC06i3Cnkfx6uJoMP8GUH
+0iKf/3nFODFSMTFhfRWW+w6sdFLtBx2zXbFLLB8Ht8o9xeDAMlpvAS3v85zoptqC
+FiHIaJ0Ak2YGPT2hhhzm8lBz6IDuAIibSTdWMOiiWDW4MMKWAdVl1aI9coS/gl3h
+goPHM43Dwa1MoBqsSjSOreGV//nW9LOaoyu4X09yDDsBWSc5Pd6bDVeeubyKz3nW
+RPzorFrDsh46q8erjHX/8YFXwRbZUZBx8Cq6ni7lEyf/UELlhetxky7WnuhBizcm
+jZBq344MjasTEes6q0xSp2qpKL1JSw9s2234FCszcM9fnr0B+UfhEA+jPKFifh2h
+ayww9GF+XZORYn30W3GlDObBEEegtI00Kas3h6fAEVUqb+KO5CSARGyPGW6tSlzS
+LMCsN3CDSKG59Bn7wNrVpRnJVJd9GJPSjaWiJjPHaIiaACGGe792z02c6l108QJn
+XuS3Q484KJlcUaIcP+kEl65ga/fcApHhGSJvpOARYfcn0b+d6Xo8i9BccQ67JOnA
+q8BBLcwj75qSVzG441O8SEc9JYOW+kI1r97mtoF008xStQwsYM9FGNWotMkEe26+
+5UjwietCC4biTPV0l6QfkbA9oki4WrEBiwo8XjTo5fNd9mozi4l6KV8nCq4Ylohe
+BBARCAAGBQJWsiGsAAoJEPfVyb92XGHjOOMA/1dWX0Bp/4PmBTQMxRs180wkeEZH
+ZoKBtd+V9tjAFTFvAP0fBMBvmBIlKMJB2eQNeCWTQ4sGVZVqnhaykmfYPhs2pIkC
+HAQQAQIABgUCVvZqrQAKCRCDgslcKQI9+b5OD/48///lpB8a7EW1Srx3I+soJh3P
+1byu2rm4diE4tAIYVybsufL76O1C2EkjXamn04n1Nb18be/8NnpIbFQFrasG5gbr
+szxjKMny3WvDMA/OzFeUbjl0qjfGez45aOy2iR9FChi5Atx9OqdF2gStyXiw5xgc
+aUVlTQsRVTieEyX45Oh2/1gOAzfYdxc+VxrNeLTv2du5Cq+obklSUtYJVW2Xd/Kj
+zeA80qGtKVocuohjG4Na7wKE6kezG6l5Z3pqNExDNlRU7kJgLh1ATNDfBwm+A2/O
+HCItGmn3iqRhFSQjv/VME2u3ss2mf024/5I0VADq4kLkyr8OByFrkrN+W0ko0veR
+qmGysImyGyxao0c9ApMFB/SSWNkJDGbU/YNoio2CzL7tPGltJfRKNNbAs5fXv9ch
+HgA3QeuYEH+gZNB/+30ESdBhRSI/8tFXZJLP+vEi46Ocffn/TZB8SCyDLFA1Vmus
+2kOmMnnKktlqHbDOG1KCwepsYFJoImChAZI2XsLNAogh37u3uXLZg0JN3AWhLXb3
+56a41kNPBH3Yj9Pfvpce5GBZgV1SxbyKqWs8ZtIHuTfwljb7k78HYC7jg6wymjLD
+w4g4RpVzrXjuDZ+hWFVLoQAJas43YesVthwT3wWtT4VVF8hUfLTrKO6b85Caf5oL
+g74crfW6Jq3lluittokCHAQTAQgABgUCVyUSLQAKCRAJGrhWBpqqHEWhD/477FmS
+ehCu2Ah444QCymN2L28yT76clQGAgpPlmjdPHvKKLUIgj4Hn6tOIYjE6StaYm8OJ
+blqnTlSa/ZerqLj4F2Jbl/BBJEv9lh+3IUKHR9OmzxDgQHMX5xlh4avowwY2h0Kh
+fgS+8jNVFr6qqvqFl1zNEq9Rpu/9ETuORpEncfMrTrDvk+GW8qdaAgFE6myGiV60
+TUSyrGVYZhgeH4D8mIVT6eWsGstbNdNTYWCW5ypaWof98A81jQEhVvUyJC/rHYrs
+Oi4BEiGFtyA5GWQ4kk2/B8NOSBVah4MNx9WUMjBx3amGugvK81si7G1JYyqOF0Jb
+YDDX+7dFix5k/giHvFBH/Ijj/zNa+R56jlsrViUFRLeAmdVTE5mjA8pp3otB4R8Z
+kysYs9QnTY2p2NxgicjuEnWEsLZed4znOYQ7lAKexp4UCVY0KBw9AP0RdNEEiUiW
+SPl1jV5ttVeHsnWgR1cEuilTOsmURMP4hGoOMKFJYFSdlWBualHHUWE6XQ6c775H
+U73aIZSNNWBs013zUbtASC0ddMD9gx7keBafkhfskyQsfrNVanoT8h0mLPQq5fxw
+ci/XA5by7sjhsSxWoD7bvl1JgOzCReSbY/xki0cYJA5mrPGKrdlRxoKbkY9fdjxp
+UH7JmMFw0i5uUL/UvVvFu6YiA2k5T3CNZzQ+GokCPwQTAQIAKQIbAwcLCQgHAwIB
+BhUIAgkKCwQWAgMBAh4BAheABQJWIhROBQkJvgA6AAoJEAkLEZk9muu1OloP/R98
+y25Cz5QmB6yQovFvi7S0YqmbqAKqPtYw0eaKNualskCA0jY/L5rjbZ9cw2Cv6CuV
+fwTFeZT4b/bTfSIRlgItFzKKRRaE//UnvFymipp03erA6d6mDc62qQsC8U9wsUxy
+pcivDw+Ui8fiRuL3+wcCETlJ266RNp+mPtG4YIHdKRTDnc45wzs1yf6nst6SMVEW
+P/r06XKaNHA7X8DULHkzn5jRKlOe+6ovE7hwgH4c5CtS7yVlQNLR1w+Vrkok3Qff
+BjB8jr+z8WRleD5u8nkK/+IXKPF1tHmnCzV3dZ4QYQ1RZ3CyIdkfxKsxBmuFFA/t
+MXiVCVPVLE7W01VN4KuhsOLdm4dHabXZz8eSRE1XxDnfOMOdheHjlFLZEuJXzp+W
+nj3AqvRPhXDwSLKfjggh6WFLid1baYmlSDl3J65JkNfSCpPS9yv6ZDDeulcaUtvf
+u+rwMO0G+CO4El5bvAvyECkKpJFLaEzykeuQWe6YFWGtBnqDDCTTZpGBZW9HnR1s
+W4+4Nr/pnJER/26zj4UWpk3Bo/kDTvT85hD4mHI2pd31UT+EOK0eXvz28lcfyej0
+FLVwRTgJ5/8/KVcqhszenhNvhEOJ0oKT0jGVvSBhwUIKxrI+MZ27Bwvn2SSG/yvq
+FU5840Qs8UhV5hVy2lT4wkPzANZbuSlZVcw3qnUoiQIcBBABCgAGBQJXtg2yAAoJ
+ECoXQ+2pGjW2IasQALPJj2NrH13Rw04Fxw7mGwScQsefK1aj5mo4pY2wt5sIrH1W
+O50CCuNZEStBO/im4uj1Cx19Q+Tjj1Tnq5/yGWob3VEOiKu9c039a24vR0cEOY/y
+X9Zljh1CDODDXdqmy6s3MBB5jmFzFSYoTBcKSGd2QdsNCtW5lAwpiR7gkO59leD6
+VfSeXSwJ0AhZZU3FYUMoT/oqtaWX+NLrTleJbeKl2cLwuOIb3AATVjhqh0Ewc+Iu
+M+KNY5GvozJ/0mQS7l70MMSZrvo3ld7CDyD7m+7Rz4OaLPnvjwhWdFiC6eBeaRzL
+Eqi0yPgehrAzwUuBwfIk/bakPJ5Oz+p4W9PjJoElZQrq8Dd8He6cUnRxc02Fk1lj
+jZCKWEuhDxDx43pdr2TeCjJ6UXT5BC2yaOLpz21GVn7tLlU7rLK/E1b5B6Inh8QS
+TNZKA6/Gg8zVbypq5djXhg2VIHUu7eQAC3JHb6YsR5p9M6+ayT5rvZGYK3kU4HHW
+/ACjjp2bLIHZSk6xctuxRLGuWv6We0Z6QovNkziDMPMCyX4yYxl2CFDioe02wH9E
+iXNjXy+RgLhYlTTOwyVIVyp/7WYbpvk1GCkBk9TAl+FBDv1AQ2vY1HsnJOsTDWoo
+7IDSYJq1lZjZ85Vb+uzyWnY6GXZGTVGeBed/VNGaPHO1Ws2WkKUTJqz7PQ9+iF4E
+EBEIAAYFAlfehyoACgkQDeSqnFRG6/QDkAD/ahSoG95IpBdHtEhw8RMupMG/4cMA
+nrNU1ZJE/mbfrGwA/jA2bts9BQiY696hGONKSjhdQn0VVXERVRVOAeSPptxfiQIc
+BBABCgAGBQJXzSc8AAoJEEGq59zKPYNRsJEP/2o9u2tPMPwiTbm5uXZYrcSxreuI
+qc5eo0Dv5uloSEMMIGdo+I/DhcnRBFQ92ppOs077MgI/oVvpt0CLA1+SOWUdaQhk
+SEk4dPu1xD2Z0tkKqRWLcQcyjflnkxKxvZsnZ1oWm67UUX4DqMcy0CcuYtMysdMX
+hSIuCre6JIuS1yu/bRGgoy3BbbhlYgBINB9md67D0YTwx/Bp3nPvaLbj/t+JzVMS
+npQljgrApKO9FvHw8bf2Uhj7naDr5Cxh+OlPFLmzDAu2v3tD4Zog7QnG2iThK7ni
+HtbVgFgEZBAmrubOraewDfz6lOOLfWGk/CijxBqg0h7dGWAR2ypwJahpcn0mXuYg
+ED+uRi/ByjT8zVwsnljX8pOE9IKmLNH1UUYiuu/3et1Z0bWR/OW1XKBRx/TdQ6Sc
+MsoANfSUFpSpWDiyA9g3v1+aJkefyMqApYxNeCX7hHo5YfLgfB5B2kBW3ePKe1we
+LBojKZRsq4GqfEA/ZxfHVjPntXNG3/SW5qSMzEcEidrnR3CEKsKzCCnsb1rT5pMt
+UQLxX6oyb9LBTFvk0wN+Rx7AmTsSFtrt16140pIB5OLMQjZlE7HQWtingFzJLrXm
+WciWAxRAtxxC97JUwaW0Xb/iADDcZgYiC2w/2V1Xfd35r4/edho/MyhR4qPb+bbt
+Mix1jc+fplfs36/CiQIzBBMBCAAdFiEET3Fvmo+iyA7xteG6XjXyMd4axeAFAlif
+unQACgkQXjXyMd4axeBVtBAAuQ0jsKG0nqRsity5CY5t9I8pVK3AKnHtERXkp/gi
+4ZaA3G4W7jzBae0qcwV6mvwIiig12bgNUc7As4qSWzNuWxx4vG/QteiXHiT80qLv
+X8qG7Fq0zxA2x5c4PevnNDEuvhd+rdLqEnb7ZeBNe41UHf3VQbGnbEEQCBLVRci2
+w1XZ8bUmIiU+be46ku1gz/RG/j/QuZ8TCFipci4YDgJ8CS+jehhu8Y8N9RMTOWoQ
+FldDh9S0qK4xWig2GtHyNsrLRLLdkGi9fascXkGlSp+17uhVi+ig+saokY9E1CJV
+VI+B+UtEE/cbj+ZZNM3bjKyV5bmCHcwsCeVQe0NBuDZQMSEcaotEbfVwkEyGKMGj
+6Q/r9GWpRoY26VVPcjxWPGTfHOvIWd85wM/CEr3pkrEU9qzsPsAN5sn4ow4mEzqx
+yyR10+FGUPKAQnNQAeaCBQsBM8oI1Rzz7dRS1cSZ9ekEZ3N34dcb2rHqWd5ZciN5
+xbOBWMDZcAgyfHkF3G4MXoHYUNH3pqiLg6BcuZ6/HJ69i/C5AFHa2HNNj07dAluq
+AJgY0m8OUHgTKKUPvshdIL8vTJdd+rBPgR2IoYs6QtXm1rU/X3V4CDtp7n0iiMmo
+NFjxd+O7dyEKCPuwCSug33Hup0Xy+ClgZRGykiXjKB5rqCsrUtLXOXKIbatKpxAk
+jQCJAj8EEwECACkCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAUCVzwrvgUJ
+BTR9KgAKCRAJCxGZPZrrtYwSD/9Bc6v0cYLlESy5gicgpgxmEHHiGCzNQ3Cv0OhB
+PdkXyecjbEbE4oQhkEDEmT+PGzDltT4vzFomlLmZZnB3RFe/qOGDnar+u+tZS2W9
+OGi9OLg+vLE25K+7RgV3IPLFqgOaCHz7KmOX3YPKgTiEHxLbD2hWIv/5OLgvBKDC
+4yg4yt1Qav5Nof1iwhnriOxhiY/wctvcN6PH5/FwQEU0IKQR5n0uHPNyu/VWEHgk
+1IpM/iPvqTQj1TY+unJAXfkcuJkjWBvuvl0YeYzHjQ/YNR3s5QsYVjbvNKowy67Q
+TyyQDkH0Ew6s1Dz2isO8EzLom2b1tHEaPLEoZld5+3mnW7HdpIx1V1OFmGBDXh39
+zLjYb/CbCmSeXlvDDvQzIb6IqKZ8xFXQn66yL6SFgj+w8tD9tRdhFOdQBkSkroiv
+xeVpqjOcy1ToQ9GMtmK2m5QWsceFY8eACp8x5fgkjAR5JRIyVwF/FACUkcRs8+as
+m3CQwfCKKCjPwqox9w7qeIVGGi+bOTg8FB9+icM92HMf1arrtuNb1nv0BEhda3Sb
+IPZ1kSexsJzijfvmHnOJMaOsKRxqAY9EwX1XLXtG4efARj4D0K6FtZItddxexn6B
+Fe2S+87BNVG9SpR8M9O+oCTBQ8KzTy+4ZMYeitgFRwXumYzxazwSy18gKQ5nURTN
+UJsP04kCMwQTAQoAHRYhBByyfbyYYUstWEFkbQgwLbaiZwQoBQJZpot3AAoJEAgw
+LbaiZwQoZoQP/R2x5/mZ9x0o8D4Z8hZRuj/5l/OOF03g+cB6g9MsB7HMUJz3SAns
+UFGC7EbuWtHgSDGBIN+CB5HXLpUutFgt9JvGfNxLhnHaiwP8vtJfhd9kEjHCDW+1
+Flet1ry6ljHaZIyMqB3nC/t0QyGAjkOnePn4dN/pQ6W/VQWtsHw7yXmwartn+nsd
+FcIZoeJMbI4+Gno7LEW8Jm5D02vorjRguDa1FvYOvw11x+EJxvYzHhGyHF7cGzuB
+yUge7aRML5oS+ZKGnGQmWhT9gbUi20fVuu5LENBq6GkAnMTAHOhSvEI7zb/yurAp
+CV8c4/wi0bumkJmSl/nCz1DskRclmDueqamYoes6KdFpYaIp+BrVUD72Axy8LhVK
+ggHveqoHnUFcl2h20S7CE4U8o57uR1Ug6crZnIJ8uZElGn7Sba1FjcdOC0zDGE4c
+Mlez2PBUox+UELbp0KT5kP5eaEZfMwNqJVFPG4z0IePo6Rr7lNYsWchsShIqTx6u
+jKkYsG7O24bVC4ii80v7Ds7BcXuW3n7l1S6hPCOQmXrXHR/4wB2FJOWIFx5qM1gF
+TDrxzpa/APn8SjHlxaDkkCTKO0w6FyJ1tvsMswRgo6b7Rsm9SAF2r8g6P+RjZli6
+xV6WQlG7wrhLo+AIgViNRukrPriRwtgDi5Vqpx/aES1kh2iFz4BtAK8viF4EExEI
+AAYFAlmqzBEACgkQrcyWRzz5t4KIuAEAtr6UqnJvePpWZ+01A+f7B9KZtITibVSx
+E78UkMv5VE4BAKqO6w4jBA5EkSY+0UddW6TQVKcf6GQSiDhyReQmvPxSiEYEEBEC
+AAYFAlm1FrMACgkQimdxnC3oJ7MMxQCfXk8hl158R+ZQ8mBuYaiA2WJ1msMAoIFx
+ywafs88/p6F5TaNCz2xSLdQqiQIzBBABCgAdFiEEPonu50WOcg2XVOCyXiijOwuE
+9XcFAlm8H30ACgkQXiijOwuE9Xdn5g//duqyyJh/P+uGTHXv5AVuI2u1cDYk3sAm
+e6BS0baniAdmbgN5eOVb8syKGQ2wiBex1AFxUJ7eDY75R0n1hPexlP9MMvL6/eOT
+LXfh3SdpSM55am/NZtA+0yyq9PmJzoQPmbiGSU7JnNJMnw9GKyT5P8unJv103sHV
+s3pK1sNOuketzb1N9qQbCb6URTE+bIWmutKUk5jRPOTMzESTeVvQvE+5lNw0mXwg
+x1ef8VKwOZi+UHi1iv/K/kibSFIJr4q6xIBuzn9nNgMuxx0yL7li+QBP2yo9by2m
+QNrJFn8vEvGTWNLBFvqmoItBVs+t4oq4GEz6EFvo/Kx2QT7+FCT8V3vkZaYtMdVV
+KPO9duDxku21rZyQ7dgjOoOZj5o1UfkcGleLJyAFjvTvyGF0R+sedshPtq/Kfujt
+M7aCnm888eQ//a1Zibfe0gm7CI8V6vbOETI6S/vw7NgkLTMilIcx/QE9LwDDWNOT
+FkTT7ri9TQAU3XuZhdiODgyFntDRT1VSP9WVNTeGOw9O0sbcmJhyuzHjUGJDbGsJ
++LxLq7M0y0Jb2ESpewOJzrp9AADWL8Rn/nGY+5tCXGYc8vc38WlGXrxVwsRrC7vd
+Ii8MSP8BTnIGwilylfNzhX+OpQyICFuVdWfQoWRxxEwY3oPsicKdQlQofuwGBSSu
+ryiOpyjO3C+IRgQQEQIABgUCWb4vqgAKCRCKZ3GcLegns4goAJ9quXauMc8Ethhe
+e7eeQwXhQ6ShGwCdFMK+aadwZ6LjIMIaHmnkVrmNRcmJATMEEwEIAB0WIQS8pom2
+NlU4AcPGIVAZeliII1+srAUCWcV1kwAKCRAZeliII1+srFnvB/9UqXDYR/NhyvjN
+/2U5Yt85Vr0cUSG3gpR2nFnmgafMRmMcO28ph798FEdv1Qyxf5Sa2KFi0BGVyywY
+6JNJaRcx7so8qoAwYf0nAvn60CtfvhukVdBTMypRhj8KK9aoc1cU2Fr83DOtEgiQ
+ycCG5zvNPtYrpIzxwSsWXMqTrd0RalfimcOBga+tRUP1WDuDPUMnPCw+6ascymc0
+3CWE2ZCW8pFt3mK3d48N1qSK8rwynTLqwo8UAiKPZvUvbubFJi/ZlVA/mDYn4Ydb
+aYQ/Gt3jWvZNypPXIRheQjCBfoSkZtbgQ+3mk4Bj1V1M3c9ELo0g7R9GZXGjeImz
+aADZTOh+iF4EEBEIAAYFAlnja68ACgkQyNbhUgHunaHcrAEAzM8ou3/3xbXDug2K
+AjThHemBjVRladCPC7BdTD/AYwoA/RSZEzqnyDSvGhF4WHd+Ti4g5E73acqKRXul
+zvBoQKgriQJWBBMBAgBAAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AWIQQ8
+5GRVioT9xp20DPsJCxGZPZrrtQUCWQc5EwUJBgulAwAKCRAJCxGZPZrrtZozEAC5
+4328/ponofHhWCuXwhWaqOr5Pw9HIuuxKwHPZcgS8CCrKD9yks/niP4AKE65T2LJ
+gie3BPIKL9CyQwhH8cQ5DkYIkvRu6dzpI06HDny/7NG8XBEYPk99/92N2W32eduW
+zRFanvb/CmrmDtIOB0q53yW4sRViDopihkNnfDJ+h2SVTLRIkitxfnXv4Ng76atn
+0cDDnxMglkZj84Dyj+EU/IQTOm51Ih7HKAhWritYyaJzC6RDeH8v1yL5WDMZ7lf4
+ezBhQauQWSQ5HtSG4GE7Hsy+qRvhh+w8m8U4gdouvyxCt2b48DdD6p37DDdejg9Z
+0qa4BF5TlQ0kw1wJ2i1+rpn3+9NcYYrm1C/cuIOJZywHE+oSSXANdWGkJqII3Fxh
+w1hGlAXcdqpmp05QB0Pr2tAWfn5GHppt3j6kYh79ii0fEg37OJlx+jvuhmMPT9BT
+XPkqsjOw0a6sA6WlGix+K5LVg0awrgLlTLiwVoLcyo8Q/MAaMOI1JSF9ryiCJCOD
+2hI+fN5qXdYeOmi0WTTwtvUGNCCDA2mw6WB2NncysV398eRa+z+Et822MdZFKPyn
+w4wNXYll1sP4KONZWCM6gwg9COoi22MVG8g/zQR2i+C58lP3+HCKVcnG8pgL5aBo
+t4FSDW0NOFeqErRvcWpKYhhQS0GseXgu21WfeAQ/w4kBMwQTAQgAHRYhBA44PyE9
+ajJdesVQ287oV9uxZcCiBQJaeNvIAAoJEM7oV9uxZcCipsUIAJJYLPJV7XHEkRUV
+iNzeBXWSykquqmD5SxxntTJruDXWYPs72WeuH1UONMrWCG1z2Mp1LA+p4cguoZVb
+PImbvpYnCwN1uFVpSULADVnUIZW5dptWuLvpezQudx/QWPGMVGSbdr21VFHvQ0EM
+d5WrG7UlKaJxnstHcxAMbyySlT1ug87ng6v971dsp94E2cmQ3JnBRvqeD2wRlRZV
++IMW6uNyaKqqAeqzlUpCsk2r5hBG9QeSg4d4KEd5AzQD5SFIs0nta/g8wFCTYwWy
+m+TEFr4ROflg2kqRsUyfI0BY6vP3HYlM67+7o6yJWe4WdlYjcJOIeeYi6KYNFM6Q
+G3o0pH+JAjMEEwEIAB0WIQTL9ZdVy+fn7+8YP7HdQJoV2CJGnQUCWni5pAAKCRDd
+QJoV2CJGnbG0EADPbviaJJYt1eVQFJcoTKxz35F3EaF1BtPGepMghBKPuRkcN5e6
+7VzwlqB8MF0V99fG0y0BHxhnEAar31MHtHaY12uyLoT1eq4KAMf4fCfPyucPyvo+
+ODZ87HYoJEEjVDBdGZc+HzA4fotLIdrSpQwQMyu3CyqrITk5GAzlJQYE7uTvy41K
+stSv8RXygMPy8Y9fDuXbBoZDLRkXPhBtEC9bdRYycScF7+qvIHeN6SQCQ7PVzbaZ
+7DvmTZ5yKOMLPA5JC/G55n+OQ0lxF9Ti7+tV+xZou/5SBXkCrCSNZoMKdaM4jQOR
+3cEo3x/Yvx49lXi7MvqkXcm3RnZ3h1ZDOhwZo3spcuSRqESJNV7oMVddy+GFocWB
+ofGBBjqoRcEJgXQWbWqrzLnIlaKk+EDMnhEa3uQRmqUdFA2S6mcX/MRnPmFdiZtO
+7G8em5z2vy38OLEbqbieVIGkZxq9gAnnfgoWjkexzNUdel+N6TJjZiPsagVpBNmt
+Og4rL7S0Njbscq1z3BCWthAdZCuCUe1nJko5fl3zpO8ToSFmqvBVjst9O8FJj6yZ
+0v7PEslZmUqTtZ4A7r6J0ZlceRjq6rIVIkDg/qJP5C/XY7qqClWfC2pOIW5SIaVE
+fU+Gm3cxXitskUAl00vHCow89Yb7y5k37RNfl9oeJ3Y/YNLiArkiPwuwk4kCMwQQ
+AQgAHRYhBLX65ihbQTcosqD67UMRH0UgCGoMBQJaf1GrAAoJEEMRH0UgCGoMNQ8P
+/3sY126CEryXtsGXlUo89wqsCwQjhFF+7B+3irUUdF5S1rlFyEzmItLSbpMj9IXa
+Rz1hDZr5CBorkdJOFY+Tgo0jfXwVx9hUC4LUWHbYna1aqzPSGH1taCwVdOlkR3l+
+/oWZJAdv0w0rXYbRZRdN6o6TcRAYr//cq/Glgr6ZZh3uEna5evrw67ndxEU3VX9Y
+wvGHAw/YPxOPL8gsMm62NLTjDXC5CdZfq9ISUDjSbjJ2v30SA76/meNIz1HxlMWS
+qNExTPdrZcn4GZ0aJUEI3tqeD2wL9NziHWbfc4ACPbKOXVFdinthb5x7j87/Zpro
++1EpkuW1iCc+OdSCYo9umrByVVC9cu+ab1VcRQ6Acqouvs6tHIrzzzflviHg9oPZ
+Jz21cw7X6S3ruzB4rq6kxoN0xIBT9jp7JKIPO6Bxb+gsvuYCht5JdwCptL7gRKnv
+9/ZgHv6lnuzuy7HjvJQUjU+LDE7zU6QBGEdQH+nxCcMwqMEOpXo5ED+u005t9615
+5fCxTRF56nFfVuEZf+A9JeHw4gfhtsaalYzlMxk/TVdzxLNibur7JWTgk/0v1B7s
+UAuz8jYIpRXf5sMAIsZSwIh0d7es0HS/wGtEIZBPYHs8FaSE1mKJYAZHI45XiXUR
+aPga5g5/ljNcFRcbnL6m1KBdn/DQUBPE6BOjVY5tYABiiQEzBBABCAAdFiEEKVr5
+kW9G+KE0sCnagIY4QvD+2DsFAlqW4PMACgkQgIY4QvD+2Du+kQf/TS0KQriL3pEX
+oL9njLr6ZTLbz2R5hUXWtz2pxKZhGi7A+IjT3EflErlNaeWEaJAvd63c72f+xg03
+tNzfHbJn3ypYd/zBlJfJoNgdGnCnu9LA6vFTcCGP+1BV388bhWMJ5awJWnAFzPem
+uWstEEmwBDgq2aI3iXBUWaGesondCfjymloBrz316VTh08rR+9K+ee/6BRtdkn8n
+adsNb5A1rnC4Capmejxd4IEdUVBY1QojpRMF3278y9emZ3HTRt1e0E2QbhUTLxf+
+uIn5hUvSTRvob74r8ZB17wkqOdhZBuPAw2L2VsnN0UodqYVxKNrgJzz6exv0kgDI
+N56Hdhsi5IkCMwQTAQgAHRYhBCBpHfzCyYxHlSmE7gABjCI4GnWUBQJa25y/AAoJ
+EAABjCI4GnWUAp8P/0ALQ++GJyId44CGFpA92MqAGaUNdqVyRESqLa+aRNHlYYuD
+c5EjZWhUx3SYjbmhsVMHHzzmBp0wBVjxG9j/j2jkqnZUJjMwpzHdltxS7NwzyNJD
+9T1EEzA6yV8G+bg7MHYDczNKtBMuhBs5WeqeZ2TuaVOdHouylM+exsA58KzPF6As
+mPFkdQJo2jjG7u6EwbSgfslda9RISkYaxzMpNjJvLe8FJbnl3EctUP0uK232WWTi
+BJUg/jHqOvYuxnj287qDyQ8csYIZFC0SOdzmoZbE1BtX63joHiiIoPpjUsoTsS1G
+DzotmyYNAt/lKJW/pIuPzffUwvDM4M5HJxZlCBVWWo3D92lNGkvtrNCZ5EktgjmJ
+6ycFPNPKgcSJOnwZNSnRuICW3eSYiWBAw8Pm/i/GVvU7leXrv4M+IyOXg8sSm9vH
+sD+1I5MxJfg7tVSw05/sOJHr/pLa5T6GO0BT3iPWk5T0+/DLWASKBFtObFy5GhBv
+SFtixWv30xlSl4SU/0NEcQ7anDYZw9St1Z/7RP3vqPw4clK1G7SMsMJNXoaAnAAX
+YAa+7HVVuWJe02lO6pFRhkjXW7OEkQ/dn3g1JvkofeOhIJJoDPFIoIWoiVr3yiWl
+BUp9S9jOLxXmv7yv7ZGlBOqw2TR5PBaW2NV8NCWHAxZKYssl5dRLYjiKkPXHiQJW
+BBMBAgBAAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AWIQQ85GRVioT9xp20
+DPsJCxGZPZrrtQUCWfDCoQUJBvUujQAKCRAJCxGZPZrrtTTeD/9mRSNchhQibsk+
+vrXAlphebmBsfhrjdvpwiZEI2SdVZnOUW7iqMUIdABAirkSOcRLmB8bkQx/jBdLx
+9Nnoy8FuCgFderhsAX4SWyGqi7sv6vX8ZMmqEgRagmC3X5/HaYWgbgNSFRd1V5yg
+t/s3cODWN1Ak8NW3vaOzVsdKpM47XlzSGeStX2dTIQTpLc5POEqe0GKl/d79RxAu
+KrcBUaIK30c2ZplJjYOdBKfUQUQYwRRnUMu0CLnIkGJoio8wRpkJAgZmZ/pv2TOQ
+UEEZsydb67oIGKu64ir6j1qs6n6knSZh21LSrzm2v/45Dm7EBw9TmTH8krpLSgwR
+/loP4rz5tay5WjVPpvrNS2KnpGAWEdfyvEUA8U4JdyiGMWRiqadjABp9zQVfF4nW
+D4ElsQg/OidA31kFJKpGuFvV4usS+3ceyi8lUG3sPG0RPBW7S5eXrzpNIQe8yG4+
+aEoGhfre9DOG7dIs/iJymZQFfBUPiL+mEm84NxyGutu5/43M2St31+OHHohBE/DK
+XcH9qwp2PwDzMMzI53N/v1ktYS8EQUUKRWTPZ2z8EafN0sewxM7n8DMN5ftG2txb
+QhKeg2aNeB/R7Unk8ODh7faVyeiTBPAc65LDbrTMmW8nclOHLs+gGvsDmRtvKzk1
+sh9t42buP63UPbvnNvk6Ss6G8ZBGW4h1BBMWCgAdFiEE3JOIpbQA77MsbCBx4ffv
+gU+SoQ4FAlvHdXsACgkQ4ffvgU+SoQ5EuAD6AmC4dV2EoGMXKctKuL2B0Y7Ptwd2
+x3pL+JR/onnX7DgA/iWFMhBAp/iw9RZrV9pYtzPKPe+k4okWLP+xZ4C9qm0GiQJW
+BBMBAgBAAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AWIQQ85GRVioT9xp20
+DPsJCxGZPZrrtQUCWsXGiQUJB6KldQAKCRAJCxGZPZrrtfQCD/9l+i+0MWXPypa7
+2lU4owqoAvoOwBCnL61yJNR0b+aYpR00ia0JfZuLcSvj68p71QSeNa75sihIfT0t
+v1eDbYPIdUiFwxq9SIKrArJGeHzGOQOXlCcMPlJ74HXuvlsBsf9sAagrkBNyHcOr
+mEl1F+KYOV3m7m2m5WWDKXYNbH4fnrM/WqfBZF8X147DxDqdgvKkQ3eDXAHOJpV5
+8i7GUofSPsQGQRnhcIKEeapiiqZwTer5A7W0nI0Cc0zVODFdmXbo5OPBUJgPvvH2
+7WYhGcihl+zo53RLX2Qdvu5ovj2Kv7nLIpe3RN7LJ32VTpKhsVE4CxB71Q+ad2wC
+dBliOxhzWTyaSkFXS97Cz9Ld9AZlzybGHXkHea57GcXyLm6qEPhwRch7Ll4i/mkF
+UG0/pWljPNbAhjFgdq2ipAw42B4v1Ti4Q1ZrtucQ39Kkc7u88qd3N3vRnk2IrQ8T
+pmPCaJLeUCfu7rWA8czS/I30o9Omjv96NOpXEDHIApZ1ojNBQFDG+erRZORfcMqc
+0fk2ONIJZEHI/+G19UkkrTF7mISjQ3d39b3DQfwDLaDjhNT/iz+KesWkv8BW3s72
+mJ250ZxcHzXakaNCHHKiJ6B46jdJDD8VZmwgyrk5pdT0p3ujeccBJKJHef9TO433
+l6eefmjd77LT/p3XmFLt81A5yGPrZbkCDQRT6OIQARAAz1g6++SVx6RB4ZqZCdgO
+r7kXVSV51YKW3ETqK6Wq3pnqNBvv8zy0+8LBAVYewuhiOhGlUI0HSjT0aVuBTSod
+N64mpWc96E2SwiRl48iZcIMyNTc6dAShOaeNn48O2O73cH14jUsbQAnjtuazKYfl
+26ulqD1oiH+9idRD9HJHCegv9AlJMeaPH3z+xjO6yLA7HcVU3S1aJYXtwZgNttxS
+kGZToNgmbLXkU3a30wfdAte3/MNCrXn2DfJ27bZwNfnQSmOcCleV+x5MrEn9AloD
+3fYV/jP1umC7R1p5sbNuOlsTeX8qJXeWbIr1cb8gRhajFhCpcO6PN4arUJ6Qkolb
+jY6lRzxLgicmDvMbg3IN2yvk+139E9ypift1Zu4KG5abuqudLoRe/0/upt8Rgrqr
+BJDODLVuBqhCAGTg3/WHCm3uzsHSiqq54UbOe2PSRfGWLDTA2nWKludTSsobtjsP
+6ZE++b2nPuEVXTROK8KdwkyBjWF5EjOgTLPG0QIU2GGk/s0V6+dOwmggYwJuCQnm
+AF8Rn0GU4F/kocHJmSDmK294r0wUsyKPM8hqeo1EwilN7UpyNyk9YjbMKMyOMzzR
+inmlihHAGYtw8xgfaUkw1WahWtfIT58dj1Kssx8StgdpfRrxJ25XGvG9S4Ke11eX
+pozJcg+TZwLQxcgWnjEJRVcAEQEAAYkCHwQYAQIACQUCU+jiEAIbDAAKCRAJCxGZ
+PZrrtQ+ID/97m2sq1Txn9Nsl8oK+oxJ5w2K9KbeUmaptjvtSmyGYXywwMYpxFbe5
+ioU639KCfPNTT8wxaJNRdAHdNHCo5joUwIbOZDdMAMVU5Zp2LGdjXgwRvFC1oenx
+R79I0aJMT1vHbfRgX61Fu2tv8BT2eLc/qmV+e3neSZH3EBXZgEGnGEIWgPc95fEr
+07w3tq0EUritV3+oYhgVg+dHABiEpiigSIPRT+3SWKtJinpMlp7wrW7seGe8fygU
+pPVB/a8Jncpt+eKuoquiM/DF/UHOgWGCWk62hGOd4n67fuxsuyD9Ejx1oD784Rw4
+FYHLJzVCIDwjeq9g9hLizM6Y3WA1kHG8o5ZwymxpIquA8zA5mg8f3nA21JJIk8zh
+r0eirUEmK3mq17n0NInMtSPGtwMS0MmWjdObGn/fWdRDrMUpg/xbJbt1AwUHvGYe
+V1DEm7WauV6VZMHz9dmx/UqLHg4A2yCssyqPx8q9NWFEtra+3aXrfUW+WBpPAWJZ
+i1EQSBpz8i1cynexOOr4wnt7jHlVsag4b8Dbg8vVT33Kh5YMcemwIVgB+lr1vlmg
+yw2UZ85wWgRlwzcoNnqdX88YBG7EwOsLOnj7gmP2GBaNTvNvwKZL+9+fZoScQVoq
+V1fnE2X7Z4O562lqF2emRjBYn+8g/BrdPTD9OUAMufM+0SDlZujhrJkCDQRT6OIQ
+ARAAumnTGj6cKSYqhvxoJNGKDnVHkV+Rjjqc0dlwP0qBWbtF1roYCSJwAEUSiOiv
+SDt3hwliI3ir2Ppcq8ZjRZV8dGOzh/wVSvRni+uX+/fekdnQqkroY+SuncVM6hUh
+56Ug5DN7eL/C+71PFypVvfQ0wSU+OUSsiFZUo+2Hup7AsazCEUoWxHheZLFwIoQX
+1xsVuZqM47wJSQk0D6Fzxm/o0d5fAkWOCYsr6lPSLMwb5EW8sAtTELAqBDhnCbCm
+x50osvnbekGmSrwq+aksHBKis3zQBCkchqLkE8MAGpOxb2V8PBnFS1PzGBpUNSEg
+M8HWMRgiDOJf+FciN/HOk27KSBE0e9dyDLF0AJ+R0saNUmVntsLkKgYIxhEu1KaY
+c1eAyKQU8L9GfKFxvS3JcZCzP53ZLzLOEV+Gj6kT6ydK2iemsH09w2wMCDIvYqqm
+2kTyHlSoFLZQeCBfC4PJMst0LoppmY0WSQ/ZfDAmM58GtZ/y20IuFcNGL23ekf+m
+r2i6sp1OSu0poi2C2psznQyUdJBRBg+pwerY4Ov5FfNb1edKn/FyIeMBKVtB7u1P
+qtSAQOG2mlUW9ia1dILDHBNspukQPeDgIvGtUPtHWeFe9Mr8LAw0edskZoe8N3vk
+xBALFywNn63AaNEHgXbbUpoPI8igJ/F8J8wCnOl61YPhiX0AEQEAAbQfTHVkb3Zp
+YyBDb3VydMOocyA8bHVkb0BnbnUub3JnPokCOQQTAQIAIwUCU+jiEAIbAwcLCQgH
+AwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEAkLEZk9muu1AAUQAJVggkL1OO5xusj3
+/WVlWEFDKhuXyIVog+nWEO2h057xtpRmjuQLYn9KQcOMaFf6QOK3jZWHuZuDVnNx
+NVrcCB58I8AWb+oTARjukhiknJPo4hTf4JgjfXl1Qpa12OXQ349lUCdxaeEa4WEB
+nGBhyh+MmWrh0poQbBbjuafpU/Fm1s+2FoMxcIvkAW7f0evLhofD44k4bBeiX8xF
+BCLLy4IPeK857mX5FnLJUfSmpDqwmdJZkZ74EFaVaOE6F0QDPqrK3ZvEAqmyQfNC
+mFWXcwtNNotsKyGHJbUeyhfr8MkteY29QR3y0uLtFw8NZvvymjuPdJvU94SrqtVU
+MPumCgbF/FfXddydoPUEtt936344LIpkqa6Z24kOEDHlrIxV4gG4nCvP0Bbp5zTO
+wLoimEv1S7F11zZlG4L8UZtVBkS2j1x2UQH+E3jgbZ4GHMqv5hc84CRu0coPqizo
+noB/0Ta5MZTkVLiV33RiaILoqO6jQi2jnVNAF2qKxgVi28VrEELhqztl5Q36RTf7
+NmmNkrevwCw1YLsTLCJObRy0BG6ZNkeQ7nz0bkpwn3oX6D+9ufsFMJzaS6VTWqzo
+zGgsAP9J60CtxFYxDuL/VxK7df0wxWcXxyI5Wh5OOTzZnn5TpNrBSIXxEiCnmCKL
+NXM+4WP/+J3oNcTnSDAIIN+5uAD5tDNMdWRvdmljIENvdXJ0w6hzIChJbnJpYSkg
+PGx1ZG92aWMuY291cnRlc0BpbnJpYS5mcj6JAjkEEwECACMFAlPo4nMCGwMHCwkI
+BwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRAJCxGZPZrrtcC3D/0RMlFbAmmrcKT0
+8RleUIKVYkC0KEjOvkoN4qVbovA+M8opgqBgHJBZozaDN9khf8zQuf1b4Oz9aBFA
+Y66H30CghFVbki98+vjJnoDJt310raY3O2ogMaQKlcNqOJOJWg/8MziFZMd79H5n
+RRQoTA7fc1ZT2HzxpvT5Vd+JyQcAK6PPPeppHXayU/zuv/Fne9QwmmRbrHW6b7JL
+gF2gXmGsKkm9vRX8EOhz3I9Pvzqslc6MZBJqTLYFYuyLHNwVjTjkpopYDpNplhHA
+s5Wwmex6lAe61ZkKw5b4MQ3MlPvZkcN7RfeFQlvewrlEQ3rs/rHsNGMGoaG4MwZh
+OHZsIEKFVj3tyg2A46WErhMO1D5okoGXaR6F9ox0SdKFh367iW0yf8YFBXwsNY6V
+QPnbeILhY5RWwx/qjmu5AGavdLXVlmVlHZlqNMJjEvH+3iXVbR+rrwCEk1Wn6l2O
+HFlo/At8bjvJxX8FmRB4cK9ka5SCX6SnVz0krlKPIqf6CgPhT+GZBvqPiD9yJ733
+n8phpaAT9rXsHYQ7BZwgy8cEx9urancoS5FIGtkrqMIyOh61sgg6lrdXNYw19i/I
+U8eWIQHkc3RP+wKY2IG4a5EDjuAwGqxKVKHR5nXnDWauR6O27ikNgJch/f9JbzVJ
+JPpbp30GoydetGDe1SDlYQo9J7ttCbQjTHVkb3ZpYyBDb3VydMOocyA8bHVkb0Bj
+aGJvdWliLm9yZz6JAjkEEwECACMFAlPo4oQCGwMHCwkIBwMCAQYVCAIJCgsEFgID
+AQIeAQIXgAAKCRAJCxGZPZrrtQX9D/0Yk1rDEfKfgdiPCdxQ7UmYeE+IfsPuWLNl
+qafBmLFTYEgtSzDqwNW8Hvl/ON7jOVVBwObvhy/B0sJ3V0V40xH0xz8Sdn3Y7Jwq
+NglGWQTBF+OqbiWEqHpp88gRgrw203WQnj+KovjhdukouJVnwOiNU5v+ZTgFFAmO
+aAqgzJEaMBIqv95gRSisWbMFF6y95BFdzEM0k9mQB78ERRHhiyA2FZfLMQC5t3dg
+99QnMWCfF3RmRDlWbHGjYZcdeNTJyNWg3Ivg/sxkoj2ukQ02hKycgvvhQb3pyQOs
+GUrHU+eDgZVQJhBFeAh5QMHbxLCZ7RdLsoUN8z2LrOydzU8Ccr4nYfrzpcmf6nTU
+Kg3gLWEKhgHyjf+8UBBN+J1fExs5b7v7uSSNlUvvib+DQjSdMYcAm93dPi36nXWe
+qyiGitzMD04tMTZWcIHZVC8n2f2XI6Y1QpSONXvil6DyBl8re1bMcvvFUUB+4AcE
+1rBJZ6FkRyltbs0TQXygPXf3AM6SsdTWN6diieN/CqZTUQIt/LM3gHghM/OB7Zb/
+Cf17jnuIw5o0WDrEwvIxFE75gjLKEKhPQCZb5AcfG7ZxcBjI3EDb+tk1UQwTvLcP
+tEF0yhs+rW3AeNQjqlk+UTpF2w4LjOanE47HPjFMrViGmrh4jspxtg2O+OqfykSr
+fpcbUmoXi7kCDQRT6OIQARAAz1g6++SVx6RB4ZqZCdgOr7kXVSV51YKW3ETqK6Wq
+3pnqNBvv8zy0+8LBAVYewuhiOhGlUI0HSjT0aVuBTSodN64mpWc96E2SwiRl48iZ
+cIMyNTc6dAShOaeNn48O2O73cH14jUsbQAnjtuazKYfl26ulqD1oiH+9idRD9HJH
+Cegv9AlJMeaPH3z+xjO6yLA7HcVU3S1aJYXtwZgNttxSkGZToNgmbLXkU3a30wfd
+Ate3/MNCrXn2DfJ27bZwNfnQSmOcCleV+x5MrEn9AloD3fYV/jP1umC7R1p5sbNu
+OlsTeX8qJXeWbIr1cb8gRhajFhCpcO6PN4arUJ6QkolbjY6lRzxLgicmDvMbg3IN
+2yvk+139E9ypift1Zu4KG5abuqudLoRe/0/upt8RgrqrBJDODLVuBqhCAGTg3/WH
+Cm3uzsHSiqq54UbOe2PSRfGWLDTA2nWKludTSsobtjsP6ZE++b2nPuEVXTROK8Kd
+wkyBjWF5EjOgTLPG0QIU2GGk/s0V6+dOwmggYwJuCQnmAF8Rn0GU4F/kocHJmSDm
+K294r0wUsyKPM8hqeo1EwilN7UpyNyk9YjbMKMyOMzzRinmlihHAGYtw8xgfaUkw
+1WahWtfIT58dj1Kssx8StgdpfRrxJ25XGvG9S4Ke11eXpozJcg+TZwLQxcgWnjEJ
+RVcAEQEAAYkCHwQYAQIACQUCU+jiEAIbDAAKCRAJCxGZPZrrtQ+ID/97m2sq1Txn
+9Nsl8oK+oxJ5w2K9KbeUmaptjvtSmyGYXywwMYpxFbe5ioU639KCfPNTT8wxaJNR
+dAHdNHCo5joUwIbOZDdMAMVU5Zp2LGdjXgwRvFC1oenxR79I0aJMT1vHbfRgX61F
+u2tv8BT2eLc/qmV+e3neSZH3EBXZgEGnGEIWgPc95fEr07w3tq0EUritV3+oYhgV
+g+dHABiEpiigSIPRT+3SWKtJinpMlp7wrW7seGe8fygUpPVB/a8Jncpt+eKuoqui
+M/DF/UHOgWGCWk62hGOd4n67fuxsuyD9Ejx1oD784Rw4FYHLJzVCIDwjeq9g9hLi
+zM6Y3WA1kHG8o5ZwymxpIquA8zA5mg8f3nA21JJIk8zhr0eirUEmK3mq17n0NInM
+tSPGtwMS0MmWjdObGn/fWdRDrMUpg/xbJbt1AwUHvGYeV1DEm7WauV6VZMHz9dmx
+/UqLHg4A2yCssyqPx8q9NWFEtra+3aXrfUW+WBpPAWJZi1EQSBpz8i1cynexOOr4
+wnt7jHlVsag4b8Dbg8vVT33Kh5YMcemwIVgB+lr1vlmgyw2UZ85wWgRlwzcoNnqd
+X88YBG7EwOsLOnj7gmP2GBaNTvNvwKZL+9+fZoScQVoqV1fnE2X7Z4O562lqF2em
+RjBYn+8g/BrdPTD9OUAMufM+0SDlZujhrA==
+=+/gj
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/tests/dsa.key b/tests/dsa.key
new file mode 100644
index 0000000000..4727975c63
--- /dev/null
+++ b/tests/dsa.key
@@ -0,0 +1,25 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQMuBF4SQfARCACb/C7qcwKhOdaej1z8dK02iMJlw/C868VEeAuSvXHBE5OULm1+
+SlwPCgsLIhe8AIsW0F8zgWlNdOKbcmU1NdzUfo0PIRA8ASerZ3EFd7cloRjk1X3c
+XbklFQ8D37thgFXYBOkkjzKwCvc+ebcQQsRSvJLhQODSRzknIQBYLoYjKh8skEwY
+uK+rFs7fEHTrCwnriF7QCZnGqoScS56MrgEtHHwBDpKt8CruSekEHAfI5INMhb6R
+fdVNTj7TL9gCOlYA6IPK6pfYKjghQ79IGMcGnaEPUdiEuAbc1AVQtfRi4e/IbbN6
+/CDmfSQ/fCYm9hQ5sAMzUCqDreqqYrpEYmVHAQC3uXiV7qjDe2vlfz4GNSFOqvHC
+xHp9UYWE6IQFzVutMwgAgldl3Ql6zxIoiU76bXRDP+W+g67uW1Fnd6ltOVYb4rxp
+wIRlQpwZeNPzFeZHZ1mJA1rvdD3mORnnnIIwW9Cr5Kn/e63PBJJcYJZZ6bnWYh5O
+1MDzyn0CYu4btP0tj7PNxKfxvIxDX3sqfkBFsGgquwa/AwWrdWXD99//PK0iNGN4
+WewwXmC2S2SmcuHL0nB4eV6uuQZOK6u3/end1/FqAMEJAW4jC7x7UvbeFs1dwiJv
+psjluTpP1QDh7ySDfBOANlxOxAM6oCfvUqZ+pifNFw7t3p1eiK3wtjB8fer7bZg3
+OT4Pl4gImmCjXs0cse0+FLpUA/gzPHxYR/rUyD/nQwf8CfFRGu+bGFju3YHbZ2T0
+cHF/9c3sCdQU7nVnYleySnv1OMDSYoZ7geqgC2q0pnHeezII7hcJB8tKx3BV+J7A
+WYUL31K4gybK9VkFQC8h+BzPjnzjXEHgL5GY621cPSLJzOyFhY9lKrWUD/DVGXtu
+xFjissXG2h6jgf+BAqDCKFVYyu/7TQuDA/FKPhx/8Hn9LX4A3CTFswnsRtABGt6t
+U4yUfQWhnDqLDYWrjvXOEHbMQuBOAU3rPpTLLyQzyKVsQZlMBR5UrSXXY1lN76yl
+J0NAyeOmgvDT75QAVHPxp9lidRTQJHXU1Ah+N/fzPYamKmgheCXZE8r5cPY3Mkvp
+w7QbPGx1ZG8rdGVzdC1kc2FAY2hib3VpYi5vcmc+iJYEExEIAD4WIQQohKmAQiMw
+pPM92X9YeRgEe+i9LAUCXhJB8AIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIe
+AQIXgAAKCRBYeRgEe+i9LOyvAP0a2DIMruGZSHeWcQaNiRWb2/UEq4ClRw67rA7f
+39sD5AD+PKeovYJkTSV+F00QKHibMhoGurxABnEUeqmetGITVSU=
+=YZip
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/tests/ed25519.key b/tests/ed25519.key
new file mode 100644
index 0000000000..f6bf906783
--- /dev/null
+++ b/tests/ed25519.key
@@ -0,0 +1,10 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEXqNaoBYJKwYBBAHaRw8BAQdArviKtelb4g0I3zx9xyDS40Oz8i1/LRXqppG6
+b23Hdim0KEVkIFR3by1GaWZ0eSA8bHVkbyt0ZXN0LWVjY0BjaGJvdWliLm9yZz6I
+lgQTFggAPhYhBETTHiGvcTj5tjIoCncfScv6rgctBQJeo1qgAhsDBQkDwmcABQsJ
+CAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEHcfScv6rgctq4MA/1R9G0roEwrHwmTd
+DHxt211eLqupwXE0Z7xY2FH6DHk9AP4owEefBU7jQprSAzBS+c6gdS3SCCKKqAh6
+ToZ4LmbKAw==
+=FXMK
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/tests/ed25519.sec b/tests/ed25519.sec
new file mode 100644
index 0000000000..068738dfab
--- /dev/null
+++ b/tests/ed25519.sec
@@ -0,0 +1,10 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lFgEXqNaoBYJKwYBBAHaRw8BAQdArviKtelb4g0I3zx9xyDS40Oz8i1/LRXqppG6
+b23HdikAAQDGgjcUcvqR+nGYcf5UHzy9xlO/dBZX4f9QV1ILDIGt0hAYtChFZCBU
+d28tRmlmdHkgPGx1ZG8rdGVzdC1lY2NAY2hib3VpYi5vcmc+iJYEExYIAD4WIQRE
+0x4hr3E4+bYyKAp3H0nL+q4HLQUCXqNaoAIbAwUJA8JnAAULCQgHAgYVCgkICwIE
+FgIDAQIeAQIXgAAKCRB3H0nL+q4HLauDAP9UfRtK6BMKx8Jk3Qx8bdtdXi6rqcFx
+NGe8WNhR+gx5PQD+KMBHnwVO40Ka0gMwUvnOoHUt0ggiiqgIek6GeC5mygM=
+=VjjI
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/tests/openpgp.scm b/tests/openpgp.scm
new file mode 100644
index 0000000000..8a3c7bbeb7
--- /dev/null
+++ b/tests/openpgp.scm
@@ -0,0 +1,248 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Ludovic Courtès 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (tests-openpgp)
+  #:use-module (guix openpgp)
+  #:use-module (gcrypt hash)
+  #:use-module (gcrypt pk-crypto)
+  #:use-module (ice-9 binary-ports)
+  #:use-module (ice-9 match)
+  #:use-module (rnrs bytevectors)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-11)
+  #:use-module (srfi srfi-64)
+  #:use-module (srfi srfi-71))
+
+(define %radix-64-sample
+  ;; Example of Radix-64 encoding from Section 6.6 of RFC4880.
+  "\
+-----BEGIN PGP MESSAGE-----
+Version: OpenPrivacy 0.99
+
+yDgBO22WxBHv7O8X7O/jygAEzol56iUKiXmV+XmpCtmpqQUKiQrFqclFqUDBovzS
+vBSFjNSiVHsuAA==
+=njUN
+-----END PGP MESSAGE-----\n")
+
+(define %radix-64-sample/crc-mismatch
+  ;; This time with a wrong CRC24 value.
+  "\
+-----BEGIN PGP MESSAGE-----
+
+yDgBO22WxBHv7O8X7O/jygAEzol56iUKiXmV+XmpCtmpqQUKiQrFqclFqUDBovzS
+vBSFjNSiVHsuAA==
+=AAAA
+-----END PGP MESSAGE-----\n")
+
+(define %civodul-fingerprint
+  "3CE4 6455 8A84 FDC6 9DB4  0CFB 090B 1199 3D9A EBB5")
+
+(define %civodul-key-id #x090B11993D9AEBB5)       ;civodul.key
+
+;; Test keys.  They were generated in a container along these lines:
+;;    guix environment -CP --ad-hoc gnupg pinentry
+;; then, within the container:
+;;    mkdir ~/.gnupg
+;;    echo pinentry-program ~/.guix-profile/bin/pinentry-tty > ~/.gnupg/gpg-agent.conf
+;;    gpg --quick-gen-key '' rsa
+;; or similar.
+(define %rsa-key-id      #xAE25DA2A70DEED59)      ;rsa.key
+(define %dsa-key-id      #x587918047BE8BD2C)      ;dsa.key
+(define %ed25519-key-id  #x771F49CBFAAE072D)      ;ed25519.key
+
+
+;;; The following are detached signatures created commands like:
+;;;    echo 'Hello!' | gpg -sba --digest-algo sha512
+;;; They are detached (no PACKET-ONE-PASS-SIGNATURE) and uncompressed.
+
+(define %hello-signature/rsa
+  ;; Signature of the ASCII string "Hello!\n".
+  "\
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEOF+Gz8hrZlpcFl5rriXaKnDe7VkFAl4SRF0ACgkQriXaKnDe
+7VlIyQf/TU5rGUK42/C1ULoWvvm25Mjwh6xxoPPkuBxvos8bE6yKr/vJZePU3aSE
+mjbVFcO7DioxHMqLd49j803bUtdllJVU18ex9MkKbKjapkgEGkJsuTTzqyONprgk
+7xtZGBWuxkP1M6hJICJkA3Ys+sTdKalux/pzr5OWAe+gxytTF/vr/EyJzdmBxbJv
+/fhd1SeVIXSw4c5gf2Wcvcgfy4N5CiLaUb7j4646KBTvDvmUMcDZ+vmKqC/XdQeQ
+PrjArGKt40ErVd98fwvNHZnw7VQMx0A3nL3joL5g7/RckDOUb4mqKoqLsLd0wPHP
+y32DiDUY9s3sy5OMzX4Y49em8vxvlg==
+=ASEm
+-----END PGP SIGNATURE-----")
+
+
+(define %hello-signature/dsa
+  "\
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABEIAB0WIQQohKmAQiMwpPM92X9YeRgEe+i9LAUCXhJFpQAKCRBYeRgEe+i9
+LDAaAQC0lXPQepvZBANAUtRLMZuOwL9NQPkfhIwUXtLEBBzyFQD/So8DcybXpRBi
+JKOiyAQQjMs/GJ6qMEQpRAhyyJRAock=
+=iAEc
+-----END PGP SIGNATURE-----")
+
+
+(define %hello-signature/ed25519/sha256           ;digest-algo: sha256
+  "\
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYIAB0WIQRE0x4hr3E4+bYyKAp3H0nL+q4HLQUCXqRADAAKCRB3H0nL+q4H
+LUImAP9/foaSjPFC/MSr52LNV5ROSL9haea4jPpUP+N6ViFGowEA+AE/xpXPIqsz
+R6CdxMevURuqUpqQ7rHeiMmdUepeewU=
+=tLXy
+-----END PGP SIGNATURE-----")
+
+(define %hello-signature/ed25519/sha512           ;digest-algo: sha512
+  "\
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYKAB0WIQRE0x4hr3E4+bYyKAp3H0nL+q4HLQUCXqRAGgAKCRB3H0nL+q4H
+LTeKAP0S8LiiosJXOARlYNdhfGw9j26lHrbwJh5CORGlaqqIJAEAoMYcmtNa2b6O
+inlEwB/KQM88O9RwA8xH7X5a0rodOw4=
+=68r/
+-----END PGP SIGNATURE-----")
+
+(define %hello-signature/ed25519/sha1             ;digest-algo: sha1
+  "\
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYCAB0WIQRE0x4hr3E4+bYyKAp3H0nL+q4HLQUCXqRALQAKCRB3H0nL+q4H
+LdhEAQCfkdYhIVRa43oTNw9EL/TDFGQjXSHNRFVU0ktjkWbkQwEAjIXhvj2sqy79
+Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
+=AE4G
+-----END PGP SIGNATURE-----")
+
+
+(test-begin "openpgp")
+
+(test-equal "read-radix-64"
+  '(#t "PGP MESSAGE")
+  (let-values (((data type)
+                (call-with-input-string %radix-64-sample read-radix-64)))
+    (list (bytevector? data) type)))
+
+(test-equal "read-radix-64, CRC mismatch"
+  '(#f "PGP MESSAGE")
+  (call-with-values
+      (lambda ()
+        (call-with-input-string %radix-64-sample/crc-mismatch
+          read-radix-64))
+    list))
+
+(test-assert "get-openpgp-keyring"
+  (let* ((key (search-path %load-path "tests/civodul.key"))
+         (keyring (get-openpgp-keyring
+                   (open-bytevector-input-port
+                    (call-with-input-file key read-radix-64)))))
+    (match (lookup-key-by-id keyring %civodul-key-id)
+      (((? openpgp-public-key? primary) packets ...)
+       (and (= (openpgp-public-key-id primary) %civodul-key-id)
+            (not (openpgp-public-key-subkey? primary))
+            (string=? (openpgp-format-fingerprint
+                       (openpgp-public-key-fingerprint primary))
+                      %civodul-fingerprint)
+            (string=? (openpgp-user-id-value (find openpgp-user-id? packets))
+                      "Ludovic Courtès "))))))
+
+(test-equal "get-openpgp-detached-signature/ascii"
+  (list `(,%dsa-key-id dsa sha256)
+        `(,%rsa-key-id rsa sha256)
+        `(,%ed25519-key-id eddsa sha256)
+        `(,%ed25519-key-id eddsa sha512)
+        `(,%ed25519-key-id eddsa sha1))
+  (map (lambda (str)
+         (let ((signature (get-openpgp-detached-signature/ascii
+                           (open-input-string str))))
+           (list (openpgp-signature-issuer signature)
+                 (openpgp-signature-public-key-algorithm signature)
+                 (openpgp-signature-hash-algorithm signature))))
+       (list %hello-signature/dsa
+             %hello-signature/rsa
+             %hello-signature/ed25519/sha256
+             %hello-signature/ed25519/sha512
+             %hello-signature/ed25519/sha1)))
+
+(test-equal "verify-openpgp-signature, missing key"
+  `(missing-key ,%rsa-key-id)
+  (let* ((keyring   (get-openpgp-keyring (%make-void-port "r")))
+         (signature (get-openpgp-packet
+                     (open-bytevector-input-port
+                      (call-with-input-string %hello-signature/rsa
+                        read-radix-64)))))
+    (let-values (((status key)
+                  (verify-openpgp-signature signature keyring
+                                            (open-input-string "Hello!\n"))))
+      (list status key))))
+
+(test-equal "verify-openpgp-signature, good signatures"
+  `((good-signature ,%rsa-key-id)
+    (good-signature ,%dsa-key-id)
+    (good-signature ,%ed25519-key-id)
+    (good-signature ,%ed25519-key-id)
+    (good-signature ,%ed25519-key-id))
+  (map (lambda (key signature)
+         (let* ((key       (search-path %load-path key))
+                (keyring   (get-openpgp-keyring
+                            (open-bytevector-input-port
+                             (call-with-input-file key read-radix-64))))
+                (signature (get-openpgp-packet
+                            (open-bytevector-input-port
+                             (call-with-input-string signature
+                               read-radix-64)))))
+           (let-values (((status key)
+                         (verify-openpgp-signature signature keyring
+                                                   (open-input-string "Hello!\n"))))
+             (list status (openpgp-public-key-id key)))))
+       (list "tests/rsa.key" "tests/dsa.key"
+             "tests/ed25519.key" "tests/ed25519.key" "tests/ed25519.key")
+       (list %hello-signature/rsa %hello-signature/dsa
+             %hello-signature/ed25519/sha256
+             %hello-signature/ed25519/sha512
+             %hello-signature/ed25519/sha1)))
+
+(test-equal "verify-openpgp-signature, bad signature"
+  `((bad-signature ,%rsa-key-id)
+    (bad-signature ,%dsa-key-id)
+    (bad-signature ,%ed25519-key-id)
+    (bad-signature ,%ed25519-key-id)
+    (bad-signature ,%ed25519-key-id))
+  (let ((keyring (fold (lambda (key keyring)
+                         (let ((key (search-path %load-path key)))
+                           (get-openpgp-keyring
+                            (open-bytevector-input-port
+                             (call-with-input-file key read-radix-64))
+                            keyring)))
+                       %empty-keyring
+                       '("tests/rsa.key" "tests/dsa.key"
+                         "tests/ed25519.key" "tests/ed25519.key"
+                         "tests/ed25519.key"))))
+    (map (lambda (signature)
+           (let ((signature (get-openpgp-packet
+                             (open-bytevector-input-port
+                              (call-with-input-string signature
+                                read-radix-64)))))
+             (let-values (((status key)
+                           (verify-openpgp-signature signature keyring
+                                                     (open-input-string "What?!"))))
+               (list status (openpgp-public-key-id key)))))
+         (list %hello-signature/rsa %hello-signature/dsa
+               %hello-signature/ed25519/sha256
+               %hello-signature/ed25519/sha512
+               %hello-signature/ed25519/sha1))))
+
+(test-end "openpgp")
diff --git a/tests/rsa.key b/tests/rsa.key
new file mode 100644
index 0000000000..0ef9145ef0
--- /dev/null
+++ b/tests/rsa.key
@@ -0,0 +1,18 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF4SRCYBCAC6eVyonmey9Lsa1QpWIcumkExZWmAsTNhNNrdhasU4rC0DGRnw
+lJtey4h/5NRcGmur4cwwnHUyh9RhQOZgc4MkWfUECfgY98dhjq6+wSavSMwYJyKM
+7yGuJgKQBBhdkfjYONP4eHbucifGNhsNRSURUREVCarOYa1AhmH4cmTPe7cUA8mH
+EfQ2SOsmAUBNjn/Ba2Us8ydiZWGpJXYdzsXQ3HZl1vV2UtPEepPjAkJZa/7hm06z
+9WrlOUxoro/R2R7COMWpzuhmY1Ak2VB4H6OMqPAEOk+/H5Pda1yCI9oRROawC24h
+4yZYTpcRKV0EQ4cd4Z/DKA4gJdjufyRrmk0fABEBAAG0GzxsdWRvK3Rlc3QtcnNh
+QGNoYm91aWIub3JnPokBVAQTAQgAPhYhBDhfhs/Ia2ZaXBZea64l2ipw3u1ZBQJe
+EkQmAhsDBQkDwmcABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEK4l2ipw3u1Z
+c70IAI+eBLJzXGXNlugNE5rl5YplrLQem9otL7OKIpR+ye3Wg/DRZvN9x+lvUftq
+rG0+wqxo/WQTy6ZLDUI83OY13zLXDKjRgPdqPYBAYxCY8CMayjDUv8axZVEfC7IX
+IYgqzZg0E0dfF3m9S+6WUfOYCS5qR2go7TxbrnDyhDiswd5r3TRX5U+asHm0iXTy
+Pmb0WY301mm1UPToOHSpweMuCw/n5as15o9CWeUJa/I0J6puM66ZRqGt8+7BSCu6
+ata0BYLBCUD8aqhgNQpcMAkTRUSr8LNgfgdxr2Ozr+FF39NXGfLihL18AQEvh3SI
+K/5YAnXV2oMRhOQttDJROOXByoY=
+=N6XF
+-----END PGP PUBLIC KEY BLOCK-----
-- 
cgit v1.2.3


From 4459c7859c286ab54fa3a9901c8a17591b04c516 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Sat, 25 Apr 2020 23:23:51 +0200
Subject: openpgp: Decode the issuer-fingerprint signature subpacket.

* guix/openpgp.scm (SUBPACKET-ISSUER-FINGERPRINT): New variable.
(openpgp-signature-issuer-fingerprint): New procedure.
(key-id-matches-fingerprint?): New procedure.
(get-signature): Look for the 'issuer and 'issuer-fingerprint
subpackets.  Ensure the issuer key ID matches the fingerprint when both
are available.
(parse-subpackets): Handle SUBPACKET-ISSUER-FINGERPRINT.
* tests/openpgp.scm (%rsa-key-fingerprint)
(%dsa-key-fingerprint, %ed25519-key-fingerprint): New variables.
* tests/openpgp.scm ("get-openpgp-detached-signature/ascii"): Check the
result of 'openpgp-signature-issuer-fingerprint'.
---
 guix/openpgp.scm  | 44 +++++++++++++++++++++++++++++++++++++++-----
 tests/openpgp.scm | 22 +++++++++++++++++-----
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/guix/openpgp.scm b/guix/openpgp.scm
index bfdbe4b61b..77a75373df 100644
--- a/guix/openpgp.scm
+++ b/guix/openpgp.scm
@@ -33,6 +33,7 @@
 
             openpgp-signature?
             openpgp-signature-issuer
+            openpgp-signature-issuer-fingerprint
             openpgp-signature-public-key-algorithm
             openpgp-signature-hash-algorithm
             openpgp-signature-creation-time
@@ -345,7 +346,6 @@ hexadecimal format for fingerprints."
   ;; 12 = Revocation Key
 
 (define SUBPACKET-ISSUER 16)
-;; TODO: hashed SUBPACKET-ISSUER-FINGERPRINT-V4
 (define SUBPACKET-NOTATION-DATA 20)
 (define SUBPACKET-PREFERRED-HASH-ALGORITHMS 21)
 (define SUBPACKET-PREFERRED-COMPRESSION-ALGORITHMS 22)
@@ -358,8 +358,8 @@ hexadecimal format for fingerprints."
 (define SUBPACKET-REASON-FOR-REVOCATION 29)
 (define SUBPACKET-FEATURES 30)
   ;; 31 = Signature Target
-
 (define SUBPACKET-EMBEDDED-SIGNATURE 32)
+(define SUBPACKET-ISSUER-FINGERPRINT 33)          ;defined in RFC4880bis
 
 (define SIGNATURE-BINARY #x00)
 (define SIGNATURE-TEXT #x01)
@@ -486,6 +486,13 @@ hexadecimal format for fingerprints."
         ;; XXX: is the issuer always in the unhashed subpackets?
         (else #f)))
 
+(define (openpgp-signature-issuer-fingerprint sig)
+  "When it's available, return the fingerprint, a bytevector, or the issuer of
+SIG.  Otherwise, return #f."
+  (or (assoc-ref (openpgp-signature-hashed-subpackets sig) 'issuer-fingerprint)
+      (assoc-ref (openpgp-signature-unhashed-subpackets sig)
+                 'issuer-fingerprint)))
+
 (define (openpgp-signature-creation-time sig)
   (cond ((assq 'signature-ctime (openpgp-signature-hashed-subpackets sig))
          => (lambda (x) (unixtime (cdr x))))
@@ -578,6 +585,14 @@ the issuer's OpenPGP public key extracted from KEYRING."
               (values 'missing-key issuer))))
       (values 'unsupported-signature sig)))
 
+(define (key-id-matches-fingerprint? key-id fingerprint)
+  "Return true if KEY-ID, a number, corresponds to the low 8 bytes of
+FINGERPRINT, a bytevector."
+  (let* ((len (bytevector-length fingerprint))
+         (low (make-bytevector 8)))
+    (bytevector-copy! fingerprint (- len 8) low 0 8)
+    (= (bytevector->uint low) key-id)))
+
 (define (get-signature p)
   (define (->hex n)
     (string-hex-pad (number->string n 16)))
@@ -662,14 +677,26 @@ the issuer's OpenPGP public key extracted from KEYRING."
                     ;; Errata ID: 2214.
                     (integers->bytevector u8 #x04
                                           u8 #xff
-                                          u32 (+ 6 subpacket-len)))))
+                                          u32 (+ 6 subpacket-len))))
+                  (unhashed-subpackets
+                   (parse-subpackets unhashed-subpackets))
+                  (hashed-subpackets (parse-subpackets hashed-subpackets))
+                  (subpackets        (append hashed-subpackets
+                                             unhashed-subpackets))
+                  (issuer-key-id     (assoc-ref subpackets 'issuer))
+                  (issuer            (assoc-ref subpackets
+                                                'issuer-fingerprint)))
+             (unless (or (not issuer) (not issuer-key-id)
+                         (key-id-matches-fingerprint? issuer-key-id issuer))
+               (error "issuer key id does not match fingerprint" issuer))
+
              (make-openpgp-signature version type
                                      (public-key-algorithm pkalg)
                                      (openpgp-hash-algorithm halg)
                                      hashl16
                                      append-data
-                                     (parse-subpackets hashed-subpackets)
-                                     (parse-subpackets unhashed-subpackets)
+                                     hashed-subpackets
+                                     unhashed-subpackets
                                      value)))))
       (else
        (print "Unsupported signature version: " version)
@@ -701,6 +728,13 @@ the issuer's OpenPGP public key extracted from KEYRING."
        ((= type SUBPACKET-ISSUER)
         (cons 'issuer
               (bytevector-u64-ref data 0 (endianness big))))
+       ((= type SUBPACKET-ISSUER-FINGERPRINT)     ;v4+ only, RFC4880bis
+        (cons 'issuer-fingerprint
+              (let* ((version     (bytevector-u8-ref data 0))
+                     (len         (match version (4 20) (5 32)) )
+                     (fingerprint (make-bytevector len)))
+                (bytevector-copy! data 1 fingerprint 0 len)
+                fingerprint)))
        ((= type SUBPACKET-NOTATION-DATA)
         (let ((p (open-bytevector-input-port data)))
           (let-values (((f1 nlen vlen)
diff --git a/tests/openpgp.scm b/tests/openpgp.scm
index 8a3c7bbeb7..20d65171fd 100644
--- a/tests/openpgp.scm
+++ b/tests/openpgp.scm
@@ -18,6 +18,7 @@
 
 (define-module (tests-openpgp)
   #:use-module (guix openpgp)
+  #:use-module (gcrypt base16)
   #:use-module (gcrypt hash)
   #:use-module (gcrypt pk-crypto)
   #:use-module (ice-9 binary-ports)
@@ -65,6 +66,16 @@ vBSFjNSiVHsuAA==
 (define %dsa-key-id      #x587918047BE8BD2C)      ;dsa.key
 (define %ed25519-key-id  #x771F49CBFAAE072D)      ;ed25519.key
 
+(define %rsa-key-fingerprint
+  (base16-string->bytevector
+   (string-downcase "385F86CFC86B665A5C165E6BAE25DA2A70DEED59")))
+(define %dsa-key-fingerprint
+  (base16-string->bytevector
+   (string-downcase "2884A980422330A4F33DD97F587918047BE8BD2C")))
+(define %ed25519-key-fingerprint
+  (base16-string->bytevector
+   (string-downcase "44D31E21AF7138F9B632280A771F49CBFAAE072D")))
+
 
 ;;; The following are detached signatures created commands like:
 ;;;    echo 'Hello!' | gpg -sba --digest-algo sha512
@@ -160,15 +171,16 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
                       "Ludovic Courtès "))))))
 
 (test-equal "get-openpgp-detached-signature/ascii"
-  (list `(,%dsa-key-id dsa sha256)
-        `(,%rsa-key-id rsa sha256)
-        `(,%ed25519-key-id eddsa sha256)
-        `(,%ed25519-key-id eddsa sha512)
-        `(,%ed25519-key-id eddsa sha1))
+  (list `(,%dsa-key-id ,%dsa-key-fingerprint dsa sha256)
+        `(,%rsa-key-id ,%rsa-key-fingerprint rsa sha256)
+        `(,%ed25519-key-id ,%ed25519-key-fingerprint eddsa sha256)
+        `(,%ed25519-key-id ,%ed25519-key-fingerprint eddsa sha512)
+        `(,%ed25519-key-id ,%ed25519-key-fingerprint eddsa sha1))
   (map (lambda (str)
          (let ((signature (get-openpgp-detached-signature/ascii
                            (open-input-string str))))
            (list (openpgp-signature-issuer signature)
+                 (openpgp-signature-issuer-fingerprint signature)
                  (openpgp-signature-public-key-algorithm signature)
                  (openpgp-signature-hash-algorithm signature))))
        (list %hello-signature/dsa
-- 
cgit v1.2.3


From 7b2b3a13cc2d9b043f37b2e7ba0f147c08de8fad Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Sun, 26 Apr 2020 16:03:46 +0200
Subject: openpgp: Store the issuer key id and fingerprint in
 .

* guix/openpgp.scm ()[issuer, issuer-fingerprint]:
New fields.
(openpgp-signature-issuer, openpgp-signature-issuer-fingerprint): Remove.
(verify-openpgp-signature): Use 'openpgp-signature-issuer-key-id'.
(get-signature): Initialize 'issuer' and 'issuer-fingerprint'.
* tests/openpgp.scm ("get-openpgp-detached-signature/ascii"): Adjust
accordingly.
---
 guix/openpgp.scm  | 28 ++++++++++------------------
 tests/openpgp.scm |  2 +-
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/guix/openpgp.scm b/guix/openpgp.scm
index 77a75373df..3b11998c11 100644
--- a/guix/openpgp.scm
+++ b/guix/openpgp.scm
@@ -32,7 +32,7 @@
             port-ascii-armored?
 
             openpgp-signature?
-            openpgp-signature-issuer
+            openpgp-signature-issuer-key-id
             openpgp-signature-issuer-fingerprint
             openpgp-signature-public-key-algorithm
             openpgp-signature-hash-algorithm
@@ -469,7 +469,7 @@ hexadecimal format for fingerprints."
 (define-record-type 
   (make-openpgp-signature version type pk-algorithm hash-algorithm hashl16
                           append-data hashed-subpackets unhashed-subpackets
-                          value)
+                          value issuer issuer-fingerprint)
   openpgp-signature?
   (version               openpgp-signature-version)
   (type                  openpgp-signature-type)
@@ -479,19 +479,9 @@ hexadecimal format for fingerprints."
   (append-data           openpgp-signature-append-data) ;append to data when hashing
   (hashed-subpackets     openpgp-signature-hashed-subpackets)
   (unhashed-subpackets   openpgp-signature-unhashed-subpackets)
-  (value                 openpgp-signature-value))
-
-(define (openpgp-signature-issuer sig)
-  (cond ((assq 'issuer (openpgp-signature-unhashed-subpackets sig)) => cdr)
-        ;; XXX: is the issuer always in the unhashed subpackets?
-        (else #f)))
-
-(define (openpgp-signature-issuer-fingerprint sig)
-  "When it's available, return the fingerprint, a bytevector, or the issuer of
-SIG.  Otherwise, return #f."
-  (or (assoc-ref (openpgp-signature-hashed-subpackets sig) 'issuer-fingerprint)
-      (assoc-ref (openpgp-signature-unhashed-subpackets sig)
-                 'issuer-fingerprint)))
+  (value                 openpgp-signature-value)
+  (issuer                openpgp-signature-issuer-key-id)       ;integer | #f
+  (issuer-fingerprint    openpgp-signature-issuer-fingerprint)) ;bytevector | #f
 
 (define (openpgp-signature-creation-time sig)
   (cond ((assq 'signature-ctime (openpgp-signature-hashed-subpackets sig))
@@ -573,7 +563,7 @@ the issuer's OpenPGP public key extracted from KEYRING."
 
   ;; TODO: Support SIGNATURE-TEXT.
   (if (= (openpgp-signature-type sig) SIGNATURE-BINARY)
-      (let* ((issuer   (openpgp-signature-issuer sig))
+      (let* ((issuer   (openpgp-signature-issuer-key-id sig))
              (key-data (lookup-key-by-id keyring issuer)))
         ;; Find the primary key or subkey that made the signature.
         (let ((key (find (lambda (k)
@@ -651,7 +641,8 @@ FINGERPRINT, a bytevector."
                                    (list (cons 'signature-ctime ctime))
                                    ;; Unhashed subpackets
                                    (list (cons 'issuer keyid))
-                                   value))))
+                                   value
+                                   keyid #f))))
       ((4)
        (let*-values (((type pkalg halg) (get-integers p u8 u8 u8))
                      ((hashed-subpackets)
@@ -697,7 +688,8 @@ FINGERPRINT, a bytevector."
                                      append-data
                                      hashed-subpackets
                                      unhashed-subpackets
-                                     value)))))
+                                     value
+                                     issuer-key-id issuer)))))
       (else
        (print "Unsupported signature version: " version)
        'unsupported-signature-version))))
diff --git a/tests/openpgp.scm b/tests/openpgp.scm
index 20d65171fd..1709167859 100644
--- a/tests/openpgp.scm
+++ b/tests/openpgp.scm
@@ -179,7 +179,7 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
   (map (lambda (str)
          (let ((signature (get-openpgp-detached-signature/ascii
                            (open-input-string str))))
-           (list (openpgp-signature-issuer signature)
+           (list (openpgp-signature-issuer-key-id signature)
                  (openpgp-signature-issuer-fingerprint signature)
                  (openpgp-signature-public-key-algorithm signature)
                  (openpgp-signature-hash-algorithm signature))))
-- 
cgit v1.2.3


From efe1f0122c61b8932671d07419f0200c170a994e Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Sun, 26 Apr 2020 23:20:26 +0200
Subject: openpgp: Add 'lookup-key-by-fingerprint'.

* guix/openpgp.scm ()[table]: Rename to...
[ids]: ... this.
[fingerprints]: New field.
(keyring-insert, lookup-key-by-fingerprint): New procedures.
(%empty-keyring): Adjust.
(get-openpgp-keyring): Manipulate KEYRING instead of its vhash, use
'keyring-insert'.
* tests/openpgp.scm ("get-openpgp-keyring"): Test
'lookup-key-by-fingerprint'.
---
 guix/openpgp.scm  | 43 +++++++++++++++++++++++++++++++------------
 tests/openpgp.scm | 16 +++++++++-------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/guix/openpgp.scm b/guix/openpgp.scm
index 3b11998c11..8479f8a168 100644
--- a/guix/openpgp.scm
+++ b/guix/openpgp.scm
@@ -52,6 +52,7 @@
             openpgp-keyring?
             %empty-keyring
             lookup-key-by-id
+            lookup-key-by-fingerprint
             get-openpgp-keyring
 
             read-radix-64)
@@ -912,14 +913,32 @@ FINGERPRINT, a bytevector."
 ;;; Keyring management
 
 (define-record-type 
-  (openpgp-keyring table)
+  (openpgp-keyring ids fingerprints)
   openpgp-keyring?
-  (table openpgp-keyring-table))              ;vhash mapping key id to packets
+  (ids            openpgp-keyring-ids)        ;vhash mapping key id to packets
+  (fingerprints   openpgp-keyring-fingerprints)) ;mapping fingerprint to packets
+
+(define* (keyring-insert key keyring #:optional (packets (list key)))
+  "Insert the KEY/PACKETS association into KEYRING and return the resulting
+keyring.  PACKETS typically contains KEY, an , alongside
+with additional  records for sub-keys, 
+records, and so on."
+  (openpgp-keyring (vhash-consv (openpgp-public-key-id key) packets
+                                (openpgp-keyring-ids keyring))
+                   (vhash-cons (openpgp-public-key-fingerprint key) packets
+                               (openpgp-keyring-fingerprints keyring))))
 
 (define (lookup-key-by-id keyring id)
   "Return a list of packets for the key with ID in KEYRING, or #f if ID could
 not be found.  ID must be the 64-bit key ID of the key, an integer."
-  (match (vhash-assv id (openpgp-keyring-table keyring))
+  (match (vhash-assv id (openpgp-keyring-ids keyring))
+    ((_ . lst) lst)
+    (#f '())))
+
+(define (lookup-key-by-fingerprint keyring fingerprint)
+  "Return a list of packets for the key with FINGERPRINT in KEYRING, or #f if
+FINGERPRINT could not be found.  FINGERPRINT must be a bytevector."
+  (match (vhash-assoc fingerprint (openpgp-keyring-fingerprints keyring))
     ((_ . lst) lst)
     (#f '())))
 
@@ -928,7 +947,7 @@ not be found.  ID must be the 64-bit key ID of the key, an integer."
 
 (define %empty-keyring
   ;; The empty keyring.
-  (openpgp-keyring vlist-null))
+  (openpgp-keyring vlist-null vlist-null))
 
 (define* (get-openpgp-keyring port
                               #:optional (keyring %empty-keyring)
@@ -939,15 +958,15 @@ complements KEYRING.  LIMIT is the maximum number of keys to read, or -1 if
 there is no limit."
   (let lp ((pkt (get-packet port))
            (limit limit)
-           (keyring (openpgp-keyring-table keyring)))
+           (keyring keyring))
     (print "#;key " pkt)
     (cond ((or (zero? limit) (eof-object? pkt))
-           (openpgp-keyring keyring))
+           keyring)
           ((openpgp-public-key-primary? pkt)
            ;; Read signatures, user id's, subkeys
-           (let lp* ((pkt (get-packet port))
+           (let lp* ((pkt  (get-packet port))
                      (pkts (list pkt))
-                     (key-ids (list (openpgp-public-key-id pkt))))
+                     (keys (list pkt)))
              (print "#;keydata " pkt)
              (cond ((or (eof-object? pkt)
                         (eq? pkt 'unsupported-public-key-version)
@@ -957,13 +976,13 @@ there is no limit."
                     ;; packets.
                     (lp pkt
                         (- limit 1)
-                        (fold (cute vhash-consv <> (reverse pkts) <>)
-                              keyring key-ids)))
+                        (fold (cute keyring-insert <> <> (reverse pkts))
+                              keyring keys)))
                    ((openpgp-public-key? pkt)     ;subkey
                     (lp* (get-packet port) (cons pkt pkts)
-                         (cons (openpgp-public-key-id pkt) key-ids)))
+                         (cons pkt keys)))
                    (else
-                    (lp* (get-packet port) (cons pkt pkts) key-ids)))))
+                    (lp* (get-packet port) (cons pkt pkts) keys)))))
           (else
            ;; Skip until there's a primary key. Ignore errors...
            (lp (get-packet port) limit keyring)))))
diff --git a/tests/openpgp.scm b/tests/openpgp.scm
index 1709167859..eac2e88f74 100644
--- a/tests/openpgp.scm
+++ b/tests/openpgp.scm
@@ -162,13 +162,15 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
                     (call-with-input-file key read-radix-64)))))
     (match (lookup-key-by-id keyring %civodul-key-id)
       (((? openpgp-public-key? primary) packets ...)
-       (and (= (openpgp-public-key-id primary) %civodul-key-id)
-            (not (openpgp-public-key-subkey? primary))
-            (string=? (openpgp-format-fingerprint
-                       (openpgp-public-key-fingerprint primary))
-                      %civodul-fingerprint)
-            (string=? (openpgp-user-id-value (find openpgp-user-id? packets))
-                      "Ludovic Courtès "))))))
+       (let ((fingerprint (openpgp-public-key-fingerprint primary)))
+         (and (= (openpgp-public-key-id primary) %civodul-key-id)
+              (not (openpgp-public-key-subkey? primary))
+              (string=? (openpgp-format-fingerprint fingerprint)
+                        %civodul-fingerprint)
+              (string=? (openpgp-user-id-value (find openpgp-user-id? packets))
+                        "Ludovic Courtès ")
+              (equal? (lookup-key-by-id keyring %civodul-key-id)
+                      (lookup-key-by-fingerprint keyring fingerprint))))))))
 
 (test-equal "get-openpgp-detached-signature/ascii"
   (list `(,%dsa-key-id ,%dsa-key-fingerprint dsa sha256)
-- 
cgit v1.2.3


From b45fa0a123bec8d023e5520dfb381bfc73313929 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Sun, 26 Apr 2020 23:27:36 +0200
Subject: openpgp: 'verify-openpgp-signature' looks up by fingerprint when
 possible.

* guix/openpgp.scm (verify-openpgp-signature): Use
'lookup-key-by-fingerprint' when SIG contains a fingerprint.
Honor FINGERPRINT in the 'find' predicate.  Upon missing-key, return
FINGERPRINT if available.
* tests/openpgp.scm ("verify-openpgp-signature, missing key"): Adjust
expected value accordingly.
---
 guix/openpgp.scm  | 15 +++++++++++----
 tests/openpgp.scm |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/guix/openpgp.scm b/guix/openpgp.scm
index 8479f8a168..a871eb1a16 100644
--- a/guix/openpgp.scm
+++ b/guix/openpgp.scm
@@ -564,16 +564,23 @@ the issuer's OpenPGP public key extracted from KEYRING."
 
   ;; TODO: Support SIGNATURE-TEXT.
   (if (= (openpgp-signature-type sig) SIGNATURE-BINARY)
-      (let* ((issuer   (openpgp-signature-issuer-key-id sig))
-             (key-data (lookup-key-by-id keyring issuer)))
+      (let* ((id          (openpgp-signature-issuer-key-id sig))
+             (fingerprint (openpgp-signature-issuer-fingerprint sig))
+             (key-data    (if fingerprint
+                              (lookup-key-by-fingerprint keyring fingerprint)
+                              (lookup-key-by-id keyring id))))
         ;; Find the primary key or subkey that made the signature.
         (let ((key (find (lambda (k)
                            (and (openpgp-public-key? k)
-                                (= (openpgp-public-key-id k) issuer)))
+                                (if fingerprint
+                                    (bytevector=?
+                                     (openpgp-public-key-fingerprint k)
+                                     fingerprint)
+                                    (= (openpgp-public-key-id k) id))))
                          key-data)))
           (if key
               (check key sig)
-              (values 'missing-key issuer))))
+              (values 'missing-key (or fingerprint id)))))
       (values 'unsupported-signature sig)))
 
 (define (key-id-matches-fingerprint? key-id fingerprint)
diff --git a/tests/openpgp.scm b/tests/openpgp.scm
index eac2e88f74..cc5e6cbcf7 100644
--- a/tests/openpgp.scm
+++ b/tests/openpgp.scm
@@ -192,7 +192,7 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
              %hello-signature/ed25519/sha1)))
 
 (test-equal "verify-openpgp-signature, missing key"
-  `(missing-key ,%rsa-key-id)
+  `(missing-key ,%rsa-key-fingerprint)
   (let* ((keyring   (get-openpgp-keyring (%make-void-port "r")))
          (signature (get-openpgp-packet
                      (open-bytevector-input-port
-- 
cgit v1.2.3


From bd8126558dc7a022d7853d803d7134ffa1b7bc52 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Thu, 30 Apr 2020 15:43:19 +0200
Subject: openpgp: 'lookup-key-by-{id,fingerprint}' return the key first.

Previously, 'lookup-key-by-{id,fingerprint}' would always return the
list of packets where the primary key is first.  Thus, the caller would
need to use 'find' to actually find the requested key.

* guix/openpgp.scm (keyring-insert): Always add KEY to PACKETS.
(lookup-key-by-id, lookup-key-by-fingerprint): Change to return the key
as the first value.
(verify-openpgp-signature): Remove now unneeded call to 'find'.
* tests/openpgp.scm ("get-openpgp-keyring"): Adjust accordingly.
---
 guix/openpgp.scm  | 43 +++++++++++++++++++------------------------
 tests/openpgp.scm | 22 +++++++++++-----------
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/guix/openpgp.scm b/guix/openpgp.scm
index a871eb1a16..987660fa29 100644
--- a/guix/openpgp.scm
+++ b/guix/openpgp.scm
@@ -566,21 +566,12 @@ the issuer's OpenPGP public key extracted from KEYRING."
   (if (= (openpgp-signature-type sig) SIGNATURE-BINARY)
       (let* ((id          (openpgp-signature-issuer-key-id sig))
              (fingerprint (openpgp-signature-issuer-fingerprint sig))
-             (key-data    (if fingerprint
+             (key         (if fingerprint
                               (lookup-key-by-fingerprint keyring fingerprint)
                               (lookup-key-by-id keyring id))))
-        ;; Find the primary key or subkey that made the signature.
-        (let ((key (find (lambda (k)
-                           (and (openpgp-public-key? k)
-                                (if fingerprint
-                                    (bytevector=?
-                                     (openpgp-public-key-fingerprint k)
-                                     fingerprint)
-                                    (= (openpgp-public-key-id k) id))))
-                         key-data)))
-          (if key
-              (check key sig)
-              (values 'missing-key (or fingerprint id)))))
+        (if key
+            (check key sig)
+            (values 'missing-key (or fingerprint id))))
       (values 'unsupported-signature sig)))
 
 (define (key-id-matches-fingerprint? key-id fingerprint)
@@ -925,29 +916,33 @@ FINGERPRINT, a bytevector."
   (ids            openpgp-keyring-ids)        ;vhash mapping key id to packets
   (fingerprints   openpgp-keyring-fingerprints)) ;mapping fingerprint to packets
 
-(define* (keyring-insert key keyring #:optional (packets (list key)))
+(define* (keyring-insert key keyring #:optional (packets '()))
   "Insert the KEY/PACKETS association into KEYRING and return the resulting
 keyring.  PACKETS typically contains KEY, an , alongside
 with additional  records for sub-keys, 
 records, and so on."
-  (openpgp-keyring (vhash-consv (openpgp-public-key-id key) packets
+  (openpgp-keyring (vhash-consv (openpgp-public-key-id key)
+                                (cons key packets)
                                 (openpgp-keyring-ids keyring))
-                   (vhash-cons (openpgp-public-key-fingerprint key) packets
+                   (vhash-cons (openpgp-public-key-fingerprint key)
+                               (cons key packets)
                                (openpgp-keyring-fingerprints keyring))))
 
 (define (lookup-key-by-id keyring id)
-  "Return a list of packets for the key with ID in KEYRING, or #f if ID could
-not be found.  ID must be the 64-bit key ID of the key, an integer."
+  "Return two values: the first key with ID in KEYRING, and a list of
+associated packets (user IDs, signatures, etc.).  Return #f and the empty list
+of ID was not found.  ID must be the 64-bit key ID of the key, an integer."
   (match (vhash-assv id (openpgp-keyring-ids keyring))
-    ((_ . lst) lst)
-    (#f '())))
+    ((_ key packets ...) (values key packets))
+    (#f (values #f '()))))
 
 (define (lookup-key-by-fingerprint keyring fingerprint)
-  "Return a list of packets for the key with FINGERPRINT in KEYRING, or #f if
-FINGERPRINT could not be found.  FINGERPRINT must be a bytevector."
+  "Return two values: the key with FINGERPRINT in KEYRING, and a list of
+associated packets (user IDs, signatures, etc.).  Return #f and the empty list
+of FINGERPRINT was not found.  FINGERPRINT must be a bytevector."
   (match (vhash-assoc fingerprint (openpgp-keyring-fingerprints keyring))
-    ((_ . lst) lst)
-    (#f '())))
+    ((_ key packets ...) (values key packets))
+    (#f (values #f '()))))
 
 ;; Reads a keyring from the binary input port p. It must not be
 ;; ASCII armored.
diff --git a/tests/openpgp.scm b/tests/openpgp.scm
index cc5e6cbcf7..a85fe6a6cb 100644
--- a/tests/openpgp.scm
+++ b/tests/openpgp.scm
@@ -160,17 +160,17 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
          (keyring (get-openpgp-keyring
                    (open-bytevector-input-port
                     (call-with-input-file key read-radix-64)))))
-    (match (lookup-key-by-id keyring %civodul-key-id)
-      (((? openpgp-public-key? primary) packets ...)
-       (let ((fingerprint (openpgp-public-key-fingerprint primary)))
-         (and (= (openpgp-public-key-id primary) %civodul-key-id)
-              (not (openpgp-public-key-subkey? primary))
-              (string=? (openpgp-format-fingerprint fingerprint)
-                        %civodul-fingerprint)
-              (string=? (openpgp-user-id-value (find openpgp-user-id? packets))
-                        "Ludovic Courtès ")
-              (equal? (lookup-key-by-id keyring %civodul-key-id)
-                      (lookup-key-by-fingerprint keyring fingerprint))))))))
+    (let-values (((primary packets)
+                  (lookup-key-by-id keyring %civodul-key-id)))
+      (let ((fingerprint (openpgp-public-key-fingerprint primary)))
+        (and (= (openpgp-public-key-id primary) %civodul-key-id)
+             (not (openpgp-public-key-subkey? primary))
+             (string=? (openpgp-format-fingerprint fingerprint)
+                       %civodul-fingerprint)
+             (string=? (openpgp-user-id-value (find openpgp-user-id? packets))
+                       "Ludovic Courtès ")
+             (eq? (lookup-key-by-fingerprint keyring fingerprint)
+                  primary))))))
 
 (test-equal "get-openpgp-detached-signature/ascii"
   (list `(,%dsa-key-id ,%dsa-key-fingerprint dsa sha256)
-- 
cgit v1.2.3


From b835e158d51c873a99367afd27f3d57cfe92e10e Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Thu, 30 Apr 2020 15:56:54 +0200
Subject: openpgp: Add 'string->openpgp-packet'.

* guix/openpgp.scm (string->openpgp-packet): New procedure.
* tests/openpgp.scm ("verify-openpgp-signature, missing key")
("verify-openpgp-signature, good signatures")
("verify-openpgp-signature, bad signature"): Use it.
---
 guix/openpgp.scm  |  9 ++++++++-
 tests/openpgp.scm | 15 +++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/guix/openpgp.scm b/guix/openpgp.scm
index 987660fa29..2b2997dcd4 100644
--- a/guix/openpgp.scm
+++ b/guix/openpgp.scm
@@ -55,7 +55,8 @@
             lookup-key-by-fingerprint
             get-openpgp-keyring
 
-            read-radix-64)
+            read-radix-64
+            string->openpgp-packet)
   #:use-module (rnrs bytevectors)
   #:use-module (rnrs io ports)
   #:use-module (srfi srfi-1)
@@ -1067,3 +1068,9 @@ end-of-file object if the Radix-64 sequence was truncated."
                         (values #f kind)))
                      (loop (cons str lines))))))))
         (values #f #f))))
+
+(define (string->openpgp-packet str)
+  "Read STR, an ASCII-armored OpenPGP packet, and return the corresponding
+OpenPGP record."
+  (get-packet
+   (open-bytevector-input-port (call-with-input-string str read-radix-64))))
diff --git a/tests/openpgp.scm b/tests/openpgp.scm
index a85fe6a6cb..0beab6f88b 100644
--- a/tests/openpgp.scm
+++ b/tests/openpgp.scm
@@ -194,10 +194,7 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
 (test-equal "verify-openpgp-signature, missing key"
   `(missing-key ,%rsa-key-fingerprint)
   (let* ((keyring   (get-openpgp-keyring (%make-void-port "r")))
-         (signature (get-openpgp-packet
-                     (open-bytevector-input-port
-                      (call-with-input-string %hello-signature/rsa
-                        read-radix-64)))))
+         (signature (string->openpgp-packet %hello-signature/rsa)))
     (let-values (((status key)
                   (verify-openpgp-signature signature keyring
                                             (open-input-string "Hello!\n"))))
@@ -214,10 +211,7 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
                 (keyring   (get-openpgp-keyring
                             (open-bytevector-input-port
                              (call-with-input-file key read-radix-64))))
-                (signature (get-openpgp-packet
-                            (open-bytevector-input-port
-                             (call-with-input-string signature
-                               read-radix-64)))))
+                (signature (string->openpgp-packet signature)))
            (let-values (((status key)
                          (verify-openpgp-signature signature keyring
                                                    (open-input-string "Hello!\n"))))
@@ -246,10 +240,7 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
                          "tests/ed25519.key" "tests/ed25519.key"
                          "tests/ed25519.key"))))
     (map (lambda (signature)
-           (let ((signature (get-openpgp-packet
-                             (open-bytevector-input-port
-                              (call-with-input-string signature
-                                read-radix-64)))))
+           (let ((signature (string->openpgp-packet signature)))
              (let-values (((status key)
                            (verify-openpgp-signature signature keyring
                                                      (open-input-string "What?!"))))
-- 
cgit v1.2.3


From 051a45e642ff21908375bee24d272c536096d026 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Thu, 30 Apr 2020 16:39:44 +0200
Subject: git-authenticate: Use (guix openpgp).

It can now authenticate 14K+ commits in 23s instead of 4mn20.

* build-aux/git-authenticate.scm (%authorized-signing-keys): Turn
fingerprints into bytevectors.
(with-temporary-files): Remove.
(commit-signing-key): Add 'keyring' parameter.  Use
'string->openpgp-packet' and 'verify-openpgp-signature' instead of (guix
gnupg) procedures.
(authenticate-commit): Add 'keyring' parameter.  Pass it to
'commit-signing-key'.  Adjust to SIGNING-KEY being an .
(authenticate-commits): Remove 'parameterize'.  Load keyring with
'get-openpgp-keyring'.
(git-authenticate): When printing stats, adjust to SIGNER being an
.
---
 build-aux/git-authenticate.scm | 131 +++++++++++++++++++----------------------
 1 file changed, 62 insertions(+), 69 deletions(-)

diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm
index bb48dddc59..0d5eb4caa9 100644
--- a/build-aux/git-authenticate.scm
+++ b/build-aux/git-authenticate.scm
@@ -23,8 +23,9 @@
 
 (use-modules (git)
              (guix git)
-             (guix gnupg)
-             (guix utils)
+             (guix openpgp)
+             ((guix utils) #:select (config-directory))
+             (guix base16)
              ((guix build utils) #:select (mkdir-p))
              (guix i18n)
              (guix progress)
@@ -215,7 +216,8 @@
   ;; Fingerprint of authorized signing keys.
   (map (match-lambda
          ((name fingerprint)
-          (string-filter char-set:graphic fingerprint)))
+          (base16-string->bytevector
+           (string-downcase (string-filter char-set:graphic fingerprint)))))
        %committers))
 
 (define %commits-with-bad-signature
@@ -226,75 +228,63 @@
   ;; Commits lacking a signature.
   '())
 
-(define-syntax-rule (with-temporary-files file1 file2 exp ...)
-  (call-with-temporary-output-file
-   (lambda (file1 port1)
-     (call-with-temporary-output-file
-      (lambda (file2 port2)
-        exp ...)))))
-
-(define (commit-signing-key repo commit-id)
-  "Return the OpenPGP key ID that signed COMMIT-ID (an OID).  Raise an
-exception if the commit is unsigned or has an invalid signature."
+(define (commit-signing-key repo commit-id keyring)
+  "Return the OpenPGP key that signed COMMIT-ID (an OID).  Raise an exception
+if the commit is unsigned, has an invalid signature, or if its signing key is
+not in KEYRING."
   (let-values (((signature signed-data)
                 (catch 'git-error
                   (lambda ()
                     (commit-extract-signature repo commit-id))
                   (lambda _
                     (values #f #f)))))
-    (if (not signature)
-        (raise (condition
-                (&message
-                 (message (format #f (G_ "commit ~a lacks a signature")
-                                  commit-id)))))
-        (begin
-          (with-fluids ((%default-port-encoding "UTF-8"))
-            (with-temporary-files data-file signature-file
-              (call-with-output-file data-file
-                (cut display signed-data <>))
-              (call-with-output-file signature-file
-                (cut display signature <>))
-
-              (let-values (((status data)
-                            (with-error-to-port (%make-void-port "w")
-                              (lambda ()
-                                (gnupg-verify* signature-file data-file
-                                               #:key-download 'always)))))
-                (match status
-                  ('invalid-signature
-                   ;; There's a signature but it's invalid.
-                   (raise (condition
-                           (&message
-                            (message (format #f (G_ "signature verification failed \
+    (unless signature
+      (raise (condition
+              (&message
+               (message (format #f (G_ "commit ~a lacks a signature")
+                                commit-id))))))
+
+    (let ((signature (string->openpgp-packet signature)))
+      (with-fluids ((%default-port-encoding "UTF-8"))
+        (let-values (((status data)
+                      (verify-openpgp-signature signature keyring
+                                                (open-input-string signed-data))))
+          (match status
+            ('bad-signature
+             ;; There's a signature but it's invalid.
+             (raise (condition
+                     (&message
+                      (message (format #f (G_ "signature verification failed \
 for commit ~a")
-                                             (oid->string commit-id)))))))
-                  ('missing-key
-                   (raise (condition
-                           (&message
-                            (message (format #f (G_ "could not authenticate \
+                                       (oid->string commit-id)))))))
+            ('missing-key
+             (raise (condition
+                     (&message
+                      (message (format #f (G_ "could not authenticate \
 commit ~a: key ~a is missing")
-                                             (oid->string commit-id)
-                                             data))))))
-                  ('valid-signature
-                   (match data
-                     ((fingerprint . user)
-                      fingerprint)))))))))))
-
-(define (authenticate-commit repository commit)
+                                       (oid->string commit-id)
+                                       data))))))
+            ('good-signature data)))))))
+
+(define (authenticate-commit repository commit keyring)
   "Authenticate COMMIT from REPOSITORY and return the signing key fingerprint.
 Raise an error when authentication fails."
   (define id
     (commit-id commit))
 
   (define signing-key
-    (commit-signing-key repository id))
+    (commit-signing-key repository id keyring))
 
-  (unless (member signing-key %authorized-signing-keys)
+  (unless (member (openpgp-public-key-fingerprint signing-key)
+                  %authorized-signing-keys)
     (raise (condition
             (&message
              (message (format #f (G_ "commit ~a not signed by an authorized \
 key: ~a")
-                              (oid->string id) signing-key))))))
+                              (oid->string id)
+                              (openpgp-format-fingerprint
+                               (openpgp-public-key-fingerprint
+                                signing-key))))))))
 
   signing-key)
 
@@ -302,17 +292,21 @@ key: ~a")
                                #:key (report-progress (const #t)))
   "Authenticate COMMITS, a list of commit objects, calling REPORT-PROGRESS for
 each of them.  Return an alist showing the number of occurrences of each key."
-  (parameterize ((current-keyring (string-append (config-directory)
-                                                 "/keyrings/channels/guix.kbx")))
-    (fold (lambda (commit stats)
-            (report-progress)
-            (let ((signer (authenticate-commit repository commit)))
-              (match (assoc signer stats)
-                (#f          (cons `(,signer . 1) stats))
-                ((_ . count) (cons `(,signer . ,(+ count 1))
-                                   (alist-delete signer stats))))))
-          '()
-          commits)))
+  (define keyring-file
+    (string-append (config-directory) "/keyrings/channels/guix.kbx"))
+
+  (define keyring
+    (call-with-input-file keyring-file get-openpgp-keyring))
+
+  (fold (lambda (commit stats)
+          (report-progress)
+          (let ((signer (authenticate-commit repository commit keyring)))
+            (match (assq signer stats)
+              (#f          (cons `(,signer . 1) stats))
+              ((_ . count) (cons `(,signer . ,(+ count 1))
+                                 (alist-delete signer stats))))))
+        '()
+        commits))
 
 (define commit-short-id
   (compose (cut string-take <> 7) oid->string commit-id))
@@ -409,7 +403,10 @@ COMMIT-ID is written to cache, though)."
            (format #t (G_ "Signing statistics:~%"))
            (for-each (match-lambda
                        ((signer . count)
-                        (format #t "  ~a ~10d~%" signer count)))
+                        (format #t "  ~a ~10d~%"
+                                (openpgp-format-fingerprint
+                                 (openpgp-public-key-fingerprint signer))
+                                count)))
                      (sort stats
                            (match-lambda*
                              (((_ . count1) (_ . count2))
@@ -423,7 +420,3 @@ COMMIT-ID is written to cache, though)."
                (G_ "Usage: git-authenticate START [END]
 
 Authenticate commits START to END or the current head.\n"))))))
-
-;;; Local Variables:
-;;; eval: (put 'with-temporary-files 'scheme-indent-function 2)
-;;; End:
-- 
cgit v1.2.3


From bee5b7a0f8547a40f05d0891a71fff1fed4b2b3e Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Fri, 1 May 2020 16:25:29 +0200
Subject: .guix-authorizations: Augment.

* .guix-authorizations: Add all the currently authorized committers.
---
 .guix-authorizations | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 148 insertions(+), 2 deletions(-)

diff --git a/.guix-authorizations b/.guix-authorizations
index 25fd1d85a1..8caa827063 100644
--- a/.guix-authorizations
+++ b/.guix-authorizations
@@ -4,5 +4,151 @@
 (authorizations
  (version 0)
 
- (("3CE4 6455 8A84 FDC6 9DB4  0CFB 090B 1199 3D9A EBB5"
-   (name "civodul"))))
+ (("AD17 A21E F8AE D8F1 CC02  DBD9 F7D5 C9BF 765C 61E3"
+   (name "andreas"))
+  ("2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"
+   (name "ajgrf"))
+  ("306F CB8F 2C01 C25D 29D3  0556 61EF 502E F602 52F2"
+   (name "alexvong1995"))
+  ("4FB9 9F49 2B12 A365 7997  E664 8246 0C08 2A0E E98F"
+   (name "alezost"))
+  ("50F3 3E2E 5B0C 3D90 0424  ABE8 9BDC F497 A4BB CC7F"
+   (name "ambrevar"))
+  ("27D5 86A4 F890 0854 329F  F09F 1260 E464 82E6 3562"
+   (name "apteryx"))
+  ("7F73 0343 F2F0 9F3C 77BF  79D3 2E25 EE8B 6180 2BB3"
+   (name "arunisaac"))
+  (;; primary: "3B12 9196 AE30 0C3C 0E90  A26F A715 5567 3271 9948"
+   "9A2B 401E D001 0650 1584  BAAC 8BC4 F447 6E8A 8E00"
+   (name "atheia"))
+  (;; primary: "BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103"
+   "39B3 3C8D 9448 0D2D DCC2  A498 8B44 A0CD C7B9 56F2"
+   (name "bandali"))
+  (;; primary: "34FF 38BC D151 25A6 E340  A0B5 3453 2F9F AFCA 8B8E"
+   "A0C5 E352 2EF8 EF5C 64CD  B7F0 FD73 CAC7 19D3 2566"
+   (name "bavier"))
+  ("3774 8024 880F D3FF DCA2  C9AB 5893 6E0E 2F1B 5A4C"
+   (name "beffa"))
+  ("BCF8 F737 2CED 080A 67EB  592D 2A6A D9F4 AAC2 0DF6"
+   (name "benwoodcroft"))
+  ("45CC 63B8 5258 C9D5 5F34  B239 D37D 0EA7 CECC 3912"
+   (name "biscuolo"))
+  ("7988 3B9F 7D6A 4DBF 3719  0367 2506 A96C CF63 0B21"
+   (name "boskovits"))
+  ("DFC0 C7F7 9EE6 0CA7 AE55  5E19 6722 43C4 A03F 0EEE"
+   (name "brettgilio"))
+  (;; primary: "0401 7A2A 6D9A 0CCD C81D  8EC2 96AB 007F 1A7E D999"
+   "09CD D25B 5244 A376 78F6  EEA8 0CC5 2153 1979 91A5"
+   (name "carl"))
+  ("3E89 EEE7 458E 720D 9754  E0B2 5E28 A33B 0B84 F577"
+   (name "cbaines"))
+  ("3CE4 6455 8A84 FDC6 9DB4  0CFB 090B 1199 3D9A EBB5"
+   (name "civodul"))
+  ("510A 8628 E2A7 7678 8F8C  709C 4BC0 2592 5FF8 F4D3"
+   (name "cwebber"))
+  (;; primary: "295A F991 6F46 F8A1 34B0  29DA 8086 3842 F0FE D83B"
+   "76CE C6B1 7274 B465 C02D  B3D9 E71A 3554 2C30 BAA5"
+   (name "dannym"))
+  ("B3C0 DB4D AD73 BA5D 285E  19AE 5143 0234 CEFD 87C3"
+   (name "davexunit"))
+  ("8CCB A7F5 52B9 CBEA E1FB  2915 8328 C747 0FF1 D807" ;FIXME: to be confirmed!
+   (name "davexunit (2nd)"))
+  ("53C4 1E6E 41AA FE55 335A  CA5E 446A 2ED4 D940 BF14"
+   (name "daviwil"))
+  ("6909 6DFD D702 8BED ACC5  884B C5E0 51C7 9C0B ECDB"
+   (name "dvc"))
+  ("5F43 B681 0437 2F4B A898  A64B 33B9 E9FD E28D 2C23"
+   (name "dvc (old)"))
+  ("A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351"
+   (name "efraim"))
+  ("9157 41FE B22F A4E3 3B6E  8F8D F4C1 D391 7EAC EE93"
+   (name "efraim (old)"))
+  (;; primary: "2453 02B1 BAB1 F867 FDCA  96BC 8F3F 861F 82EB 7A9A"
+   "CBC5 9C66 EC27 B971 7940  6B3E 6BE8 208A DF21 FE3F"
+   (name "glv"))
+  ("2219 43F4 9E9F 276F 9499  3382 BF28 6CB6 593E 5FFD"
+   (name "hoebjo"))
+  ("B943 509D 633E 80DD 27FC  4EED 634A 8DFF D3F6 31DF"
+   (name "htgoebel"))
+  ("7440 26BA 7CA3 C668 E940  1D53 0B43 1E98 3705 6942"
+   (name "ipetkov"))
+  (;; primary: "66A5 6D9C 9A98 BE7F 719A  B401 2652 5665 AE72 7D37"
+   "0325 78A6 8298 94E7 2AA2  66F5 D415 BF25 3B51 5976"
+   (name "iyzsong"))
+
+  ;; https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00229.html
+  ("DB34 CB51 D25C 9408 156F  CDD6 A12F 8797 8D70 1B99"
+   (name "janneke (old)"))
+  ("1A85 8392 E331 EAFD B8C2  7FFB F3C1 A0D9 C1D6 5273"
+   (name "janneke"))
+
+  (;; primary: "1BA4 08C5 8BF2 0EA7 3179  635A 865D C0A3 DED9 B5D0"
+   "E31D 9DDE EBA5 4A14 8A20  4550 DA45 97F9 47B4 1025"
+   (name "jlicht"))
+  ("83B6 703A DCCA 3B69 4BCE  2DA6 E6A5 EE3C 1946 7A0D"
+   (name "kkebreau"))
+  ("45E5 75FA 53EA 8BD6 1BCE  0B4E 3ADC 75F0 13D6 78F9"
+   (name "leungbk"))
+  (;; primary: "4F71 6F9A 8FA2 C80E F1B5  E1BA 5E35 F231 DE1A C5E0"
+   "B051 5948 F1E7 D3C1 B980  38A0 2646 FA30 BACA 7F08"
+   (name "lfam"))
+  ("2AE3 1395 932B E642 FC0E  D99C 9BED 6EDA 32E5 B0BC"
+   (name "lsl88"))
+  ("CBF5 9755 CBE7 E7EF EF18  3FB1 DD40 9A15 D822 469D"
+   (name "marusich"))
+  ("BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"
+   (name "mbakke"))
+  ("D919 0965 CE03 199E AF28  B3BE 7CEF 2984 7562 C516"
+   (name "mhw"))
+  ("4008 6A7E 0252 9B60 31FB  8607 8354 7635 3176 9CA6"
+   (name "mothacehe"))
+  (;; primary: "F5BC 5534 C36F 0087 B39D  36EF 1C9D C4FE B9DB 7C4B"
+   "F5DA 2032 4B87 3D0B 7A38  7672 0DB0 FF88 4F55 6D79"
+   (name "nckx"))
+  ("E576 BFB2 CF6E B13D F571  33B9 E315 A758 4613 1564"
+   (name "niedzejkob"))
+  ("ED0E F1C8 E126 BA83 1B48  5FE9 DA00 B4F0 48E9 2F2D"
+   (name "ngz"))
+  ("CEF4 CB91 4856 BA38 0A20  A7E2 3008 88CB 39C6 3817"
+   (name "pelzflorian"))
+  (;; primary: "B68B DF22 73F9 DA0E 63C1  8A32 515B F416 9242 D600"
+   "C699 ED09 E51B CE89 FD1D  A078 AAC7 E891 896B 568A"
+   (name "pgarlick"))
+  ("3A86 380E 58A8 B942 8D39  60E1 327C 1EF3 8DF5 4C32"
+   (name "phant0mas"))
+  ("74D6 A930 F44B 9B84 9EA5  5606 C166 AA49 5F7F 189C"
+   (name "reepca"))
+  ("BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC"
+   (name "rekado"))
+  ("0154 E1B9 1CC9 D9EF 7764  8DE7 F3A7 27DB 44FC CA36"
+   (name "rhelling"))
+  (;; From commit cc51c03ff867d4633505354819c6d88af88bf919 (March 2020).
+   ;; See .
+   "F556 FD94 FB8F 8B87 79E3  6832 CBD0 CD51 38C1 9AFC"
+   (name "roelj"))
+  (;; From commit 2cbede5935eb6a40173bbdf30a9ad22bf7574c22 (Jan. 2020).  See
+   ;; .
+   "1EFB 0909 1F17 D28C CBF9  B13A 53D4 57B2 D636 EE82"
+   (name "roptat"))
+  (;; primary: "D6B0 C593 DA8C 5EDC A44C  7A58 C336 91F7 1188 B004"
+   "A02C 2D82 0EF4 B25B A6B5  1D90 2AC6 A5EC 1C35 7C59"
+   (name "samplet"))
+  ("77DD AD2D 97F5 31BB C0F3  C7FD DFB5 EB09 AA62 5423"
+   (name "sleep_walker"))
+  ("F494 72F4 7A59 00D5 C235  F212 89F9 6D48 08F3 59C7"
+   (name "snape"))
+  ("9ADE 9ECF 2B19 C180 9C99  5CEA A1F4 CFCC 5283 6BAC"
+   (name "taylanub"))
+
+  ;; https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00826.html
+  (;; primary: "1DD1 681F E285 E07F 11DC  0C59 2E15 A6BC D77D 54FD"
+   "3D2C DA58 819C 08C2 A649  D43D 5C3B 064C 724A 5726"
+   (name "thomasd"))
+
+  ("6580 7361 3BFC C5C7 E2E4  5D45 DC51 8FC8 7F97 16AA"
+   (name "vagrantc"))
+  (;; primary: "C955 CC5D C048 7FB1 7966  40A9 199A F6A3 67E9 4ABB"
+   "7238 7123 8EAC EB63 4548  5857 167F 8EA5 001A FA9C"
+   (name "wigust"))
+  ("FF47 8FB2 64DE 32EC 2967  25A3 DDC0 F535 8812 F8F2"
+   (name "wingo"))))
-- 
cgit v1.2.3


From 92db1036b7d3ad12548c81450a31e401b4c4f2b5 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Fri, 1 May 2020 16:30:41 +0200
Subject: git-authenticate: Load the list of authorized keys from the tree.

* build-aux/git-authenticate.scm (read-authorizations)
(commit-authorized-keys): New procedures.
(authenticate-commit): Use it instead of %AUTHORIZED-SIGNING-KEYS.
---
 build-aux/git-authenticate.scm | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm
index 0d5eb4caa9..fc02f9ef66 100644
--- a/build-aux/git-authenticate.scm
+++ b/build-aux/git-authenticate.scm
@@ -34,6 +34,7 @@
              (srfi srfi-26)
              (srfi srfi-34)
              (srfi srfi-35)
+             (rnrs bytevectors)
              (rnrs io ports)
              (ice-9 match)
              (ice-9 format)
@@ -266,6 +267,39 @@ commit ~a: key ~a is missing")
                                        data))))))
             ('good-signature data)))))))
 
+(define (read-authorizations port)
+  "Read authorizations in the '.guix-authorizations' format from PORT, and
+return a list of authorized fingerprints."
+  (match (read port)
+    (('authorizations ('version 0)
+                      (((? string? fingerprints) _ ...) ...)
+                      _ ...)
+     (map (lambda (fingerprint)
+            (base16-string->bytevector
+             (string-downcase (string-filter char-set:graphic fingerprint))))
+          fingerprints))))
+
+(define* (commit-authorized-keys repository commit
+                                 #:optional (default-authorizations '()))
+  "Return the list of OpenPGP fingerprints authorized to sign COMMIT, based on
+authorizations listed in its parent commits.  If one of the parent commits
+does not specify anything, fall back to DEFAULT-AUTHORIZATIONS."
+  (define (commit-authorizations commit)
+    (catch 'git-error
+      (lambda ()
+        (let* ((tree  (commit-tree commit))
+               (entry (tree-entry-bypath tree ".guix-authorizations"))
+               (blob  (blob-lookup repository (tree-entry-id entry))))
+          (read-authorizations
+           (open-bytevector-input-port (blob-content blob)))))
+      (lambda (key error)
+        (if (= (git-error-code error) GIT_ENOTFOUND)
+            default-authorizations
+            (throw key error)))))
+
+  (apply lset-intersection bytevector=?
+         (map commit-authorizations (commit-parents commit))))
+
 (define (authenticate-commit repository commit keyring)
   "Authenticate COMMIT from REPOSITORY and return the signing key fingerprint.
 Raise an error when authentication fails."
@@ -276,7 +310,8 @@ Raise an error when authentication fails."
     (commit-signing-key repository id keyring))
 
   (unless (member (openpgp-public-key-fingerprint signing-key)
-                  %authorized-signing-keys)
+                  (commit-authorized-keys repository commit
+                                          %authorized-signing-keys))
     (raise (condition
             (&message
              (message (format #f (G_ "commit ~a not signed by an authorized \
-- 
cgit v1.2.3


From 041dc3a9c0694ada41b86115b9774a23c9d50f73 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Fri, 1 May 2020 18:27:21 +0200
Subject: git-authenticate: Load the keyring from the repository.

* build-aux/git-authenticate.scm (load-keyring-from-blob)
(load-keyring-from-reference): New procedures.
(authenticate-commits): Add #:keyring-reference and use
'load-keyring-from-reference'.
---
 build-aux/git-authenticate.scm | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm
index fc02f9ef66..632471ac74 100644
--- a/build-aux/git-authenticate.scm
+++ b/build-aux/git-authenticate.scm
@@ -24,7 +24,6 @@
 (use-modules (git)
              (guix git)
              (guix openpgp)
-             ((guix utils) #:select (config-directory))
              (guix base16)
              ((guix build utils) #:select (mkdir-p))
              (guix i18n)
@@ -323,15 +322,42 @@ key: ~a")
 
   signing-key)
 
+(define (load-keyring-from-blob repository oid keyring)
+  "Augment KEYRING with the keyring available in the blob at OID, which may or
+may not be ASCII-armored."
+  (let* ((blob (blob-lookup repository oid))
+         (port (open-bytevector-input-port (blob-content blob))))
+    (get-openpgp-keyring (if (port-ascii-armored? port)
+                             (open-bytevector-input-port (read-radix-64 port))
+                             port)
+                         keyring)))
+
+(define (load-keyring-from-reference repository reference)
+  "Load the '.key' files from the tree at REFERENCE in REPOSITORY and return
+an OpenPGP keyring."
+  (let* ((reference (reference-lookup repository reference))
+         (target    (reference-target reference))
+         (commit    (commit-lookup repository target))
+         (tree      (commit-tree commit)))
+    (fold (lambda (name keyring)
+            (if (string-suffix? ".key" name)
+                (let ((entry (tree-entry-bypath tree name)))
+                  (load-keyring-from-blob repository
+                                          (tree-entry-id entry)
+                                          keyring))
+                keyring))
+          %empty-keyring
+          (tree-list tree))))
+
 (define* (authenticate-commits repository commits
-                               #:key (report-progress (const #t)))
+                               #:key
+                               (keyring-reference "refs/heads/keyring")
+                               (report-progress (const #t)))
   "Authenticate COMMITS, a list of commit objects, calling REPORT-PROGRESS for
-each of them.  Return an alist showing the number of occurrences of each key."
-  (define keyring-file
-    (string-append (config-directory) "/keyrings/channels/guix.kbx"))
-
+each of them.  Return an alist showing the number of occurrences of each key.
+The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY."
   (define keyring
-    (call-with-input-file keyring-file get-openpgp-keyring))
+    (load-keyring-from-reference repository keyring-reference))
 
   (fold (lambda (commit stats)
           (report-progress)
-- 
cgit v1.2.3


From 05d973eef2488d647277dc3f1bde9d019f17eef5 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Sat, 2 May 2020 23:44:00 +0200
Subject: openpgp: Raise error conditions instead of calling 'error'.

* guix/openpgp.scm (&openpgp-error, &openpgp-unrecognized-packet-error)
(&openpgp-invalid-signature-error): New error conditions.
(openpgp-hash-algorithm): Add 'signature-port' parameter.  Raise an
error condition instead of calling 'error'.
(parse-subpackets): Likewise.
(get-data): Raise instead of calling 'error'.
(get-openpgp-detached-signature/ascii): Likewise.
(get-signature): Likewise.
---
 guix/openpgp.scm | 61 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 15 deletions(-)

diff --git a/guix/openpgp.scm b/guix/openpgp.scm
index 2b2997dcd4..9370c8ada8 100644
--- a/guix/openpgp.scm
+++ b/guix/openpgp.scm
@@ -31,6 +31,12 @@
             verify-openpgp-signature
             port-ascii-armored?
 
+            openpgp-error?
+            openpgp-unrecognized-packet-error?
+            openpgp-unrecognized-packet-error-port
+            openpgp-invalid-signature-error?
+            openpgp-invalid-signature-error-port
+
             openpgp-signature?
             openpgp-signature-issuer-key-id
             openpgp-signature-issuer-fingerprint
@@ -119,6 +125,19 @@
 (define (unixtime n)
   (time-monotonic->date (make-time 'time-monotonic 0 n)))
 
+;; Root of the error hierarchy.
+(define-condition-type &openpgp-error &error
+  openpgp-error?)
+
+;; Error raised when reading an unsupported or unrecognized packet tag.
+(define-condition-type &openpgp-unrecognized-packet-error &openpgp-error
+  openpgp-unrecognized-packet-error?
+  (port openpgp-unrecognized-packet-error-port))
+
+;; Error raised when reading an invalid signature packet.
+(define-condition-type &openpgp-invalid-signature-error &openpgp-error
+  (port openpgp-invalid-signature-error-port))
+
 
 ;;;
 ;;; Bitwise I/O.
@@ -312,7 +331,7 @@ hexadecimal format for fingerprints."
 (define HASH-SHA-512 10)
 (define HASH-SHA-224 11)
 
-(define (openpgp-hash-algorithm id)
+(define (openpgp-hash-algorithm id signature-port)
   (cond ((= id HASH-MD5) 'md5)
         ((= id HASH-SHA-1) 'sha1)
         ((= id HASH-RIPE-MD160) 'rmd160)
@@ -320,7 +339,9 @@ hexadecimal format for fingerprints."
         ((= id HASH-SHA-384) 'sha384)
         ((= id HASH-SHA-512) 'sha512)
         ((= id HASH-SHA-224) 'sha224)
-        (else (error "unknown hash algorithm" id))))
+        (else
+         (raise (condition
+                 (&openpgp-invalid-signature-error (port signature-port)))))))
 
 (define COMPRESSION-UNCOMPRESSED 0)
 (define COMPRESSION-ZIP 1)                      ;deflate
@@ -455,7 +476,7 @@ hexadecimal format for fingerprints."
      ((= tag PACKET-ONE-PASS-SIGNATURE)
       'one-pass-signature)                        ;TODO: implement
      (else
-      (error 'get-data "Unsupported packet type" tag)))))
+      (raise (condition (&openpgp-unrecognized-packet-error (port p))))))))
 
 (define-record-type 
   (make-openpgp-public-key version subkey? time value fingerprint)
@@ -509,7 +530,9 @@ signature."
           ((string=? type "PGP SIGNATURE")
            (get-packet (open-bytevector-input-port data)))
           (else
-           (error "expected PGP SIGNATURE" type)))))
+           (print "expected PGP SIGNATURE" type)
+           (raise (condition
+                   (&openpgp-invalid-signature-error (port port))))))))
 
 (define (hash-algorithm-name algorithm)        ;XXX: should be in Guile-Gcrypt
   "Return the name of ALGORITHM, a 'hash-algorithm' integer, as a symbol."
@@ -626,15 +649,17 @@ FINGERPRINT, a bytevector."
        (let-values (((hmlen type ctime keyid pkalg halg hashl16)
                      (get-integers p u8 u8 u32 u64 u8 u8 u16)))
          (unless (= hmlen 5)
-           (error "invalid signature packet"))
+           (raise (condition
+                   (&openpgp-invalid-signature-error (port p)))))
+
          (print "Signature type: " type " creation time: " (unixtime ctime))
-         (print "Hash algorithm: " (openpgp-hash-algorithm halg))
+         (print "Hash algorithm: " (openpgp-hash-algorithm halg p))
          (let ((value (get-sig p pkalg)))
            (unless (port-eof? p)
              (print "Trailing data in signature: " (get-bytevector-all p)))
            (make-openpgp-signature version type
                                    (public-key-algorithm pkalg)
-                                   (openpgp-hash-algorithm halg) hashl16
+                                   (openpgp-hash-algorithm halg p) hashl16
                                    (list (integers->bytevector u8 type
                                                                u32 ctime))
                                    ;; Emulate hashed subpackets
@@ -651,7 +676,7 @@ FINGERPRINT, a bytevector."
                       (get-bytevector-n p (get-u16 p)))
                      ((hashl16) (get-u16 p)))
          (print "Signature type: " type)
-         (print "Hash algorithm: " (openpgp-hash-algorithm halg))
+         (print "Hash algorithm: " (openpgp-hash-algorithm halg p))
          (let ((value (get-sig p pkalg)))
            (unless (port-eof? p)
              (print "Trailing data in signature: " (get-bytevector-all p)))
@@ -670,8 +695,8 @@ FINGERPRINT, a bytevector."
                                           u8 #xff
                                           u32 (+ 6 subpacket-len))))
                   (unhashed-subpackets
-                   (parse-subpackets unhashed-subpackets))
-                  (hashed-subpackets (parse-subpackets hashed-subpackets))
+                   (parse-subpackets unhashed-subpackets p))
+                  (hashed-subpackets (parse-subpackets hashed-subpackets p))
                   (subpackets        (append hashed-subpackets
                                              unhashed-subpackets))
                   (issuer-key-id     (assoc-ref subpackets 'issuer))
@@ -679,11 +704,14 @@ FINGERPRINT, a bytevector."
                                                 'issuer-fingerprint)))
              (unless (or (not issuer) (not issuer-key-id)
                          (key-id-matches-fingerprint? issuer-key-id issuer))
-               (error "issuer key id does not match fingerprint" issuer))
+               (print "issuer key id does not match fingerprint"
+                      issuer-key-id issuer)
+               (raise (condition
+                       (&openpgp-invalid-signature-error (port p)))))
 
              (make-openpgp-signature version type
                                      (public-key-algorithm pkalg)
-                                     (openpgp-hash-algorithm halg)
+                                     (openpgp-hash-algorithm halg p)
                                      hashl16
                                      append-data
                                      hashed-subpackets
@@ -694,7 +722,7 @@ FINGERPRINT, a bytevector."
        (print "Unsupported signature version: " version)
        'unsupported-signature-version))))
 
-(define (parse-subpackets bv)
+(define (parse-subpackets bv signature-port)
   (define (parse tag data)
     (let ((type (fxbit-field tag 0 7))
           (critical? (fxbit-set? tag 7)))
@@ -740,7 +768,8 @@ FINGERPRINT, a bytevector."
                               value)))))))
        ((= type SUBPACKET-PREFERRED-HASH-ALGORITHMS)
         (cons 'preferred-hash-algorithms
-              (map openpgp-hash-algorithm (bytevector->u8-list data))))
+              (map (cut openpgp-hash-algorithm <> signature-port)
+                   (bytevector->u8-list data))))
        ((= type SUBPACKET-PREFERRED-COMPRESSION-ALGORITHMS)
         (cons 'preferred-compression-algorithms
               (map compression-algorithm (bytevector->u8-list data))))
@@ -785,7 +814,9 @@ FINGERPRINT, a bytevector."
         ;; should be considered invalid.
         (print "Unknown subpacket type: " type)
         (if critical?
-            (error "unrecognized critical signature subpacket" type)
+            (raise (condition
+                    (&openpgp-unrecognized-packet-error
+                     (port signature-port))))
             (list 'unsupported-subpacket type data))))))
 
   (let ((p (open-bytevector-input-port bv)))
-- 
cgit v1.2.3


From 84133320b8fb70f093831203a028ed2ffb6082ce Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Sat, 2 May 2020 23:46:10 +0200
Subject: doc: Document committer authorization.

* doc/contributing.texi (Commit Access): Add instructions for
authorizing committers.
---
 doc/contributing.texi | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 31b875f817..0ec7a48b96 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -1192,13 +1192,23 @@ Maintainers ultimately decide whether to grant you commit access,
 usually following your referrals' recommendation.
 
 @item
+@cindex OpenPGP, signed commits
 If and once you've been given access, please send a message to
 @email{guix-devel@@gnu.org} to say so, again signed with the OpenPGP key
 you will use to sign commits (do that before pushing your first commit).
 That way, everyone can notice and ensure you control that OpenPGP key.
 
-@c TODO: Add note about adding the fingerprint to the list of authorized
-@c keys once that has stabilized.
+@quotation Important
+Before you can push for the first time, maintainers must:
+
+@enumerate
+@item
+add your OpenPGP key to the @code{keyring} branch;
+@item
+add your OpenPGP fingerprint to the @file{.guix-authorizations} file of
+the branch(es) you will commit to.
+@end enumerate
+@end quotation
 
 @item
 Make sure to read the rest of this section and... profit!
-- 
cgit v1.2.3


From 4a84deda7489f668cd833b59daeb504cbd87fa2b Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Sat, 2 May 2020 23:53:25 +0200
Subject: doc: Recommend against SHA1 OpenPGP signatures.

* doc/contributing.texi (Commit Access): Recommend against SHA1
signatures.
---
 doc/contributing.texi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 0ec7a48b96..9583120742 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -1187,6 +1187,16 @@ the OpenPGP key you will use to sign commits, and giving its fingerprint
 (see below).  See @uref{https://emailselfdefense.fsf.org/en/}, for an
 introduction to public-key cryptography with GnuPG.
 
+@c See .
+Set up GnuPG such that it never uses the SHA1 hash algorithm for digital
+signatures, which is known to be unsafe since 2019, for instance by
+adding the following line to @file{~/.gnupg/gpg.conf} (@pxref{GPG
+Esoteric Options,,, gnupg, The GNU Privacy Guard Manual}):
+
+@example
+digest-algo sha512
+@end example
+
 @item
 Maintainers ultimately decide whether to grant you commit access,
 usually following your referrals' recommendation.
-- 
cgit v1.2.3


From 1c5604017bcbab9bad6bf287ff89da0d9f35f93f Mon Sep 17 00:00:00 2001
From: Vincent Legoll 
Date: Mon, 4 May 2020 00:32:38 +0200
Subject: gnu: Add tng.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/chemistry.scm (tng): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/chemistry.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 855ae2df22..5b21e3309c 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2018 Efraim Flashner 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2020 Björn Höfling 
+;;; Copyright © 2020 Vincent Legoll 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -300,6 +301,41 @@ is currently not actively maintained and works only with Python 2 and
 NumPy < 1.9.")
     (license license:cecill)))
 
+(define-public tng
+  (package
+    (name "tng")
+    (version "1.8.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/gromacs/tng.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1apf2n8nb34z09xarj7k4jgriq283l769sakjmj5aalpbilvai4q"))))
+    (build-system cmake-build-system)
+    (inputs
+     `(("zlib" ,zlib)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-bundled-zlib
+           (lambda _
+             (delete-file-recursively "external")
+             #t))
+         (replace 'check
+           (lambda _
+             (invoke "../build/bin/tests/tng_testing")
+             #t)))))
+    (home-page "https://github.com/gromacs/tng")
+    (synopsis "Trajectory Next Generation binary format manipulation library")
+    (description "TRAJNG (Trajectory next generation) is a program library for
+handling molecular dynamics (MD) trajectories.  It can store coordinates, and
+optionally velocities and the H-matrix.  Coordinates and velocities are
+stored with user-specified precision.")
+    (license license:bsd-3)))
+
 (define-public openbabel
   (package
     (name "openbabel")
-- 
cgit v1.2.3


From feba2c97514b142e356a4927640a78b3cd21d327 Mon Sep 17 00:00:00 2001
From: Vincent Legoll 
Date: Mon, 4 May 2020 00:32:39 +0200
Subject: gnu: Add lmfit.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/algebra.scm (lmfit): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/algebra.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 34fb9ee4fd..d4f66d2ffd 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2017, 2019 Eric Bavier 
 ;;; Copyright © 2020 Björn Höfling 
 ;;; Copyright © 2020 Jakub Kądziołka 
+;;; Copyright © 2020 Vincent Legoll 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -913,6 +914,29 @@ Fourier Transform} (DFT), @dfn{Discrete Cosine Transform} (DCT), @dfn{Discrete
 Sine Transform} (DST) and @dfn{Discrete Hartley Transform} (DHT).")
     (license license:bsd-2)))
 
+(define-public lmfit
+  (package
+    (name "lmfit")
+    (version "8.2.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://jugit.fz-juelich.de/mlz/lmfit.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "00bch77a6qgnw6vzsjn2a42n8n683ih3xm0wpr454jxa15hw78vf"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("perl" ,perl)))                   ; for pod2man
+    (home-page "https://jugit.fz-juelich.de/mlz/lmfit")
+    (synopsis "Levenberg-Marquardt minimization and least-squares fitting")
+    (description "lmfit is a C library for Levenberg-Marquardt least-squares
+minimization and curve fitting.  It is mature code, based on decades-old
+algorithms from the FORTRAN library MINPACK.")
+    (license license:bsd-2)))
+
 (define-public eigen
   (package
     (name "eigen")
-- 
cgit v1.2.3


From 06ed1dba359aeb70f6da908ca5672c541c714ab1 Mon Sep 17 00:00:00 2001
From: Vincent Legoll 
Date: Mon, 4 May 2020 00:39:36 +0200
Subject: gnu: Add gromacs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/chemistry.scm (gromacs): New variable.
* gnu/packages/patches/gromacs-tinyxml2.patch: New file...
* gnu/local.mk (dist_patch_DATA): ...add it here.

Signed-off-by: Ludovic Courtès 
---
 gnu/local.mk                                |  1 +
 gnu/packages/chemistry.scm                  | 90 +++++++++++++++++++++++++++++
 gnu/packages/patches/gromacs-tinyxml2.patch | 67 +++++++++++++++++++++
 3 files changed, 158 insertions(+)
 create mode 100644 gnu/packages/patches/gromacs-tinyxml2.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3c9a10b6bc..827e186501 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1006,6 +1006,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gpsbabel-qstring.patch     		\
   %D%/packages/patches/grantlee-merge-theme-dirs.patch		\
   %D%/packages/patches/grep-timing-sensitive-test.patch		\
+  %D%/packages/patches/gromacs-tinyxml2.patch			\
   %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch	\
   %D%/packages/patches/grub-efi-fat-serial-number.patch		\
   %D%/packages/patches/gsl-test-i686.patch			\
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 5b21e3309c..0540dfceb6 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -30,15 +30,20 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gv)
   #:use-module (gnu packages maths)
+  #:use-module (gnu packages mpi)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages sphinx)
   #:use-module (gnu packages xml)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
@@ -336,6 +341,91 @@ optionally velocities and the H-matrix.  Coordinates and velocities are
 stored with user-specified precision.")
     (license license:bsd-3)))
 
+(define-public gromacs
+  (package
+    (name "gromacs")
+    (version "2020.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://ftp.gromacs.org/pub/gromacs/gromacs-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1wyjgcdl30wy4hy6jvi9lkq53bqs9fgfq6fri52dhnb3c76y8rbl"))
+              ;; Our version of tinyxml2 is far newer than the bundled one and
+              ;; require fixing `testutils' code. See patch header for more info
+              (patches (search-patches "gromacs-tinyxml2.patch"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests
+             ;; Unbundling
+             "-DGMX_USE_LMFIT=EXTERNAL"
+             "-DGMX_BUILD_OWN_FFTW=off"
+             "-DGMX_EXTERNAL_BLAS=on"
+             "-DGMX_EXTERNAL_LAPACK=on"
+             "-DGMX_EXTERNAL_TNG=on"
+             "-DGMX_EXTERNAL_ZLIB=on"
+             "-DGMX_EXTERNAL_TINYXML2=on"
+             (string-append "-DTinyXML2_DIR="
+                            (assoc-ref %build-inputs "tinyxml2"))
+             ;; Workaround for cmake/FindSphinx.cmake version parsing that does
+             ;; not understand the guix-wrapped `sphinx-build --version' answer
+             (string-append "-DSPHINX_EXECUTABLE_VERSION="
+                            ,(package-version python-sphinx)))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fixes
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Still bundled: part of gromacs, source behind registration
+             ;; but free software anyways
+             ;;(delete-file-recursively "src/external/vmd_molfile")
+             ;; Still bundled: threads-based OpenMPI-compatible fallback
+             ;; designed to be bundled like that
+             ;;(delete-file-recursively "src/external/thread_mpi")
+             ;; Unbundling
+             (delete-file-recursively "src/external/lmfit")
+             (delete-file-recursively "src/external/clFFT")
+             (delete-file-recursively "src/external/fftpack")
+             (delete-file-recursively "src/external/build-fftw")
+             (delete-file-recursively "src/external/tng_io")
+             (delete-file-recursively "src/external/tinyxml2")
+             (delete-file-recursively "src/external/googletest")
+             (copy-recursively (assoc-ref inputs "googletest-source")
+                               "src/external/googletest")
+             ;; This test warns about the build host hardware, disable
+             (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp"
+               (("TEST\\(HardwareTopologyTest, HwlocExecute\\)")
+                "void __guix_disabled()"))
+             #t)))))
+    (native-inputs
+     `(("doxygen" ,doxygen)
+       ("googletest-source" ,(package-source googletest))
+       ("graphviz" ,graphviz)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python)
+       ("python-pygments" ,python-pygments)
+       ("python-sphinx" ,python-sphinx)))
+    (inputs
+     `(("fftwf" ,fftwf)
+       ("hwloc" ,hwloc-2 "lib")
+       ("lmfit" ,lmfit)
+       ("openblas" ,openblas)
+       ("perl" ,perl)
+       ("tinyxml2" ,tinyxml2)
+       ("tng" ,tng)))
+    (home-page "http://www.gromacs.org/")
+    (synopsis "Molecular dynamics software package")
+    (description "GROMACS is a versatile package to perform molecular dynamics,
+i.e. simulate the Newtonian equations of motion for systems with hundreds to
+millions of particles.  It is primarily designed for biochemical molecules like
+proteins, lipids and nucleic acids that have a lot of complicated bonded
+interactions, but since GROMACS is extremely fast at calculating the nonbonded
+interactions (that usually dominate simulations) many groups are also using it
+for research on non-biological systems, e.g. polymers.  GROMACS supports all the
+usual algorithms you expect from a modern molecular dynamics implementation.")
+    (license license:lgpl2.1+)))
+
 (define-public openbabel
   (package
     (name "openbabel")
diff --git a/gnu/packages/patches/gromacs-tinyxml2.patch b/gnu/packages/patches/gromacs-tinyxml2.patch
new file mode 100644
index 0000000000..cc7d7459a8
--- /dev/null
+++ b/gnu/packages/patches/gromacs-tinyxml2.patch
@@ -0,0 +1,67 @@
+Unbundling tinyxml2 from gromacs and using our own, which is newer, broke gromacs
+build.
+
+This patch fixes three issues:
+
+- cmake now errors out if using multiple target_link_libraries with mixed styles
+  of signatures.
+
+- Error handling API changed, fix the testutils/refdata_xml.cpp code by using the
+  new API: document.ErrorStr() & tinyxml2::XML_SUCCESS.
+
+Those fixes will be submitted for inclusion to upstream, but may not be suitable
+there as long as they still keep the old version bundled.
+
+First hunk has already been requested for merging. Third is in discussion. Second
+will only be sent if third is OK'ed.
+
+diff -ruN gromacs-2020.2/src/testutils/CMakeLists.txt gromacs-2020.2-fixed/src/testutils/CMakeLists.txt
+--- gromacs-2020.2/src/testutils/CMakeLists.txt 2020-04-30 18:33:44.000000000 +0200
++++ gromacs-2020.2-fixed/src/testutils/CMakeLists.txt   2020-05-01 22:52:16.356000000 +0200
+@@ -73,7 +73,7 @@
+ 
+ if(HAVE_TINYXML2)
+     include_directories(SYSTEM ${TinyXML2_INCLUDE_DIR})
+-    target_link_libraries(testutils ${TinyXML2_LIBRARIES})
++    target_link_libraries(testutils PRIVATE ${TinyXML2_LIBRARIES})
+ else()
+     include_directories(BEFORE SYSTEM "../external/tinyxml2")
+ endif()
+diff -ruN gromacs-2020.2/src/testutils/refdata_xml.cpp gromacs-2020.2-fixed/src/testutils/refdata_xml.cpp
+--- gromacs-2020.2/src/testutils/refdata_xml.cpp        2020-04-30 18:33:44.000000000 +0200
++++ gromacs-2020.2-fixed/src/testutils/refdata_xml.cpp  2020-05-01 23:17:09.556000000 +0200
+@@ -206,21 +206,12 @@
+     document.LoadFile(path.c_str());
+     if (document.Error())
+     {
+-        const char* errorStr1 = document.GetErrorStr1();
+-        const char* errorStr2 = document.GetErrorStr2();
++        const char* errorStr = document.ErrorStr();
+         std::string errorString("Error was ");
+-        if (errorStr1)
+-        {
+-            errorString += errorStr1;
+-        }
+-        if (errorStr2)
+-        {
+-            errorString += errorStr2;
+-        }
+-        if (!errorStr1 && !errorStr2)
+-        {
++        if (errorStr)
++            errorString += errorStr;
++        else
+             errorString += "not specified.";
+-        }
+         GMX_THROW(TestException("Reference data not parsed successfully: " + path + "\n."
+                                 + errorString + "\n"));
+     }
+@@ -371,7 +362,7 @@
+     XMLElementPtr rootElement = createRootElement(&document);
+     createChildElements(rootElement, rootEntry);
+ 
+-    if (document.SaveFile(path.c_str()) != tinyxml2::XML_NO_ERROR)
++    if (document.SaveFile(path.c_str()) != tinyxml2::XML_SUCCESS)
+     {
+         GMX_THROW(TestException("Reference data saving failed in " + path));
+     }
-- 
cgit v1.2.3


From d074f73aacc5a39aed0202d6e45721f53f34a8c0 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Mon, 4 May 2020 10:43:52 +0200
Subject: .guix-authorizations: Add bricewge to the committers.

* .guix-authorizations: Add fingerprint for bricewge.
---
 .guix-authorizations | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.guix-authorizations b/.guix-authorizations
index 8caa827063..2142f88edb 100644
--- a/.guix-authorizations
+++ b/.guix-authorizations
@@ -37,6 +37,9 @@
    (name "boskovits"))
   ("DFC0 C7F7 9EE6 0CA7 AE55  5E19 6722 43C4 A03F 0EEE"
    (name "brettgilio"))
+  (;; primary: "8929 BBC5 73CD 9206 3DDD 979D 3D36 CAA0 116F 0F99"
+   "1C9B F005 1A1A 6A44 5257 599A A949 03A1 66A1 8FAE"
+   (name "bricewge"))
   (;; primary: "0401 7A2A 6D9A 0CCD C81D  8EC2 96AB 007F 1A7E D999"
    "09CD D25B 5244 A376 78F6  EEA8 0CC5 2153 1979 91A5"
    (name "carl"))
-- 
cgit v1.2.3


From 1f14e25c1969a93908288cb302a572f3cbbaa478 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Mon, 4 May 2020 10:50:18 +0200
Subject: doc: Add "Packages for C Development" section.

Suggested by Bruno Haible 
in .

* doc/guix.texi (Packages for C Development): New node.
(Application Setup)[The GCC toolchain]: Empty and refer to it.
---
 doc/guix.texi | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index d5d8662937..64e3c01a50 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1768,22 +1768,11 @@ can do so by running Emacs with the @code{--no-site-file} option
 
 @subsection The GCC toolchain
 
-@cindex GCC
-@cindex ld-wrapper
-
-Guix offers individual compiler packages such as @code{gcc} but if you
-are in need of a complete toolchain for compiling and linking source
-code what you really want is the @code{gcc-toolchain} package.  This
-package provides a complete GCC toolchain for C/C++ development,
-including GCC itself, the GNU C Library (headers and binaries, plus
-debugging symbols in the @code{debug} output), Binutils, and a linker
-wrapper.
-
-The wrapper's purpose is to inspect the @code{-L} and @code{-l} switches
-passed to the linker, add corresponding @code{-rpath} arguments, and
-invoke the actual linker with this new set of arguments.  You can instruct the
-wrapper to refuse to link against libraries not in the store by setting the
-@code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}.
+@c XXX: The contents of this section were moved under
+@c ``Development'', since it makes more sense there and is not specific
+@c foreign distros.  Remove it from here eventually?
+@xref{Packages for C Development}, for information on packages for C/C++
+development.
 
 @node Upgrading Guix
 @section Upgrading Guix
@@ -4681,6 +4670,7 @@ easily distributed to users who do not run Guix.
 @menu
 * Invoking guix environment::   Setting up development environments.
 * Invoking guix pack::          Creating software bundles.
+* Packages for C Development::  Working with C code with Guix.
 @end menu
 
 @node Invoking guix environment
@@ -5344,6 +5334,27 @@ In addition, @command{guix pack} supports all the common build options
 (@pxref{Common Build Options}) and all the package transformation
 options (@pxref{Package Transformation Options}).
 
+@node Packages for C Development
+@section Packages for C Development
+
+@cindex GCC
+@cindex ld-wrapper
+@cindex linker wrapper
+@cindex toolchain, for C development
+
+If you need a complete toolchain for compiling and linking C or C++
+source code, use the @code{gcc-toolchain} package.  This package
+provides a complete GCC toolchain for C/C++ development, including GCC
+itself, the GNU C Library (headers and binaries, plus debugging symbols
+in the @code{debug} output), Binutils, and a linker wrapper.
+
+The wrapper's purpose is to inspect the @code{-L} and @code{-l} switches
+passed to the linker, add corresponding @code{-rpath} arguments, and
+invoke the actual linker with this new set of arguments.  You can instruct the
+wrapper to refuse to link against libraries not in the store by setting the
+@code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}.
+
+
 
 @c *********************************************************************
 @node Programming Interface
-- 
cgit v1.2.3


From 06735a57a9cec47b5fe01d1c57960b723f52de0d Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Mon, 4 May 2020 10:51:39 +0200
Subject: openpgp: Add missing type predicate for
 '&openpgp-invalid-signature-error'.

Reported by brendyyn on #guix.  The mistake led to a macro expansion
error on Guile 2.2 but not on 3.0.2.

* guix/openpgp.scm (&openpgp-invalid-signature-error): Add missing type
predicate.
---
 guix/openpgp.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guix/openpgp.scm b/guix/openpgp.scm
index 9370c8ada8..b74f8ff5bf 100644
--- a/guix/openpgp.scm
+++ b/guix/openpgp.scm
@@ -136,6 +136,7 @@
 
 ;; Error raised when reading an invalid signature packet.
 (define-condition-type &openpgp-invalid-signature-error &openpgp-error
+  openpgp-invalid-signature-error?
   (port openpgp-invalid-signature-error-port))
 
 
-- 
cgit v1.2.3


From aea6ab2f4ca060e68f8539cd612b0ce088627557 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Mon, 4 May 2020 11:08:42 +0200
Subject: git-authenticate: Add missing import.

* build-aux/git-authenticate.scm: Import (guix utils), used by the cache
handling code and inadvertently removed in
041dc3a9c0694ada41b86115b9774a23c9d50f73.
---
 build-aux/git-authenticate.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm
index 632471ac74..7bb3af6ecb 100644
--- a/build-aux/git-authenticate.scm
+++ b/build-aux/git-authenticate.scm
@@ -25,6 +25,8 @@
              (guix git)
              (guix openpgp)
              (guix base16)
+             ((guix utils)
+              #:select (cache-directory with-atomic-file-output))
              ((guix build utils) #:select (mkdir-p))
              (guix i18n)
              (guix progress)
-- 
cgit v1.2.3


From c17e4cf5a3790a3925c8150ee903ac0876519b40 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 4 May 2020 15:39:37 +0200
Subject: gnu: python-dulwich: Update to 0.19.16.

* gnu/packages/python-xyz.scm (python-dulwich): Update to 0.19.16.
[propagated-inputs]: Add PYTHON-URLLIB3.
---
 gnu/packages/python-xyz.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 74280befea..037bc4ed5a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13088,7 +13088,7 @@ Features:
 (define-public python-dulwich
   (package
     (name "python-dulwich")
-    (version "0.18.6")
+    (version "0.19.16")
     (source
       (origin
         (method url-fetch)
@@ -13097,7 +13097,7 @@ Features:
                    (pypi-uri "dulwich" version)))
         (sha256
           (base32
-           "1aa1xfrxkc3j9s4xi0llhf5gndyi9ryprcxsqfa5fcb8ph34981q"))))
+           "0l589jl0lxx59yq0p6vmgw0q0hmfh48iqwyy0x6g1dmz93262igp"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -13117,7 +13117,8 @@ Features:
              (setenv "PYTHONHASHSEED" "random")
              #t)))))
     (propagated-inputs
-     `(("python-fastimport" ,python-fastimport)))
+     `(("python-fastimport" ,python-fastimport)
+       ("python-urllib3" ,python-urllib3)))
     (native-inputs
      `(("python-mock" ,python-mock)
        ("python-geventhttpclient" ,python-geventhttpclient)
-- 
cgit v1.2.3


From 1c60bd324402290133e17e132ffd92cf78590e8b Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 4 May 2020 16:20:25 +0200
Subject: gnu: leptonica: Do not propagate any inputs.

* gnu/packages/image.scm (leptonica)[propagated-inputs]: Move OPENJPEG and
LIBWEBP ...
[inputs]: ... here.
---
 gnu/packages/image.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 7b1d41cfa5..3f758b779d 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -599,10 +599,8 @@ collection of tools for doing simple manipulations of TIFF images.")
        ("libjpeg" ,libjpeg)
        ("libpng" ,libpng)
        ("libtiff" ,libtiff)
-       ("libwebp" ,libwebp)))
-    (propagated-inputs
-     ;; Linking a program with leptonica also requires these.
-     `(("openjpeg" ,openjpeg)
+       ("libwebp" ,libwebp)
+       ("openjpeg" ,openjpeg)
        ("zlib" ,zlib)))
     (arguments
      '(#:phases
-- 
cgit v1.2.3


From 08dfff747b2f6e11ed9b12a6a09cfa0178ec8083 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 4 May 2020 16:21:06 +0200
Subject: gnu: leptonica: Add giflib reference in Libtool- and pkg-config
 files.

* gnu/packages/image.scm (leptonica)[arguments]: Add phase
"provide-absolute-giflib-reference".
---
 gnu/packages/image.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 3f758b779d..eef73d68ab 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -612,7 +612,16 @@ collection of tools for doing simple manipulations of TIFF images.")
                 (string-append " " (which "sh") " "))
                (("which gnuplot")
                 "true"))
-             #t)))))
+             #t))
+         (add-after 'install 'provide-absolute-giflib-reference
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (giflib (assoc-ref inputs "giflib")))
+               ;; Add an absolute reference to giflib to avoid propagation.
+               (with-directory-excursion (string-append out "/lib")
+                 (substitute* '("liblept.la" "pkgconfig/lept.pc")
+                   (("-lgif") (string-append "-L" giflib "/lib -lgif"))))
+               #t))))))
     (home-page "http://www.leptonica.com/")
     (synopsis "Library and tools for image processing and analysis")
     (description
-- 
cgit v1.2.3


From c65e243463c704698288bad787cd6f5292280bba Mon Sep 17 00:00:00 2001
From: Alex McGrath 
Date: Sat, 2 May 2020 18:51:56 +0100
Subject: gnu: Add j4-dmenu-desktop.

* gnu/packages/xdisorg.scm (j4-dmenu-desktop): New variable.

Signed-off-by: Marius Bakke 
---
 gnu/packages/xdisorg.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index df61a95cbb..2d19dab137 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -36,6 +36,7 @@
 ;;; Copyright © 2020 Damien Cassou 
 ;;; Copyright © 2020 John Soo 
 ;;; Copyright © 2020 Boris A. Dekshteyn 
+;;; Copyright © 2020 Alex McGrath 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2324,3 +2325,34 @@ some kind of chat (in native language).
 @command{kbdd} also supports D-Bus signals, which makes it possible to
 create layout indicator widgets.")
     (license license:bsd-2)))
+
+(define-public j4-dmenu-desktop
+  (package
+    (name "j4-dmenu-desktop")
+    (version "2.17")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/enkore/j4-dmenu-desktop.git")
+                    (commit (string-append "r" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("catch2" ,catch-framework2)))
+    (arguments
+     `(#:configure-flags '("-DWITH_GIT_CATCH=off")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (invoke "./j4-dmenu-tests" "exclude:SearchPath/XDG_DATA_HOME"))))))
+    (synopsis "Fast desktop menu")
+    (description
+     "j4-dmenu-desktop is a replacement for i3-dmenu-desktop.  Its purpose
+is to find @file{.desktop} files and offer you a menu to start an application
+using @command{dmenu}.")
+    (home-page "https://github.com/enkore/j4-dmenu-desktop")
+    (license license:gpl3+)))
-- 
cgit v1.2.3


From 2b68ba721c153b4a4d2f886142985983dcf92429 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 4 May 2020 14:23:58 +0200
Subject: gnu: gnome-weather: Add wrapper to fix runtime failure.

Fixes .  Reported by sirgazil .

* gnu/packages/gnome.scm (gnome-weather)[arguments]: Add #:glib-or-gtk?.  Add
phase to wrap the executable with GTK+ variables.
---
 gnu/packages/gnome.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cd986af643..2c0a862c93 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7768,7 +7768,8 @@ associations for GNOME.")
       ("gnome-desktop" ,gnome-desktop)
       ("libgweather" ,libgweather)))
    (arguments
-    `(#:phases
+    `(#:glib-or-gtk? #t
+      #:phases
       (modify-phases %standard-phases
         (add-after 'install 'fix-desktop-file
           ;; FIXME: "gapplication launch org.gnome.Weather" fails for some reason.
@@ -7777,7 +7778,16 @@ associations for GNOME.")
             (let* ((out (assoc-ref outputs "out"))
                    (applications (string-append out "/share/applications")))
               (substitute* (string-append applications "/org.gnome.Weather.desktop")
-                (("Exec=.*") "Exec=gnome-weather\n"))))))))
+                (("Exec=.*") "Exec=gnome-weather\n"))
+              #t)))
+        (add-after 'install 'wrap
+          (lambda* (#:key inputs outputs #:allow-other-keys)
+            (let ((out               (assoc-ref outputs "out"))
+                  (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
+              ;; GNOME Weather needs the typelib files of GTK+, Pango etc at runtime.
+              (wrap-program (string-append out "/bin/gnome-weather")
+                `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
+              #t))))))
    (synopsis "Weather monitoring for GNOME desktop")
    (description "GNOME Weather is a small application that allows you to
 monitor the current weather conditions for your city, or anywhere in the
-- 
cgit v1.2.3


From 7d7fedf6f022e6114959684658f927e191ab40b1 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 4 May 2020 14:39:56 +0200
Subject: gnu: gnome-maps: Add missing input.

Fixes .  Reported by sirgazil .

* gnu/packages/geo.scm (gnome-maps)[inputs]: Add EVOLUTION-DATA-SERVER.
---
 gnu/packages/geo.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index d78e2e0f11..9268a3f5b4 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -193,7 +193,8 @@ topology functions.")
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("folks" ,folks)
+     `(("evolution-data-server" ,evolution-data-server)
+       ("folks" ,folks)
        ("libchamplain" ,libchamplain)
        ("libgee" ,libgee)
        ("libsecret" ,libsecret)
-- 
cgit v1.2.3


From be7e82f05700595da53a7b6c3df81dc5a056badb Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 4 May 2020 14:41:46 +0200
Subject: gnu: gnome-maps: Do not propagate GTK+.

* gnu/packages/geo.scm (gnome-maps)[propagated-inputs]: Remove.
[inputs]: Add GTK+.
---
 gnu/packages/geo.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 9268a3f5b4..7ba5702a84 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -210,10 +210,9 @@ topology functions.")
        ("glib" ,glib)
        ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("gtk+" ,gtk+)
        ("rest" ,rest)
        ("webkitgtk" ,webkitgtk)))
-    (propagated-inputs
-     `(("gtk+3" ,gtk+)))
     (synopsis "Graphical map viewer and wayfinding program")
     (description "GNOME Maps is a graphical map viewer.  It uses map data from
 the OpenStreetMap project.  It can provide directions for walking, bicycling,
-- 
cgit v1.2.3


From f7d34fcd7ce81968d282d8cb6145536241dda2fd Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 4 May 2020 14:43:58 +0200
Subject: gnu: gnome-maps: Remove obsolete input.

* gnu/packages/geo.scm (gnome-maps)[native-inputs]: Remove INTLTOOL.  Add
GETTEXT-MINIMAL.
---
 gnu/packages/geo.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 7ba5702a84..6c68d4064d 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -189,8 +189,8 @@ topology functions.")
                                                  ,geocode-glib-path)))
                #t))))))
     (native-inputs
-     `(("gobject-introspection" ,gobject-introspection)
-       ("intltool" ,intltool)
+     `(("gettext" ,gettext-minimal)
+       ("gobject-introspection" ,gobject-introspection)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("evolution-data-server" ,evolution-data-server)
-- 
cgit v1.2.3


From 68c7f577d8cbb1a11a812e36c7ae1e34ccc57e62 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 4 May 2020 17:27:17 +0200
Subject: gnu: hplip: Fix build with Python 3.8.

* gnu/packages/cups.scm (hplip)[arguments]: Add phase "fix-build-with-python-3.8".
---
 gnu/packages/cups.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 9161b7bccb..b253d0604e 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2017 Leo Famulari 
 ;;; Copyright © 2017 Mark H Weaver 
 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice 
+;;; Copyright © 2020 Marius Bakke 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -536,7 +537,20 @@ should only be used as part of the Guix cups-pk-helper service.")
                   (string-append "rulessystemdir = " out
                                  "/lib/systemd/system"))
                  (("/etc/sane.d")
-                  (string-append out "/etc/sane.d"))))))
+                  (string-append out "/etc/sane.d")))
+               #t)))
+         (add-before 'configure 'fix-build-with-python-3.8
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((python (assoc-ref inputs "python")))
+               ;; XXX: The configure script of looks for Python headers in the
+               ;; wrong places as of version 3.20.3.  Help it by adding the
+               ;; include directory on C_INCLUDE_PATH.
+               (when python
+                 (setenv "C_INCLUDE_PATH"
+                         (string-append python "/include/python"
+                                        (python:python-version python)
+                                        ":" (getenv "C_INCLUDE_PATH"))))
+               #t)))
          (add-after 'install 'install-models-dat
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
-- 
cgit v1.2.3


From c63bd847816061e76389e93dc094df98800f081b Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Sat, 2 May 2020 15:43:37 +0100
Subject: gnu: python-s3transfer: Fix build with Python 3.8.

* gnu/packages/python-web.scm (python-s3transfer)[arguments]: Add a 'patch
phase to fix a test to work under Python 3.8.
---
 gnu/packages/python-web.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 27749246d8..56887ef9d4 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2204,6 +2204,15 @@ Betamax.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             ;; There's a small issue with one test with Python 3.8, this
+             ;; change has been suggested upstream:
+             ;; https://github.com/boto/s3transfer/pull/164
+             (substitute* "tests/unit/test_s3transfer.py"
+               (("super\\(FailedDownloadParts, self\\)\\.submit\\(function\\)")
+                "futures.Future()"))
+             #t))
          (replace 'check
            (lambda _
              ;; Some of the 'integration' tests require network access or
-- 
cgit v1.2.3


From bc2529cb97d35e3646be6e36f2c6a038cdd4fb8c Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun 
Date: Tue, 28 Apr 2020 10:50:10 +0200
Subject: gnu: Add collectd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/monitoring.scm (collectd): New variable
* gnu/local.mk (dist_patch_DATA): Add new patch
* gnu/packages/patches/collectd-5.11.0-noinstallvar.patch: New file

Signed-off-by: Ludovic Courtès 
---
 gnu/local.mk                                       |  1 +
 gnu/packages/monitoring.scm                        | 51 +++++++++++++++++++++-
 .../patches/collectd-5.11.0-noinstallvar.patch     | 21 +++++++++
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/collectd-5.11.0-noinstallvar.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 827e186501..daacb1992a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -819,6 +819,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/clucene-pkgconfig.patch			\
   %D%/packages/patches/cmake-curl-certificates.patch		\
   %D%/packages/patches/coda-use-system-libs.patch		\
+  %D%/packages/patches/collectd-5.11.0-noinstallvar.patch		\
   %D%/packages/patches/combinatorial-blas-awpm.patch		\
   %D%/packages/patches/combinatorial-blas-io-fix.patch		\
   %D%/packages/patches/containerd-test-with-go1.13.patch		\
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 8da31d6a84..d88bbc3aa3 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2018 Gábor Boskovits 
 ;;; Copyright © 2018, 2019 Oleg Pykhalov 
 ;;; Copyright © 2020 Alex ter Weele 
+;;; Copyright © 2020 Lars-Dominik Braun 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,6 +33,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix utils)
+  #:use-module (gnu packages)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
@@ -48,11 +50,14 @@
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages rrdtool)
   #:use-module (gnu packages time)
-  #:use-module (gnu packages tls))
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages web))
 
 (define-public nagios
   (package
@@ -445,3 +450,47 @@ written in Go with pluggable metric collectors.")
     (description "This package provides a file system monitor.")
     (home-page "https://github.com/emcrisostomo/fswatch")
     (license license:gpl3+)))
+
+(define-public collectd
+  (package
+    (name "collectd")
+    (version "5.11.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://storage.googleapis.com/collectd-tarballs/collectd-"
+                    version
+                    ".tar.bz2"))
+              (sha256
+               (base32
+                "1cjxksxdqcqdccz1nbnc2fp6yy84qq361ynaq5q8bailds00mc9p"))
+              (patches (search-patches "collectd-5.11.0-noinstallvar.patch"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags (list "--localstatedir=/var" "--sysconfdir=/etc")
+       #:phases (modify-phases %standard-phases
+                  (add-before 'configure 'autoreconf
+                    (lambda _
+                      ;; Required because of patched sources.
+                      (invoke "autoreconf" "-vfi"))))))
+    (inputs
+     `(("rrdtool" ,rrdtool)
+       ("curl" ,curl)
+       ("libyajl" ,libyajl)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://collectd.org/")
+    (synopsis "Collect system and application performance metrics periodically")
+    (description
+     "collectd gathers metrics from various sources such as the operating system,
+applications, log files and external devices, and stores this information or
+makes it available over the network.  Those statistics can be used to monitor
+systems, find performance bottlenecks (i.e., performance analysis) and predict
+future system load (i.e., capacity planning).")
+    ;; license:expat for the daemon in src/daemon/ and some plugins,
+    ;; license:gpl2 for other plugins
+    (license (list license:expat license:gpl2))))
+
diff --git a/gnu/packages/patches/collectd-5.11.0-noinstallvar.patch b/gnu/packages/patches/collectd-5.11.0-noinstallvar.patch
new file mode 100644
index 0000000000..39cd9c763e
--- /dev/null
+++ b/gnu/packages/patches/collectd-5.11.0-noinstallvar.patch
@@ -0,0 +1,21 @@
+Disable creation of /var and /etc
+
+--- a/Makefile.am	2020-03-08 16:57:09.511535600 +0100
++++ b/Makefile.am	2020-04-21 11:36:49.827182272 +0200
+@@ -2376,16 +2376,6 @@
+ endif
+ 
+ install-exec-hook:
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+-	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
+-	then \
+-		$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
+-	else \
+-		$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
+-	fi; \
+ 	$(mkinstalldirs) $(DESTDIR)$(cpkgdatadir)
+ 	$(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(cpkgdatadir)/types.db;
+ 	$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \
-- 
cgit v1.2.3


From 9dbc7f50ab698e952b19e4f12476956be2fa43c4 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Mon, 4 May 2020 14:58:26 +0200
Subject: doc: Remove prompt from X.509 examples.

* doc/guix.texi (X.509 Certificates): Remove leading "$".
---
 doc/guix.texi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 64e3c01a50..0020739aec 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -26085,10 +26085,10 @@ pointed to by the @code{GIT_SSL_CAINFO} environment variable.  Thus, you
 would typically run something like:
 
 @example
-$ guix install nss-certs
-$ export SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs"
-$ export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
-$ export GIT_SSL_CAINFO="$SSL_CERT_FILE"
+guix install nss-certs
+export SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs"
+export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
+export GIT_SSL_CAINFO="$SSL_CERT_FILE"
 @end example
 
 As another example, R requires the @code{CURL_CA_BUNDLE} environment
@@ -26096,8 +26096,8 @@ variable to point to a certificate bundle, so you would have to run
 something like this:
 
 @example
-$ guix install nss-certs
-$ export CURL_CA_BUNDLE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
+guix install nss-certs
+export CURL_CA_BUNDLE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
 @end example
 
 For other applications you may want to look up the required environment
-- 
cgit v1.2.3


From a17ab977fe4532733d8258fa9f94083f58ee4549 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Mon, 4 May 2020 18:26:24 +0200
Subject: gnu: Add purple-mattermost.

* gnu/packages/messaging.scm (purple-mattermost): New variable.
---
 gnu/packages/messaging.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3dbf010631..f14a4fd179 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -266,6 +266,51 @@ access to servers running the Discord protocol.")
     (home-page "https://github.com/sm00th/bitlbee-discord/")
     (license license:gpl2+)))
 
+(define-public purple-mattermost
+  (package
+    (name "purple-mattermost")
+    (version "1.2")
+    (home-page "https://github.com/EionRobb/purple-mattermost")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference (url home-page)
+                                  (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0fm49iv58l09qpy8vkca3am642fxiwcrrh6ykimyc2mas210b5g2"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      ;; Adjust the makefile to install files in the right
+                      ;; place.
+                      (let ((out (assoc-ref outputs "out")))
+                        (substitute* "Makefile"
+                          (("MATTERMOST_DEST = .*")
+                           (string-append "MATTERMOST_DEST = " out
+                                          "/lib/purple-2\n")) ;XXX: hardcoded
+                          (("MATTERMOST_ICONS_DEST = .*")
+                           (string-append "MATTERMOST_ICONS_DEST = "
+                                          out
+                                          "/share/pixmaps/pidgin/protocols\n")))
+                        #t))))
+       #:make-flags (list "CC=gcc"
+                          ,(string-append "PLUGIN_VERSION=" version))
+       #:tests? #f))
+    (inputs `(("glib" ,glib)
+              ("json-glib" ,json-glib)
+              ("discount" ,discount)
+              ("pidgin" ,pidgin)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (synopsis "Purple plug-in to access Mattermost instant messaging")
+    (description
+     "Purple-Mattermost is a plug-in for Purple, the instant messaging library
+used by Pidgin and Bitlbee, among others, to access
+@uref{https://mattermost.com/, Mattermost} servers.")
+    (license license:gpl3+)))
+
 (define-public hexchat
   (package
     (name "hexchat")
-- 
cgit v1.2.3


From 0e680920b9e54d7c8a901b1c9cf02ce4468f44ed Mon Sep 17 00:00:00 2001
From: Michael Rohleder 
Date: Sun, 3 May 2020 13:09:15 +0200
Subject: gnu: Add lesspipe.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/less.scm (lesspipe): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/less.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm
index 91c269a67e..76a4d42dfd 100644
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov 
 ;;; Copyright © 2019 Tobias Geerinckx-Rice 
+;;; Copyright © 2020 Michael Rohleder 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,8 +21,11 @@
 (define-module (gnu packages less)
   #:use-module (guix licenses)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages file)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu))
 
 (define-public less
@@ -48,3 +52,43 @@ backwards and forwards movement through the document.  It also does not have
 to read the entire input file before starting, so it starts faster than most
 text editors.")
     (license gpl3+))) ; some files are under GPLv2+
+
+(define-public lesspipe
+  (package
+    (name "lesspipe")
+    (version "1.84")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/wofr06/lesspipe.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "124ffhzrikr88ab14rk6753n8adxijpmg7q3zx7nmqc52wpkfd8q"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f                      ; no tests
+       #:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (delete-file "Makefile") ; force generating
+                        (invoke "./configure"
+                                (string-append "--prefix=" out)
+                                "--yes")
+                        #t))))))
+    (inputs
+     `(("file" ,file)
+       ("ncurses" ,ncurses)))  ; for tput
+    (native-inputs `(("perl" ,perl)))
+    (home-page "https://github.com/wofr06/lesspipe")
+    (synopsis "Input filter for less")
+    (description "To browse files, the excellent viewer @code{less} can be
+used.  By setting the environment variable @code{LESSOPEN}, less can be
+enhanced by external filters to become more powerful.  The input filter for
+less described here is called @code{lesspipe.sh}.  It is able to process a
+wide variety of file formats.  It enables users to inspect archives and
+display their contents without having to unpack them before.  The filter is
+easily extensible for new formats.")
+    (license gpl2+)))
-- 
cgit v1.2.3


From 49279343acb25ec93cbb33649d7126b3757e228f Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 5 May 2020 00:36:39 +0200
Subject: gnu: cmark: Fix test failure with Python 3.8.

* gnu/packages/markup.scm (cmark)[source](modules, snippet): New fields.
---
 gnu/packages/markup.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
index c1fc71b0a2..240bb9e8f4 100644
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2016, 2019 Efraim Flashner 
 ;;; Copyright © 2017 ng0 
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice 
+;;; Copyright © 2020 Marius Bakke 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -205,7 +206,16 @@ implementation.
              (file-name (git-file-name name version))
              (sha256
               (base32
-               "0r7jpqhgnssq444i8pwji2g36058vfzwkl70wbiwj13h4w5rfc8f"))))
+               "0r7jpqhgnssq444i8pwji2g36058vfzwkl70wbiwj13h4w5rfc8f"))
+             (modules '((guix build utils)))
+             (snippet
+              '(begin
+                 ;; Mimic upstream commit 68c3a91166347 to fix a test failure
+                 ;; when using Python 3.8.  Remove for versions > 0.29.
+                 ;; See .
+                 (substitute* "test/normalize.py"
+                   (("cgi") "html"))
+                 #t))))
     (build-system cmake-build-system)
     (arguments
      '(#:test-target "test"))
-- 
cgit v1.2.3


From 31def9a9df583dd27f8604302700ff48368c43f3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 21 Apr 2020 13:56:33 +0300
Subject: gnu: Add grocsvs.

* gnu/packages/bioinformatics.scm (grocsvs): New variable.
* gnu/packages/patches/grocsvs-dont-use-admiral.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/bioinformatics.scm                    | 42 +++++++++++++
 .../patches/grocsvs-dont-use-admiral.patch         | 69 ++++++++++++++++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 gnu/packages/patches/grocsvs-dont-use-admiral.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index daacb1992a..0797efb93e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1007,6 +1007,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gpsbabel-qstring.patch     		\
   %D%/packages/patches/grantlee-merge-theme-dirs.patch		\
   %D%/packages/patches/grep-timing-sensitive-test.patch		\
+  %D%/packages/patches/grocsvs-dont-use-admiral.patch		\
   %D%/packages/patches/gromacs-tinyxml2.patch			\
   %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch	\
   %D%/packages/patches/grub-efi-fat-serial-number.patch		\
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 65b44568e0..40f75e9e0c 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -79,6 +79,7 @@
   #:use-module (gnu packages golang)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages graph)
+  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
@@ -15853,3 +15854,44 @@ biological processes.  SBML is useful for models of metabolism, cell
 signaling, and more.  It continues to be evolved and expanded by an
 international community.")
     (license license:lgpl2.1+)))
+
+(define-public grocsvs
+  ;; The last release is out of date and new features have been added.
+  (let ((commit "ecd956a65093a0b2c41849050e4512d46fecea5d")
+        (revision "1"))
+    (package
+      (name "grocsvs")
+      (version (git-version "0.2.6.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/grocsvs/grocsvs")
+                       (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32 "14505725gr7qxc17cxxf0k6lzcwmgi64pija4mwf29aw70qn35cc"))
+                (patches (search-patches "grocsvs-dont-use-admiral.patch"))))
+      (build-system python-build-system)
+      (arguments
+       `(#:tests? #f            ; No test suite.
+         #:python ,python-2))   ; Only python-2 supported.
+      (inputs
+       `(("python2-h5py" ,python2-h5py)
+         ("python2-ipython-cluster-helper" ,python2-ipython-cluster-helper)
+         ("python2-networkx" ,python2-networkx)
+         ("python2-psutil" ,python2-psutil)
+         ("python2-pandas" ,python2-pandas)
+         ("python2-pybedtools" ,python2-pybedtools)
+         ("python2-pyfaidx" ,python2-pyfaidx)
+         ("python2-pygraphviz" ,python2-pygraphviz)
+         ("python2-pysam" ,python2-pysam)
+         ("python2-scipy" ,python2-scipy)))
+      (home-page "https://github.com/grocsvs/grocsvs")
+      (synopsis "Genome-wide reconstruction of complex structural variants")
+      (description
+       "@dfn{Genome-wide Reconstruction of Complex Structural Variants}
+(GROC-SVs) is a software pipeline for identifying large-scale structural
+variants, performing sequence assembly at the breakpoints, and reconstructing
+the complex structural variants using the long-fragment information from the
+10x Genomics platform.")
+       (license license:expat))))
diff --git a/gnu/packages/patches/grocsvs-dont-use-admiral.patch b/gnu/packages/patches/grocsvs-dont-use-admiral.patch
new file mode 100644
index 0000000000..cb976e19b0
--- /dev/null
+++ b/gnu/packages/patches/grocsvs-dont-use-admiral.patch
@@ -0,0 +1,69 @@
+python-admiral doesn't have a license
+https://github.com/nspies/admiral/issues/3
+
+diff --git a/setup.py b/setup.py
+index 692b6a0..568f381 100755
+--- a/setup.py
++++ b/setup.py
+@@ -20,7 +20,7 @@ setup(
+         'console_scripts' : ["grocsvs = grocsvs.main:main"]
+     },
+ 
+-    install_requires = ["admiral", "h5py", "networkx>=2.0", "pandas", "pybedtools", 
++    install_requires = ["h5py", "networkx>=2.0", "pandas", "pybedtools", 
+                         "pyfaidx", "pysam>=0.10.0", "scipy", "ipython-cluster-helper",
+                         "pygraphviz", "psutil"],
+ 
+diff --git a/src/grocsvs/jobmanagers.py b/src/grocsvs/jobmanagers.py
+index 6da0b58..112d7ff 100755
+--- a/src/grocsvs/jobmanagers.py
++++ b/src/grocsvs/jobmanagers.py
+@@ -41,34 +41,3 @@ class MultiprocessingCluster(Cluster):
+         pool = multiprocessing.Pool(processes=self.processes)
+         return pool.map_async(fn, args).get(999999)
+ 
+-
+-class AdmiralCluster(Cluster):
+-    def map(self, fn, args):
+-        from admiral import jobmanagers, remote
+-
+-        cluster_options = self.cluster_settings.cluster_options.copy()
+-        
+-        scheduler = cluster_options.pop("scheduler")
+-
+-        jobmanager_class = jobmanagers.get_jobmanager(scheduler)
+-        jobmanager = jobmanager_class(
+-            batch_dir=self.batch_dir, log_dir=self.batch_dir)
+-
+-
+-        if not "mem" in cluster_options:
+-            cluster_options["mem"] = "16g"
+-        if not "time" in cluster_options:
+-            cluster_options["time"] = "12h"
+-
+-        jobs = []
+-        #for i, arg in enumerate(args):
+-
+-        job_name = args[0].__class__.__name__
+-        args = [[arg] for arg in args]
+-        job = remote.run_remote(fn, jobmanager, job_name, args=args,
+-                                array=True, overwrite=True, **cluster_options)
+-
+-        result = jobmanagers.wait_for_jobs([job], wait=5, progress=True)
+-
+-        if not result:
+-            raise Exception("Some chunks failed to complete")
+diff --git a/src/grocsvs/pipeline.py b/src/grocsvs/pipeline.py
+index ab1bb2d..350976f 100755
+--- a/src/grocsvs/pipeline.py
++++ b/src/grocsvs/pipeline.py
+@@ -8,8 +8,7 @@ from grocsvs import utilities
+ def make_jobmanager(jobmanager_settings, processes, batch_dir):
+     jobmanager_classes = {"IPCluster":jobmanagers.IPCluster,
+                           "local":    jobmanagers.LocalCluster,
+-                          "multiprocessing": jobmanagers.MultiprocessingCluster,
+-                          "admiral": jobmanagers.AdmiralCluster}
++                          "multiprocessing": jobmanagers.MultiprocessingCluster}
+ 
+     cls = jobmanager_classes[jobmanager_settings.cluster_type]
+     return cls(processes, jobmanager_settings, batch_dir)
-- 
cgit v1.2.3


From f292feb3c22cb0a31d33fb1c4e0b2a10fafc4999 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 11:21:05 +0100
Subject: gnu: Update rust-unicode-normalization-0.1 to 0.1.9.

* gnu/packages/crates-io.scm (rust-unicode-normalization-0.1): Update to
  0.1.9.
---
 gnu/packages/crates-io.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d318a05d71..20e0b52e2f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23202,7 +23202,7 @@ with the Unicode character database.")
 (define-public rust-unicode-normalization-0.1
   (package
     (name "rust-unicode-normalization")
-    (version "0.1.8")
+    (version "0.1.9")
     (source
      (origin
        (method url-fetch)
@@ -23210,8 +23210,7 @@ with the Unicode character database.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "09i49va90rvia1agvgni4gicnqv50y5zy1naw8mr8bcqifh3j4ql"))))
+        (base32 "1kviyqg3bmds4p5hgwf9qgihw8xxvq7ljgyrrk7ygxa2k450gj09"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
cgit v1.2.3


From 9aff4bff1871620c3949c85228155f639c564935 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 22:29:32 +0200
Subject: gnu: Update rust-wasm-bindgen-futures-0.3 to 0.3.27.

* gnu/packages/crates-io.scm (rust-wasm-bindgen-futures-0.3): Update to
  0.3.27.
---
 gnu/packages/crates-io.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 20e0b52e2f..5648459d8a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24260,7 +24260,7 @@ in Rust.")
   (package
     (inherit rust-wasm-bindgen-futures-0.4)
     (name "rust-wasm-bindgen-futures")
-    (version "0.3.24")
+    (version "0.3.27")
     (source
      (origin
        (method url-fetch)
@@ -24268,8 +24268,7 @@ in Rust.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0bf9x6qfjczspc4zs605z1n4j15cdd8kk2z7rah0yggw8b6zl5nc"))))
+        (base32 "073p71skp91d9v2wczl6k7z9p0w25vn43br2v2g1ncbc6hvhnhl3"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-- 
cgit v1.2.3


From 8cc67deab3224de96125b72bb82a7f244a5332be Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 22:34:03 +0200
Subject: gnu: Update rust-wasm-bindgen-test-0.2 to 0.2.50.

* gnu/packages/crates-io.scm (rust-wasm-bindgen-test-0.2): Update to 0.2.50.
---
 gnu/packages/crates-io.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5648459d8a..1e4ccb7ea2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24395,7 +24395,7 @@ attribute that is not in the shared backend crate.")
   (package
     (inherit rust-wasm-bindgen-test-0.3)
     (name "rust-wasm-bindgen-test")
-    (version "0.2.48")
+    (version "0.2.50")
     (source
      (origin
        (method url-fetch)
@@ -24403,8 +24403,7 @@ attribute that is not in the shared backend crate.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0gwslc2sfkghzzb3r0gvd8i5rig2nlqgpl1rn43y2w4mr1ci494k"))))
+        (base32 "1h96phc1dmwwqn46k05j2y1mc3ljazh8f1gqqy0x8hm7ccxnknd2"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-- 
cgit v1.2.3


From 85ab6fd85339b7ea934d822d5f5d08453afceb35 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 12:06:07 +0100
Subject: gnu: Add rust-ascii-canvas-2.

* gnu/packages/crates-io.scm (rust-ascii-canvas-2): New variable.
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1e4ccb7ea2..8c7649f496 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2019 Giacomo Leidi 
 ;;; Copyright © 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019, 2020 John Soo 
+;;; Copyright © 2019, 2020 Hartmut Goebel 
 ;;; Copyright © 2020 Jakub Kądziołka 
 ;;; Copyright © 2020 Leo Famulari 
 ;;;
@@ -847,6 +848,31 @@ standard library.")
         ("rust-serde" ,rust-serde-1.0)
         ("rust-serde-test" ,rust-serde-test-1.0))))))
 
+(define-public rust-ascii-canvas-2
+  (package
+    (name "rust-ascii-canvas")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ascii-canvas" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0a9s8vrbc5jr6ry5ygjyfqmbs9gyya1v6dsxzsczpai8z4nvg3pz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t  ;; TODO: failes due to an unresolved import
+       #:cargo-inputs
+       (("rust-term" ,rust-term-0.5))))
+    (home-page "https://github.com/nikomatsakis/ascii-canvas")
+    (synopsis "Simple canvas for drawing lines and styled text and emitting to
+the terminal")
+    (description "@code{ASCII} canvas is a simple Rust library that allows you
+to draw lines and colored text and then write them to the terminal.  It uses
+the term library to handle the ANSI nonsense and hence it works on Windows,
+Mac, and Unix.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-assert-matches-1.3
   (package
     (name "rust-assert-matches")
-- 
cgit v1.2.3


From af6dccfd3f975393cc77951155c4b360daa95fe5 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 13:59:10 +0100
Subject: gnu: Add rust-assert-cli-0.6.

* gnu/packages/crates-io.scm (rust-assert-cli-0.6): New variable.
---
 gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8c7649f496..e50692eaba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30,6 +30,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
@@ -873,6 +874,34 @@ the term library to handle the ANSI nonsense and hence it works on Windows,
 Mac, and Unix.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-assert-cli-0.6
+  (package
+    (name "rust-assert-cli")
+    (version "0.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "assert-cli" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jc1bh3cvnl66bl7s5gr1xnm0hl8d2l3gmil0pmhp5v2xp0bg6m2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;; requires `printenv`, but installing coreutils doesn't help
+       #:cargo-inputs
+       (("rust-colored" ,rust-colored-1.9)
+        ("rust-difference" ,rust-difference-2.0)
+        ("rust-environment" ,rust-environment-0.1)
+        ("rust-failure" ,rust-failure-0.1)
+        ("rust-failure-derive" ,rust-failure-derive-0.1)
+        ("rust-serde-json" ,rust-serde-json-1.0))
+       #:cargo-development-inputs
+       (("rust-docmatic" ,rust-docmatic-0.1))))
+    (home-page "https://github.com/assert-rs/assert_cli")
+    (synopsis "Test CLI Applications")
+    (description "This package helps testing CLI Applications.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-assert-matches-1.3
   (package
     (name "rust-assert-matches")
-- 
cgit v1.2.3


From 1a6262407a1a41da9b1dc85dc24ae5c174f74460 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 22:44:05 +0200
Subject: gnu: Add rust-base64-0.9.

* gnu/packages/crates-io.scm (rust-base64-0.9): New variable.
---
 gnu/packages/crates-io.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e50692eaba..ba602a27b5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1153,6 +1153,25 @@ trace (backtrace) at runtime in a Rust program.")
        (("rust-criterion" ,rust-criterion-0.2)
         ("rust-rand" ,rust-rand-0.4))))))
 
+(define-public rust-base64-0.9
+  (package
+    (inherit rust-base64-0.11)
+    (name "rust-base64")
+    (version "0.9.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "base64" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hs62r35bgxslawyrn1vp9rmvrkkm76fqv0vqcwd048vs876r7a8"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1.3)
+        ("rust-safemem" ,rust-safemem-0.3))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.4))))))
+
 (define-public rust-base-x-0.2
   (package
     (name "rust-base-x")
-- 
cgit v1.2.3


From b0020da781d346adf9a7f49984174c152f5fc0b4 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 21 Apr 2020 01:11:18 +0200
Subject: gnu: Add rust-bindgen-0.49.

* gnu/packages/crates-io.scm (rust-bindgen-0.49): New variable.
---
 gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ba602a27b5..661e8227a5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1460,6 +1460,40 @@ that uses Serde for transforming structs into bytes and vice versa!")
         ("rust-diff" ,rust-diff-0.1)
         ("rust-shlex" ,rust-shlex-0.1))))))
 
+(define-public rust-bindgen-0.49
+  (package/inherit rust-bindgen-0.50
+    (name "rust-bindgen")
+    (version "0.49.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vjacbvashvds5rbrlqvq5fy55wmp50iia3mnczvycap7mzhh1sc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-cexpr" ,rust-cexpr-0.3)
+        ("rust-cfg-if" ,rust-cfg-if-0.1)
+        ("rust-clang-sys" ,rust-clang-sys-0.28)
+        ("rust-clap" ,rust-clap-2)
+        ("rust-env-logger" ,rust-env-logger-0.6)
+        ("rust-fxhash" ,rust-fxhash-0.2)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
+        ("rust-proc-macro2" ,rust-proc-macro2-0.4)
+        ("rust-quote" ,rust-quote-0.6)
+        ("rust-regex" ,rust-regex-1.1)
+        ("rust-shlex" ,rust-shlex-0.1)
+        ("rust-which" ,rust-which-2.0))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-2)
+        ("rust-diff" ,rust-diff-0.1)
+        ("rust-shlex" ,rust-shlex-0.1))))))
+
 (define-public rust-bindgen-0.33
   (package
     (inherit rust-bindgen-0.50)
-- 
cgit v1.2.3


From 71d6bbba5014f73db99637279e4a77dc4f3d7694 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 23:06:55 +0200
Subject: gnu: Add rust-bitflags-0.5

* gnu/packages/crates-io.scm (rust-bitflags-0.5): New variable.
---
 gnu/packages/crates-io.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 661e8227a5..1d9c489713 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1629,6 +1629,19 @@ behave like a set of bitflags.")
         (base32
          "0v8hh6wdkpk9my8z8442g4hqrqf05h0qj53dsay6mv18lqvqklda"))))))
 
+(define-public rust-bitflags-0.5
+  (package
+    (inherit rust-bitflags-1)
+    (name "rust-bitflags")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bitflags" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "08qdq5w1nd3hzwsrxk0dxzqv4g8wbwj6v2193njskwzdd09r6rsg"))))))
+
 (define-public rust-bitstream-io-0.8
   (package
     (name "rust-bitstream-io")
-- 
cgit v1.2.3


From 6b4db2a21e8613bca171b9be0e9b0971c446a569 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 21:39:33 +0200
Subject: gnu: Add rust-bytes-0.5.

* gnu/packages/crates-io.scm (rust-bytes-0.5): New variable.
  (rust-bytes-0.4): Inherit from it.
---
 gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1d9c489713..0688b1ee40 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2115,8 +2115,32 @@ little-endian.")
        (("rust-quickcheck" ,rust-quickcheck-0.2)
         ("rust-rand" ,rust-rand-0.3))))))
 
-(define-public rust-bytes-0.4
+(define-public rust-bytes-0.5
   (package
+    (name "rust-bytes")
+    (version "0.5.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bytes" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1q9r7si1l8vndg4n2ny2nv833ghp5vyqzk5indb9rmhd5ibaq2hk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;; FIXME requires Raus >= 1.39
+       #:cargo-inputs
+       (("rust-serde" ,rust-serde-1.0))
+       #:cargo-development-inputs
+       (("rust-loom" ,rust-loom-0.2)
+        ("rust-serde-test" ,rust-serde-test-1.0))))
+    (home-page "https://github.com/tokio-rs/bytes")
+    (synopsis "Types and traits for working with bytes")
+    (description "Types and traits for working with bytes.")
+    (license license:expat)))
+
+(define-public rust-bytes-0.4
+  (package/inherit rust-bytes-0.5
     (name "rust-bytes")
     (version "0.4.12")
     (source
@@ -2137,13 +2161,7 @@ little-endian.")
         ("rust-iovec" ,rust-iovec-0.1)
         ("rust-serde" ,rust-serde-1.0))
        #:cargo-development-inputs
-       (("rust-serde-test" ,rust-serde-test-1.0))))
-    (home-page "https://github.com/tokio-rs/bytes")
-    (synopsis
-     "Types and traits for working with bytes")
-    (description
-     "Types and traits for working with bytes.")
-    (license license:expat)))
+       (("rust-serde-test" ,rust-serde-test-1.0))))))
 
 (define-public rust-bytes-0.3
   (package
-- 
cgit v1.2.3


From 56d1d517f050bcf72a5b00eb91fba893e3a0927f Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 22:16:55 +0200
Subject: gnu: Add rust-capnp-0.10.

* gnu/packages/crates-io.scm (rust-capnp-0.10): New variable.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0688b1ee40..46104fdf89 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2401,6 +2401,30 @@ exposed as Reader/Writer streams.")
      "This package provides a callback-based event loop")
     (license license:expat)))
 
+(define-public rust-capnp-0.10
+  (package
+    (name "rust-capnp")
+    (version "0.10.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "capnp" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17hsnmlcrzksjjpwpz51y8g36xzq8042i2cwns0lsg7rixfw2rxq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-futures" ,rust-futures-0.1)
+        ("rust-quickcheck" ,rust-quickcheck-0.2))
+       #:cargo-development-inputs
+       (("rust-quickcheck" ,rust-quickcheck-0.2))))
+    (home-page "https://github.com/capnproto/capnproto-rust")
+    (synopsis "Runtime library for Cap'n Proto data encoding")
+    (description "This package provides a runtime library for Cap'n Proto data
+encoding.")
+    (license license:expat)))
+
 (define-public rust-caps-0.3
   (package
     (name "rust-caps")
-- 
cgit v1.2.3


From 5d6ef660922a2546f95a3364c2f7a8e7cdc28daf Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 22:17:32 +0200
Subject: gnu: Add rust-capnpc-0.10.

* gnu/packages/crates-io.scm (rust-capnpc-0.10): New variable.
---
 gnu/packages/crates-io.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 46104fdf89..bc0cc15a34 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2425,6 +2425,25 @@ exposed as Reader/Writer streams.")
 encoding.")
     (license license:expat)))
 
+(define-public rust-capnpc-0.10
+  (package
+    (name "rust-capnpc")
+    (version "0.10.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "capnpc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zxbmdkr0xfzkfq9p8zn7pp9jjq275qhr8fh9a0cc0ab37yfvbyj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-capnp" ,rust-capnp-0.10))))
+    (home-page "https://github.com/capnproto/capnproto-rust")
+    (synopsis "Cap'n Proto code generation")
+    (description "Cap'n Proto code generation")
+    (license license:expat)))
+
 (define-public rust-caps-0.3
   (package
     (name "rust-caps")
-- 
cgit v1.2.3


From 412f468635f88b52a90dc18be92741a59401c5a1 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 22:17:57 +0200
Subject: gnu: Add rust-capnp-futures-0.10.

* gnu/packages/crates-io.scm (rust-capnp-futures-0.10): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bc0cc15a34..9d1f7a61bc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2425,6 +2425,31 @@ exposed as Reader/Writer streams.")
 encoding.")
     (license license:expat)))
 
+(define-public rust-capnp-futures-0.10
+  (package
+    (name "rust-capnp-futures")
+    (version "0.10.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "capnp-futures" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qdiqkp9mh4acpa0dqhpzv2gwf949rj3m85mgwl1rih6gvgbh1zs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-capnp" ,rust-capnp-0.10)
+        ("rust-futures" ,rust-futures-0.1))
+       #:cargo-development-inputs
+       (("rust-capnp" ,rust-capnp-0.10)
+        ("rust-quickcheck" ,rust-quickcheck-0.2))))
+    (home-page "https://github.com/capnproto/capnproto-rust")
+    (synopsis "Async serialization for Cap'n Proto messages")
+    (description "This package provides async serialization for Cap'n Proto
+messages.")
+    (license license:expat)))
+
 (define-public rust-capnpc-0.10
   (package
     (name "rust-capnpc")
-- 
cgit v1.2.3


From 1c2126c377bb5367b1f3ace599f214fabc0d5925 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 22:18:34 +0200
Subject: gnu: Add rust-capnp-rpc-0.10.

* gnu/packages/crates-io.scm (rust-capnp-rpc-0.10): New variable.
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9d1f7a61bc..2c7a17a39e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41,6 +41,7 @@
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages serialization)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
@@ -2450,6 +2451,33 @@ encoding.")
 messages.")
     (license license:expat)))
 
+(define-public rust-capnp-rpc-0.10
+  (package
+    (name "rust-capnp-rpc")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "capnp-rpc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1j6xg7yays1hlm1045wviyn1642yvvi2p4kba26yk07a0kafr3jn"))))
+    (build-system cargo-build-system)
+    (native-inputs
+     `(("capnproto" ,capnproto)))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-capnp" ,rust-capnp-0.10)
+        ("rust-capnp-futures" ,rust-capnp-futures-0.10)
+        ("rust-futures" ,rust-futures-0.1))
+       #:cargo-development-inputs
+       (("rust-capnpc" ,rust-capnpc-0.10))))
+    (home-page "https://github.com/capnproto/capnproto-rust")
+    (synopsis "Cap'n Proto remote procedure call protocol implementation")
+    (description "This package provides an implementation of the Cap'n Proto
+remote procedure call protocol")
+    (license license:expat)))
+
 (define-public rust-capnpc-0.10
   (package
     (name "rust-capnpc")
-- 
cgit v1.2.3


From 9b07ebcd9634cb96bef061fd8089ff0ef4d108f9 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 14:00:27 +0100
Subject: gnu: Add rust-colored-1.9.1.

This is sequried by sequoia, resp. sequois-sqv.

* gnu/packages/crates-io.scm (rust-colored-1.9.1): New variable.
---
 gnu/packages/crates-io.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2c7a17a39e..7bc3d7a8f3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3353,6 +3353,19 @@ CMAKE environmental variable is set.")
      "The most simple way to add colors in your terminal.")
     (license license:mpl2.0)))
 
+(define-public rust-colored-1.9.1
+  (package/inherit rust-colored-1.9
+    (name "rust-colored")
+    (version "1.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "colored" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0fildacm47g86acmx44yvxx6cka8fdym5qkgfm8x8gh2hsrghc7r"))))
+    (build-system cargo-build-system)))
+
 ;; This package requires features which are unavailable
 ;; on the stable releases of Rust.
 (define-public rust-compiler-builtins-0.1
-- 
cgit v1.2.3


From 708742109c925dbd41823639f7e589812794b9e9 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 21 Apr 2020 00:19:00 +0200
Subject: gnu: Add rust-crossterm-winapi-0.4.

* gnu/packages/crates-io.scm (rust-crossterm-winapi-0.4): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7bc3d7a8f3..c781d8c397 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4318,6 +4318,26 @@ intrinsics.")
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.4))))))
 
+(define-public rust-crossterm-winapi-0.4
+  (package
+    (name "rust-crossterm-winapi")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "crossterm-winapi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1j3av8bba3f5y4n4w1vgn0iz28vdajxrli6lqxnvpddbphskmph2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/crossterm-rs/crossterm-winapi")
+    (synopsis "Basic simple abstractions around common WinAPI calls")
+    (description "WinAPI wrapper that provides some basic simple abstractions
+around common WinAPI calls.")
+    (license license:expat)))
+
 (define-public rust-crypto-mac-0.7
   (package
     (name "rust-crypto-mac")
-- 
cgit v1.2.3


From 7bfde108d4fa84c3d1ec1e613acc62fc39a1a803 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 21 Apr 2020 00:19:25 +0200
Subject: gnu: Add rust-crossterm-0.13.

* gnu/packages/crates-io.scm (rust-crossterm-0.13): New variable.
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c781d8c397..4d609120ef 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4318,6 +4318,32 @@ intrinsics.")
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.4))))))
 
+(define-public rust-crossterm-0.13
+  (package
+    (name "rust-crossterm")
+    (version "0.13.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "crossterm" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1jw9s85mnhpkk38lihr4ildip4jhfhc3h86npncd92i4mdb257vm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-crossterm-winapi" ,rust-crossterm-winapi-0.4)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-mio" ,rust-mio-0.6)
+        ("rust-serde" ,rust-serde-1.0)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/crossterm-rs/crossterm")
+    (synopsis "Crossplatform terminal library for manipulating terminals")
+    (description "This package provides a crossplatform terminal library for
+manipulating terminals.")
+    (license license:expat)))
+
 (define-public rust-crossterm-winapi-0.4
   (package
     (name "rust-crossterm-winapi")
-- 
cgit v1.2.3


From 59e2f5dbe624039e421e44dd386d7785c657f1d3 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 25 Apr 2020 12:46:18 +0200
Subject: gnu: Add rust-ct-logs-0.3.

* gnu/packages/crates-io.scm (rust-ct-logs-0.3): New variable.
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4d609120ef..103c99b066 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4533,6 +4533,27 @@ Code} (MAC) algorithms.")
      "Bare bones CSV parsing with no_std support.")
     (license (list license:unlicense license:expat))))
 
+(define-public rust-ct-logs-0.3
+  (package
+    (name "rust-ct-logs")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ct-logs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1f0885ws3p49xh6dfgnhh7zjw9h4rhs9ljs8i9cnkhifzz98784f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-sct" ,rust-sct-0.3))))
+    (home-page "https://github.com/ctz/ct-logs")
+    (synopsis "Google's list of Certificate Transparency logs")
+    (description "This package contains Google's list of Certificate
+Transparency logs for use with sct crate.")
+    (license (list license:asl2.0 license:isc license:expat))))
+
 (define-public rust-ctor-0.1
   (package
     (name "rust-ctor")
-- 
cgit v1.2.3


From d1c18f44c2d5a385926ffa3960af8417e1b792d0 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 21:58:10 +0200
Subject: gnu: Add rust-derive-new-0.5.

* gnu/packages/crates-io.scm (rust-derive-new-0.5): New variable.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 103c99b066..63d7eeaaa0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4922,6 +4922,29 @@ and arithmetic.")
     (description "Demo of proc-macro-hack.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-derive-new-0.5
+  (package
+    (name "rust-derive-new")
+    (version "0.5.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "derive-new" version))
+      (file-name (string-append name "-" version ".tar.gz"))
+      (sha256
+       (base32 "1ncibp4jhpkym7namg3viqyw8hljd32n6abg64af8qjwrn91iwvi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1.0)
+        ("rust-quote" ,rust-quote-1.0)
+        ("rust-syn" ,rust-syn-1.0))))
+    (home-page "https://github.com/nrc/derive-new")
+    (synopsis "Simple constructor functions for structs and enums")
+    (description "`#[derive(new)]` implements simple constructor functions for
+structs and enums.")
+  (license license:expat)))
+
 (define-public rust-diff-0.1
   (package
     (name "rust-diff")
-- 
cgit v1.2.3


From 5232783186051207ea1bc3e33790b41795e38895 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 22:22:44 +0200
Subject: gnu: Add rust-derive-builder-0.5.

* gnu/packages/crates-io.scm (rust-derive-builder-0.5): New variable.
---
 gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 63d7eeaaa0..d51ca95739 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4922,6 +4922,38 @@ and arithmetic.")
     (description "Demo of proc-macro-hack.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-derive-builder-0.5
+  (package
+    (name "rust-derive-builder")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "derive_builder" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0fgl8dsigr7h70clxjq8xmsfc021w5ag262wfgcqv0ian1m8x6cc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-compiletest-rs" ,rust-compiletest-rs-0.3)
+        ("rust-derive-builder-core" ,rust-derive-builder-core-0.2)
+        ("rust-env-logger" ,rust-env-logger-0.4)
+        ("rust-log" ,rust-log-0.3)
+        ("rust-quote" ,rust-quote-0.3)
+        ("rust-skeptic" ,rust-skeptic-0.9)
+        ("rust-syn" ,rust-syn-0.11))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.4)
+        ("rust-log" ,rust-log-0.3)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.2)
+        ("rust-skeptic" ,rust-skeptic-0.9))))
+    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
+    (synopsis "Builder pattern for arbitrary structs")
+    (description "Rust macro to automatically implement the builder pattern
+for arbitrary structs.")
+    (license (list license:expat license:asl2.0))) )
+
 (define-public rust-derive-new-0.5
   (package
     (name "rust-derive-new")
-- 
cgit v1.2.3


From 982bb7d0fb56737b597882f6dcb7e851e52fe681 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 22:27:52 +0200
Subject: gnu: Add rust-derive-builder-core-0.2.

* gnu/packages/crates-io.scm (rust-derive-builder-core-0.2): New variable.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d51ca95739..af3e10ece5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4954,6 +4954,30 @@ and arithmetic.")
 for arbitrary structs.")
     (license (list license:expat license:asl2.0))) )
 
+(define-public rust-derive-builder-core-0.2
+  (package
+    (name "rust-derive-builder-core")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "derive-builder-core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mxpl1ja3l60w1v5vr3733hr5mcpds2hfl6shrmy3a2zkvp28pkk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-log" ,rust-log-0.3)
+        ("rust-quote" ,rust-quote-0.3)
+        ("rust-syn" ,rust-syn-0.11))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-0.2))))
+    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
+    (synopsis "Internal helper library for the derive_builder crate")
+    (description "Internal helper library for the derive_builder crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-derive-new-0.5
   (package
     (name "rust-derive-new")
-- 
cgit v1.2.3


From 9a0e2bfffd6e21943e9548749c42de567d73628b Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 22:38:21 +0200
Subject: gnu: Add rust-difference-1.

* gnu/packages/crates-io.scm (rust-difference-1): New variable.
---
 gnu/packages/crates-io.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index af3e10ece5..f234a9134b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5054,6 +5054,24 @@ structs and enums.")
      "This package provides a Rust text diffing and assertion library.")
     (license license:expat)))
 
+(define-public rust-difference-1
+  (package/inherit rust-difference-2.0
+    (name "rust-difference")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "difference" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1a5v0b73z7vywbclll32wjsfkdgh6wn9prnq91z0d3lag4clsc5k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-getopts" ,rust-getopts-0.2))
+       #:cargo-development-inputs
+       (("rust-term" ,rust-term-0.2))))))
+
 (define-public rust-digest-0.8
   (package
     (name "rust-digest")
-- 
cgit v1.2.3


From b8faa13edd12741f715784f7523cc3927adfee3c Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 15:37:02 +0100
Subject: gnu: Add rust-docmatic-0.1.

* gnu/packages/crates-io.scm (rust-docmatic-0.1): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f234a9134b..188a3eb526 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5282,6 +5282,26 @@ system libraries.")
 from macros.")
     (license license:expat)))
 
+(define-public rust-docmatic-0.1
+  (package
+    (name "rust-docmatic")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "docmatic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hx85n266lxswqxrbbinqlhi1qcnjgd4cc7v42abg72kmz7fnn4d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-which" ,rust-which-2.0))))
+    (home-page "https://github.com/assert-rs/docmatic")
+    (synopsis "Test Rust examples in your documentation")
+    (description "Test Rust examples in your documentation.")
+    (license license:expat)))
+
 (define-public rust-docopt-1.1
   (package
     (name "rust-docopt")
-- 
cgit v1.2.3


From a4b6242f026909e6c678d58f0d4e58757b3984d3 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 12:19:11 +0100
Subject: gnu: Add rust-dogged-0.2.

* gnu/packages/crates-io.scm (rust-dogged-0.2): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 188a3eb526..3d451923cc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5390,6 +5390,31 @@ from macros.")
 parameters, associated types, and type constraints.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-dogged-0.2
+  (package
+    (name "rust-dogged")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dogged" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yk5l6qqidl5y935x15gi9kkd6niim1wb64r1l7kdzl9jw8dyf16"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.3))))
+    (home-page "https://github.com/nikomatsakis/dogged")
+    (synopsis "Persistent vector, similar to Clojure")
+    (description "This package experimental persistent collections in Rust.
+Based on a digit-indexed trie, as in Clojure.  Supports @code{push()},
+@code{get()}, and @code{get_mut()} as its primitive operations for now.  All
+O(1)-in-practice, if not in theory, but obviously not as fast as a
+non-persistent vector.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-draw-state-0.8
   (package
     (name "rust-draw-state")
-- 
cgit v1.2.3


From 8c241c4d0bdb18e79767e88dbf864fc7f75b6888 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 25 Apr 2020 12:42:43 +0200
Subject: gnu: Add rust-docopt-0.8.

* gnu/packages/crates-io.scm (rust-docopt-0.8): New variable.
---
 gnu/packages/crates-io.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3d451923cc..05183f5469 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5327,6 +5327,25 @@ from macros.")
     (description "Command line argument parsing.")
     (license (list license:expat license:unlicense))))
 
+(define-public rust-docopt-0.8
+  (package/inherit rust-docopt-1.1
+    (name "rust-docopt")
+    (version "0.8.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "docopt" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jha611mffc2qnxvdl3pmglz07akl99lk1vihhb3nl1cd69x7b6q"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-0.2)
+        ("rust-serde" ,rust-serde-1.0)
+        ("rust-serde-derive" ,rust-serde-derive-1.0)
+        ("rust-strsim" ,rust-strsim-0.6))))))
+
 (define-public rust-docopt-0.7
   (package
     (inherit rust-docopt-1.1)
-- 
cgit v1.2.3


From 33bfe341a227009b76a6a5486730db8c3582a47c Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 12:15:02 +0100
Subject: gnu. Add rust-ena-0.13.

* gnu/packages/crates-io.scm (rust-ena-0.13): New variable.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 05183f5469..fc7d275608 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5651,6 +5651,30 @@ floating-point primitives to an @code{io::Write}.")
 inclusion of Windows resources in the most resilient fashion imaginable.")
     (license license:expat)))
 
+(define-public rust-ena-0.13
+  (package
+    (name "rust-ena")
+    (version "0.13.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ena" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dkggq0qwv140y2kjfd4spp77zi3v7vnpm4bfy7s7r4cla7xqi49"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-dogged" ,rust-dogged-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-petgraph" ,rust-petgraph-0.4))))
+    (home-page "https://github.com/rust-lang/ena")
+    (synopsis "Union-find, congruence closure, and other unification code")
+    (description "This package provides an implementation of union-find /
+congruence-closure in Rust.  It was extracted from rustc for independent
+experimentation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-encode-unicode-0.3
   (package
     (name "rust-encode-unicode")
-- 
cgit v1.2.3


From 1a4765d82fed36e7c136def46650a10114e62f69 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 15:33:22 +0100
Subject: gnu: Add rust-environment-0.1.

* gnu/packages/crates-io.scm (rust-environment-0.1): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fc7d275608..7f368af299 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6052,6 +6052,26 @@ is configured via an environment variable.")
        (("rust-regex" ,rust-regex-0.1)
         ("rust-log" ,rust-log-0.3))))))
 
+(define-public rust-environment-0.1
+  (package
+    (name "rust-environment")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "environment" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vh32mcxf3z8xaibwv751zj14d08nh7iwk1vqdj90rkq17i18jqz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f)) ;; 3/6 tests fail due to missing file
+    (home-page "https://github.com/Freyskeyd/environment")
+    (synopsis "Helper to deal with environment variables")
+    (description "This package provides helper to deal with environment
+variables.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-envmnt-0.6
   (package
     (name "rust-envmnt")
-- 
cgit v1.2.3


From 5b034ab6a65a7f7b7a4758ee9c3593fce246ebae Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 13:51:30 +0100
Subject: gnu: Add rust-expectest-0.9.

* gnu/packages/crates-io.scm (rust-expectest-0.9): New variable.
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7f368af299..cef9ddc765 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6324,6 +6324,27 @@ variables.")
     (description "XML parser library written in C")
     (license license:expat)))
 
+(define-public rust-expectest-0.9
+  (package
+    (name "rust-expectest")
+    (version "0.9.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "expectest" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0f24q2a53x7sfmmrqjbwbk7pahzwkpd829fcr023kb7q5xnd6z4g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-num-traits" ,rust-num-traits-0.1))))
+    (home-page "https://github.com/zummenix/expectest")
+    (synopsis "Matchers and matcher functions for unit testing")
+    (description "This crate provides matchers and matcher functions for unit
+testing.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-fake-simd-0.1
   (package
     (name "rust-fake-simd")
-- 
cgit v1.2.3


From 30b610d68c07e903ff3e2f5453d88f31da510a15 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 21 Apr 2020 01:01:36 +0200
Subject: gnu: Add rust-fallible-streaming-iterator-0.1.

* gnu/packages/crates-io.scm (rust-fallible-streaming-iterator-0.1): New variable.
---
 gnu/packages/crates-io.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cef9ddc765..f9178d710c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6441,6 +6441,23 @@ provides implementations for @code{HashMap} and @code{HashSet}.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-fallible-streaming-iterator-0.1
+  (package
+    (name "rust-fallible-streaming-iterator")
+    (version "0.1.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fallible-streaming-iterator" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nj6j26p71bjy8h42x6jahx1hn0ng6mc2miwpgwnp8vnwqf4jq3k"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/sfackler/fallible-streaming-iterator")
+    (synopsis "Fallible streaming iteration")
+    (description "Fallible streaming iteration")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-fern-0.5
   (package
     (name "rust-fern")
-- 
cgit v1.2.3


From 304c702f6084a864634c3283190e4c56d159ad83 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 23:28:17 +0200
Subject: gnu: Add rust-futures-timer-0.1.

* gnu/packages/crates-io.scm (rust-futures-timer-0.1): New variable.
---
 gnu/packages/crates-io.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f9178d710c..cd028329fa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7657,6 +7657,25 @@ futures-rs library.")
     (description "Tools for working with tasks.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-futures-timer-0.1
+  (package
+    (name "rust-futures-timer")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "futures-timer" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hw0nlyrq5an6l6y8md1rg6r380zrddvmh9cg0h64xfwnvlxzkm5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-futures" ,rust-futures-0.1))))
+    (home-page "https://github.com/async-rs/futures-timer")
+    (synopsis "Timeouts for futures")
+    (description "Timeouts for futures.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-futures-util-0.3
   (package
     (name "rust-futures-util")
-- 
cgit v1.2.3


From 8b465bdc9e2649c6743ab1697e9edc5f26d6b7f0 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 22:23:08 +0200
Subject: gnu: Add rust-fs2-0.4.

* gnu/packages/crates-io.scm (rust-fs2-0.4): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cd028329fa..75c3141ef7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7023,6 +7023,31 @@ values to other threads.")
      "This package provides low level binding for FreeType font library.")
     (license license:expat)))
 
+(define-public rust-fs2-0.4
+  (package
+    (name "rust-fs2")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fs2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04v2hwk7035c088f19mfl5b1lz84gnvv2hv6m935n0hmirszqr4m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;; "#![feature] may not be used on stable release channel"
+       #:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-tempdir" ,rust-tempdir-0.3))))
+    (home-page "https://github.com/danburkert/fs2-rs")
+    (synopsis "Cross-platform file locks and file duplication")
+    (description "This package provides cross-platform file locks and file
+duplication.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-fs-extra-1.1
   (package
     (name "rust-fs-extra")
-- 
cgit v1.2.3


From e9066795228b65ddd3a2ec6817090dec3914ca5f Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 22:36:24 +0200
Subject: gnu: Add rust-h2-0.1.

* gnu/packages/crates-io.scm (rust-h2-0.1): New variable.
---
 gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 75c3141ef7..618a01f7d3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9318,6 +9318,49 @@ standard printing of search results, similar to grep itself.")
 of gzip files based on the gzip header implementation in the @code{flate2} crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-h2-0.1
+  (package
+    (name "rust-h2")
+    (version "0.1.26")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "h2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qn457y8xh03p7c7cpk76r22gqpyqxc58g5022j3iya7d0j4rcx5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;; TODO missing indirect dependency
+       #:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1.3)
+        ("rust-bytes" ,rust-bytes-0.4)
+        ("rust-fnv" ,rust-fnv-1.0)
+        ("rust-futures" ,rust-futures-0.1)
+        ("rust-http" ,rust-http-0.1)
+        ("rust-indexmap" ,rust-indexmap-1.0)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-slab" ,rust-slab-0.4)
+        ("rust-string" ,rust-string-0.2)
+        ("rust-tokio-io" ,rust-tokio-io-0.1))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.5)
+        ("rust-hex" ,rust-hex-0.2)
+        ("rust-quickcheck" ,rust-quickcheck-0.4)
+        ("rust-rand" ,rust-rand-0.3)
+        ;;("rust-rustls" ,rust-rustls-0.12) requires 0.5
+        ("rust-serde" ,rust-serde-1.0)
+        ("rust-serde-json" ,rust-serde-json-1.0)
+        ("rust-tokio" ,rust-tokio-0.1)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.12)
+        ("rust-walkdir" ,rust-walkdir-1.0)
+        ("rust-webpki" ,rust-webpki-0.21)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.17))))
+    (home-page "https://github.com/hyperium/h2")
+    (synopsis "HTTP/2.0 client and server")
+    (description "This packages provides a HTTP/2.0 client and server.")
+    (license license:expat)))
+
 (define-public rust-half-1.3
   (package
     (name "rust-half")
-- 
cgit v1.2.3


From fea64a43ad36c3ec536d944103f11ead73090bd4 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 22:06:21 +0200
Subject: gnu: Add rust-hex-0.2.

* gnu/packages/crates-io.scm (rust-hex-0.2): New variable.
---
 gnu/packages/crates-io.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 618a01f7d3..3af7b4d43d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9611,6 +9611,19 @@ hexadecimal representation.")
          (base32
           "0xsdcjiik5j750j67zk42qdnmm4ahirk3gmkmcqgq7qls2jjcl40"))))))
 
+(define-public rust-hex-0.2
+  (package
+    (inherit rust-hex-0.4)
+    (name "rust-hex")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hex" version))
+       (file-name (string-append name "-" version ".crate"))
+       (sha256
+        (base32 "1ajkw40qzn2ygnqjj9w584f6l31wi318258n84pn2hax8la2i8nn"))))))
+
 (define-public rust-hex-literal-0.2
   (package
     (name "rust-hex-literal")
-- 
cgit v1.2.3


From 2380285bd1b98f049c874e5bf6fee023d32dd6ca Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 21:46:28 +0200
Subject: gnu: Add rust-http-0.2.

* gnu/packages/crates-io.scm (rust-http-0.2): New variable.
  (rust-http-0.1): Inherit from it.
---
 gnu/packages/crates-io.scm | 43 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3af7b4d43d..f206977de4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9767,8 +9767,40 @@ compile time.")
      "High-performance browser-grade HTML5 parser.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-http-0.1
+(define-public rust-http-0.2
   (package
+    (name "rust-http")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "http" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1y827q7j0gvs8z2x12biaik9db6nb902lpqv889cbcj84sbnkm98"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;; FIXME requires Rust >= 1.39 for building
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.5)
+        ("rust-fnv" ,rust-fnv-1.0)
+        ("rust-itoa" ,rust-itoa-0.4))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-indexmap" ,rust-indexmap-1.0)
+        ("rust-quickcheck" ,rust-quickcheck-0.9)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-seahash" ,rust-seahash-3.0)
+        ("rust-serde" ,rust-serde-1.0)
+        ("rust-serde-json" ,rust-serde-json-1.0))))
+    (home-page "https://github.com/hyperium/http")
+    (synopsis "Set of types for representing HTTP requests and responses")
+    (description "This package provides a set of types for representing HTTP
+requests and responses.")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-http-0.1
+  (package/inherit rust-http-0.2
     (name "rust-http")
     (version "0.1.17")
     (source
@@ -9780,7 +9812,6 @@ compile time.")
        (sha256
         (base32
          "06icxvrd26r6s7dzjavja7r47hgjb9851wblqh8frxnsy3q29lzf"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -9793,13 +9824,7 @@ compile time.")
         ("rust-rand" ,rust-rand-0.4)
         ("rust-seahash" ,rust-seahash-3.0)
         ("rust-serde" ,rust-serde-1.0)
-        ("rust-serde-json" ,rust-serde-json-1.0))))
-    (home-page "https://github.com/hyperium/http")
-    (synopsis "Set of types for representing HTTP requests and responses")
-    (description
-     "This package provides a set of types for representing HTTP
-requests and responses.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-serde-json" ,rust-serde-json-1.0))))))
 
 (define-public rust-http-req-0.5
   (package
-- 
cgit v1.2.3


From 5ac71eda18b9e80e1acbb9e102c3a4bb95c5ad03 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 21:48:16 +0200
Subject: gnu: Add rust-http-body-0.3.

* gnu/packages/crates-io.scm (rust-http-body-0.3): New variable.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f206977de4..fdedaf28c8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9826,6 +9826,29 @@ requests and responses.")
         ("rust-serde" ,rust-serde-1.0)
         ("rust-serde-json" ,rust-serde-json-1.0))))))
 
+(define-public rust-http-body-0.3
+  (package
+    (name "rust-http-body")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "http-body" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06qi0ni45lb92w3ml260c0bxbq5zd4snjmz0a9k69xq6021zzm8k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;; FIXME requires Rust >= 1.39 for building
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.5)
+        ("rust-http" ,rust-http-0.2))))
+    (home-page "https://github.com/hyperium/http-body")
+    (synopsis "Asynchronous, streaming, HTTP request or response body")
+    (description "Trait representing an asynchronous, streaming, HTTP request
+or response body.")
+    (license license:expat)))
+
 (define-public rust-http-req-0.5
   (package
     (name "rust-http-req")
-- 
cgit v1.2.3


From df3954b2114e065155218d5c78006bad41ec9455 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 21:46:33 +0200
Subject: gnu: Add rust-http-body-0.1.

* gnu/packages/crates-io.scm (rust-http-body-0.1): New variable.
---
 gnu/packages/crates-io.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fdedaf28c8..d07b2737df 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9849,6 +9849,25 @@ requests and responses.")
 or response body.")
     (license license:expat)))
 
+(define-public rust-http-body-0.1
+  (package/inherit rust-http-body-0.3
+    (name "rust-http-body")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "http-body" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0b99404k4mw6a92hvyr0qwzkqv4f866ykg0x7913limjq5cwhhb7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.4)
+        ("rust-futures" ,rust-futures-0.1)
+        ("rust-http" ,rust-http-0.1)
+        ("rust-tokio-buf" ,rust-tokio-buf-0.1))))))
+
 (define-public rust-http-req-0.5
   (package
     (name "rust-http-req")
-- 
cgit v1.2.3


From c199ef65039c6225e51d56f717068c0a62c7a6c1 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 20:58:36 +0200
Subject: gnu: Add rust-hyper-0.12.

* gnu/packages/crates-io.scm (rust-hyper-0.12): New variable.
---
 gnu/packages/crates-io.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d07b2737df..11bd0925d1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9964,6 +9964,59 @@ SystemTime}}.")
         (base32
          "057ilhy6vc9iqhhby5ymh45m051pgxwq2z437gwkbnqhw7rfb9rw"))))))
 
+(define-public rust-hyper-0.12
+  (package
+    (name "rust-hyper")
+    (version "0.12.35")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hyper" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xnm8zi4bdjqhlnx3238kx8yjf29jjd1ww54apcql7wf8g8nxglx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;; fails due to some missing example file
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.4)
+        ("rust-futures" ,rust-futures-0.1)
+        ("rust-futures-cpupool" ,rust-futures-cpupool-0.1)
+        ("rust-h2" ,rust-h2-0.1)
+        ("rust-http" ,rust-http-0.1)
+        ("rust-http-body" ,rust-http-body-0.1)
+        ("rust-httparse" ,rust-httparse-1.3)
+        ("rust-iovec" ,rust-iovec-0.1)
+        ("rust-itoa" ,rust-itoa-0.4)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-net2" ,rust-net2-0.2)
+        ("rust-time" ,rust-time-0.1)
+        ("rust-tokio" ,rust-tokio-0.1)
+        ("rust-tokio-buf" ,rust-tokio-buf-0.1)
+        ("rust-tokio-executor" ,rust-tokio-executor-0.1)
+        ("rust-tokio-io" ,rust-tokio-io-0.1)
+        ("rust-tokio-reactor" ,rust-tokio-reactor-0.1)
+        ("rust-tokio-tcp" ,rust-tokio-tcp-0.1)
+        ("rust-tokio-threadpool" ,rust-tokio-threadpool-0.1)
+        ("rust-tokio-timer" ,rust-tokio-timer-0.2)
+        ("rust-want" ,rust-want-0.2))
+       #:cargo-development-inputs
+       (("rust-futures-timer" ,rust-futures-timer-0.1)
+        ("rust-num-cpus" ,rust-num-cpus-1.10)
+        ("rust-rustc-version" ,rust-rustc-version-0.2)
+        ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.3)
+        ("rust-serde" ,rust-serde-1.0)
+        ("rust-serde-derive" ,rust-serde-derive-1.0)
+        ("rust-serde-json" ,rust-serde-json-1.0)
+        ("rust-spmc" ,rust-spmc-0.3)
+        ("rust-tokio-fs" ,rust-tokio-fs-0.1)
+        ("rust-tokio-mockstream" ,rust-tokio-mockstream-1)
+        ("rust-url" ,rust-url-1.7))))
+    (home-page "https://hyper.rs")
+    (synopsis "Fast and correct HTTP library")
+    (description "This package provides a fast and correct HTTP library.")
+    (license license:expat)) )
+
 (define-public rust-idna-0.2
   (package
     (name "rust-idna")
-- 
cgit v1.2.3


From 1a02238711e4b5f8ba73ee24b59355049fd569bb Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 22:25:56 +0200
Subject: gnu: Add rust-hyper-tls-0.3.

* gnu/packages/crates-io.scm (rust-hyper-tls-0.3): New variable.
---
 gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 11bd0925d1..72af7e3e90 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10017,6 +10017,36 @@ SystemTime}}.")
     (description "This package provides a fast and correct HTTP library.")
     (license license:expat)) )
 
+(define-public rust-hyper-tls-0.3
+  (package
+    (name "rust-hyper-tls")
+    (version "0.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hyper-tls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0kqp4sz8613j6nv375wfj3gh95ff4nb6a3rb1f2vbx0almm0v01s"))))
+    (build-system cargo-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("openssl" ,openssl)))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.4)
+        ("rust-futures" ,rust-futures-0.1)
+        ("rust-hyper" ,rust-hyper-0.12)
+        ("rust-native-tls" ,rust-native-tls-0.2)
+        ("rust-tokio-io" ,rust-tokio-io-0.1))
+       #:cargo-development-inputs
+       (("rust-tokio" ,rust-tokio-0.1))))
+    (home-page "https://hyper.rs")
+    (synopsis "Default TLS implementation for use with hyper")
+    (description "Default TLS implementation for use with hyper")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-idna-0.2
   (package
     (name "rust-idna")
-- 
cgit v1.2.3


From 5838c3146b0ede7dd4ed4102dc805e31d240496f Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 7 Mar 2020 16:19:08 +0100
Subject: gnu: Add rust-lalrpop-util-0.17.

* gnu/packages/crates.io.scm (rust-lalrpop-util-0.18): New Variable.
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 72af7e3e90..abf5d8bf07 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11009,6 +11009,27 @@ currently supports parsing (fully conformant parser), formatting and comparing
 language tags.")
     (license license:expat)))
 
+(define-public rust-lalrpop-util-0.17
+  (package
+    (name "rust-lalrpop-util")
+    (version "0.17.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "lalrpop-util" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0z4bjn3g9232n1im5p6mn9mwlvw5aj5iac6hbjmljqxkhf3d2xy2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-regex" ,rust-regex-1.3))))
+  (home-page "https://github.com/lalrpop/lalrpop")
+  (synopsis "Runtime library for parsers generated by LALRPOP")
+  (description "THis package provides the runtime library for parsers
+generated by LALRPOP.")
+  (license (list license:asl2.0 license:expat))))
+
 (define-public rust-lazy-static-1.4
   (package
     (name "rust-lazy-static")
-- 
cgit v1.2.3


From 39f8686d6237b9847fd07aea81f7d437dde5a842 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 12:01:38 +0100
Subject: gnu: Add rust-lalrpop-0.17.

* gnu/packages/crates-io.scm (rust-lalrpop-0.17): New variable.
---
 gnu/packages/crates-io.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index abf5d8bf07..55db515fb0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11009,6 +11009,46 @@ currently supports parsing (fully conformant parser), formatting and comparing
 language tags.")
     (license license:expat)))
 
+(define-public rust-lalrpop-0.17
+  (package
+    (name "rust-lalrpop")
+    (version "0.17.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "lalrpop" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1nv7ma8cgw3r1fcma7gy06fwwlpl4fkz91mxv5kjhiaxwyc3dp34"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+      (("rust-ascii-canvas" ,rust-ascii-canvas-2)
+       ("rust-atty" ,rust-atty-0.2)
+       ("rust-bit-set" ,rust-bit-set-0.5)
+       ("rust-diff" ,rust-diff-0.1)
+       ("rust-docopt" ,rust-docopt-1.1)
+       ("rust-ena" ,rust-ena-0.13)
+       ("rust-itertools" ,rust-itertools-0.8)
+       ("rust-lalrpop-util" ,rust-lalrpop-util-0.17)
+       ("rust-petgraph" ,rust-petgraph-0.4)
+       ("rust-regex" ,rust-regex-1.3)
+       ("rust-regex-syntax" ,rust-regex-syntax-0.6)
+       ("rust-serde" ,rust-serde-1.0)
+       ("rust-serde-derive" ,rust-serde-derive-1.0)
+       ("rust-sha2" ,rust-sha2-0.8)
+       ("rust-string-cache" ,rust-string-cache-0.7)
+       ("rust-term" ,rust-term-0.5)
+       ("rust-unicode-xid" ,rust-unicode-xid-0.2))
+      #:cargo-development-inputs
+      (("rust-rand" ,rust-rand-0.6))))
+    (home-page "https://github.com/lalrpop/lalrpop")
+    (synopsis "Convenient LR(1) parser generator for Rust")
+    (description "LALRPOP is a Rust parser generator framework with usability
+as its primary goal.  You should be able to write compact, DRY, readable
+grammars.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-lalrpop-util-0.17
   (package
     (name "rust-lalrpop-util")
-- 
cgit v1.2.3


From dcfbce96b947e81eec16c91944908a6678818ab5 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 21 Apr 2020 00:26:32 +0200
Subject: gnu: Add rust-libc-print-0.1.

* gnu/packages/crates-io.scm (rust-libc-print-0.1): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 55db515fb0..37db81cd23 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11241,6 +11241,26 @@ values of all the exported APIs match the platform that libc is compiled for.")
     (license (list license:expat
                    license:asl2.0))))
 
+(define-public rust-libc-print-0.1
+  (package
+    (name "rust-libc-print")
+    (version "0.1.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libc-print" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sh4l815w7zxg8w17fvwj63y421sjqxxrdamzwyvg90n6mr70phv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/mmastrac/rust-libc-print")
+    (synopsis "Println! and eprintln! without stdlib")
+    (description "This package provices @code{println!} and @code{eprintln!}
+macros on libc without stdlib.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-libgit2-sys-0.10
   (package
     (name "rust-libgit2-sys")
-- 
cgit v1.2.3


From c9a8c5fe754db5401d800e2f1d19ff2760fc0231 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 21 Apr 2020 01:13:59 +0200
Subject: gnu: Add rust-libsqlite3-sys-0.15.

* gnu/packages/crates-io.scm (rust-libsqlite3-sys-0.15): New variable.
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 37db81cd23..3179500abb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11450,6 +11450,32 @@ functions and static variables these libraries contain.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-libsqlite3-sys-0.15
+  (package
+    (name "rust-libsqlite3-sys")
+    (version "0.15.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libsqlite3-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "104n0s4f46zprppjq6y82y0wjh1r2cgwzw26w914yj30rizy1cbj"))))
+    (build-system cargo-build-system)
+    (inputs
+     `(("sqlite" ,sqlite)))
+    (arguments
+     `(#:cargo-inputs
+       ;; build dependencies
+       (("rust-bindgen" ,rust-bindgen-0.49)
+        ("rust-cc" ,rust-cc-1.0)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-vcpkg" ,rust-vcpkg-0.2))))
+    (home-page "https://github.com/rusqlite/rusqlite")
+    (synopsis "Native bindings to the libsqlite3 library")
+    (description "Native bindings to the libsqlite3 library")
+    (license license:expat)))
+
 (define-public rust-libz-sys-1.0
   (package
     (name "rust-libz-sys")
-- 
cgit v1.2.3


From 1edae217be6ea3557a4d7700ef4c4deec4669415 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 21:27:03 +0200
Subject: gnu: Add rust-loom-0.2.

* gnu/packages/crates-io.scm (rust-loom-0.2): New variable.
  (rust-loom-0.1): Inherit from it.
---
 gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3179500abb..e9d53173d7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11832,8 +11832,34 @@ by inspecting the system for user preference.")
      `(#:cargo-inputs
        (("rust-log" ,rust-log-0.4))))))
 
-(define-public rust-loom-0.1
+(define-public rust-loom-0.2
   (package
+    (name "rust-loom")
+    (version "0.2.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "loom" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qwvwbpnxff5m6647v9rc9i6ak8ral4jy0br5xx1s9a5zcd3xddh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-0.1)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-generator" ,rust-generator-0.6)
+        ("rust-scoped-tls" ,rust-scoped-tls-0.1)
+        ("rust-serde" ,rust-serde-1.0)
+        ("rust-serde-test" ,rust-serde-test-1.0)
+        ("rust-serde-json" ,rust-serde-json-1.0))))
+    (home-page "https://github.com/tokio-rs/loom")
+    (synopsis "Model checker for concurrent code")
+    (description "Model checker for concurrent code.")
+    (license license:expat)))
+
+(define-public rust-loom-0.1
+  (package/inherit rust-loom-0.2
     (name "rust-loom")
     (version "0.1.1")
     (source
@@ -11845,7 +11871,6 @@ by inspecting the system for user preference.")
        (sha256
         (base32
          "1jmp5mffwwyqgp914cwz92ij2s6vk1hsnkvgndvzw74xrcfraibj"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-0.1)
@@ -11854,11 +11879,7 @@ by inspecting the system for user preference.")
         ("rust-scoped-tls" ,rust-scoped-tls-0.1)
         ("rust-serde" ,rust-serde-1.0)
         ("rust-serde-derive" ,rust-serde-derive-1.0)
-        ("rust-serde-json" ,rust-serde-json-1.0))))
-    (home-page "https://github.com/tokio-rs/loom")
-    (synopsis "Model checker for concurrent code")
-    (description "Model checker for concurrent code.")
-    (license license:expat)))
+        ("rust-serde-json" ,rust-serde-json-1.0))))))
 
 (define-public rust-lscolors-0.6
   (package
-- 
cgit v1.2.3


From bfe36370cdfa653600d2b662f23811a35c79e852 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 23:38:30 +0200
Subject: gnu: Add rust-loom-0.3.

* gnu/packages/crates-io.scm (rust-loom-0.2): New variable.
  (rust-loom-0.1): inherit from it.
---
 gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e9d53173d7..5bfeb57a05 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11832,8 +11832,34 @@ by inspecting the system for user preference.")
      `(#:cargo-inputs
        (("rust-log" ,rust-log-0.4))))))
 
-(define-public rust-loom-0.2
+(define-public rust-loom-0.3
   (package
+    (name "rust-loom")
+    (version "0.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "loom" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "10z738ig6vgvwc2kxjhjdr5b29p3ribk5f6gg6ak0xjxhjb4cnkc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;; TODO fails due to unresolved import
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-0.1)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-generator" ,rust-generator-0.6)
+        ("rust-scoped-tls" ,rust-scoped-tls-0.1)
+        ("rust-serde" ,rust-serde-1.0)
+        ("rust-serde-json" ,rust-serde-json-1.0))))
+    (home-page "https://github.com/tokio-rs/loom")
+    (synopsis "Permutation testing for concurrent code")
+    (description "Permutation testing for concurrent code")
+    (license license:expat)))
+
+(define-public rust-loom-0.2
+  (package/inherit rust-loom-0.3
     (name "rust-loom")
     (version "0.2.13")
     (source
@@ -11852,14 +11878,10 @@ by inspecting the system for user preference.")
         ("rust-scoped-tls" ,rust-scoped-tls-0.1)
         ("rust-serde" ,rust-serde-1.0)
         ("rust-serde-test" ,rust-serde-test-1.0)
-        ("rust-serde-json" ,rust-serde-json-1.0))))
-    (home-page "https://github.com/tokio-rs/loom")
-    (synopsis "Model checker for concurrent code")
-    (description "Model checker for concurrent code.")
-    (license license:expat)))
+        ("rust-serde-json" ,rust-serde-json-1.0))))))
 
 (define-public rust-loom-0.1
-  (package/inherit rust-loom-0.2
+  (package/inherit rust-loom-0.3
     (name "rust-loom")
     (version "0.1.1")
     (source
-- 
cgit v1.2.3


From a74ece550aaccb695de0826823f5dc4d7b4e99c9 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 22:52:37 +0200
Subject: gnu: Add rust-lru-cache-0.1.

* gnu/packages/crates-io.scm (rust-lru-cache-0.1): New variable.
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5bfeb57a05..242140364d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11903,6 +11903,28 @@ by inspecting the system for user preference.")
         ("rust-serde-derive" ,rust-serde-derive-1.0)
         ("rust-serde-json" ,rust-serde-json-1.0))))))
 
+(define-public rust-lru-cache-0.1
+  (package
+    (name "rust-lru-cache")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "lru-cache" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "071viv6g2p3akwqmfb3c8vsycs5n7kr17b70l7la071jv0d4zqii"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-heapsize" ,rust-heapsize-0.4)
+        ("rust-linked-hash-map" ,rust-linked-hash-map-0.5))))
+    (home-page "https://github.com/contain-rs/lru-cache")
+    (synopsis "Cache that holds a limited number of key-value pairs")
+    (description "This package provides a cache that holds a limited number of
+key-value pairs.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-lscolors-0.6
   (package
     (name "rust-lscolors")
-- 
cgit v1.2.3


From c89bbc8ea219f22f24f5e5dbb8dd9aeb2fbd16da Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 7 Mar 2020 16:14:47 +0100
Subject: gnu: Add rust-mach-o-sys-0.1.

* gnu/package/crates-io.scm (rust-mach-o-sys-0.1): New variable.
---
 gnu/packages/crates-io.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 242140364d..57b17285d2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12075,6 +12075,24 @@ implementation of LZMA and xz stream encoding/decoding.")
      "This package provides a collection of great and ubiqutitous macros.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-mach-o-sys-0.1
+  (package
+    (name "rust-mach-o-sys")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mach-o-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09l8p7nmzq37450x2h6nb7dzg1sk6dk36a5rkcrcy81zm21lb19y"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/fitzgen/mach_o_sys")
+    (synopsis "Bindings to the OSX mach-o system library")
+    (description "This package provides bindings to the OSX mach-o system
+library")
+  (license (list license:asl2.0 license:expat))))
+
 (define-public rust-make-cmd-0.1
   (package
     (name "rust-make-cmd")
-- 
cgit v1.2.3


From d2f03b8d1b3ca4cff5e07d40186de5e2160c66fe Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 7 Mar 2020 16:15:33 +0100
Subject: gnu: Add rust-memsec-0.5.

* gnu/packages/crates-io.scm (rust-memsec-0.5): New variable.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 57b17285d2..815d05aa31 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12516,6 +12516,30 @@ for Rust structs.")
          "1cvm2z7dy138s302ii7wlzcxbka5a8yfl5pl5di7lbdnw9hw578g"))))
     (arguments `(#:skip-build? #t))))
 
+(define-public rust-memsec-0.5
+  (package
+    (name "rust-memsec")
+    (version "0.5.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "memsec" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13ir50j549gdz94pds1i7ljnk14d66q5x91s11hncm1pih7jif8c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-getrandom" ,rust-getrandom-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-mach-o-sys" ,rust-mach-o-sys-0.1)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/quininer/memsec")
+    (synopsis "Rust implementation of libsodium/utils")
+    (description "This package provides a Rust implementation of
+@code{libsodium/utils}.")
+    (license license:expat)))
+
 (define-public rust-metadeps-1.1
   (package
     (name "rust-metadeps")
-- 
cgit v1.2.3


From ba9a0766eb59188587e72a92f5bb81f259cc72e2 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 21 Apr 2020 00:31:43 +0200
Subject: gnu: Add rust-parity-tokio-ipc-0.4.

* gnu/packages/crates-io.scm (rust-parity-tokio-ipc-0.4): New variable.
---
 gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 815d05aa31..f2bf4358c8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14898,6 +14898,36 @@ normally prevent moving a type that has been borrowed from.")
     (description "This package provides FFI bindings to libgtk-3.")
     (license license:expat)))
 
+(define-public rust-parity-tokio-ipc-0.4
+  (package
+    (name "rust-parity-tokio-ipc")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "parity-tokio-ipc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gzifrrpiw78p6dq9ax64vhffc4h6mwg6jazpfgkz8zy0jjzwmqy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.4)
+        ("rust-futures" ,rust-futures-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-mio-named-pipes" ,rust-mio-named-pipes-0.1)
+        ("rust-miow" ,rust-miow-0.3)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-tokio" ,rust-tokio-0.1)
+        ("rust-tokio-named-pipes" ,rust-tokio-named-pipes-0.1)
+        ("rust-tokio-uds" ,rust-tokio-uds-0.2)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/nikvolf/parity-tokio-ipc")
+    (synopsis "Interprocess communication library for tokio")
+    (description "Interprocess communication library for tokio.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-parity-wasm-0.41
   (package
     (name "rust-parity-wasm")
-- 
cgit v1.2.3


From bc9a35b671002b11e1c011bb6318d80c821d4056 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 23:25:00 +0200
Subject: gnu: Add rust-pin-project-lite-0.1.

* gnu/packages/crates-io.scm (rust-pin-project-lite-0.1): New variable.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f2bf4358c8..c688d81a36 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16186,6 +16186,29 @@ interactive applications.")
      "This package provides a library for window abstraction.")
     (license license:expat)))
 
+(define-public rust-pin-project-lite-0.1
+  (package
+    (name "rust-pin-project-lite")
+    (version "0.1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pin-project-lite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1bljczwz9yyb6jskjhbkilcbdg7v1mhfwzp2mxknzf7v1isl8y13"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-rustversion" ,rust-rustversion-1.0)
+        ("rust-trybuild" ,rust-trybuild-1.0))))
+    (home-page "https://github.com/taiki-e/pin-project-lite")
+    (synopsis "Lightweight version of pin-project written with declarative
+macros")
+    (description "This package provides a lightweight version of pin-project
+written with declarative macros.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-pkg-config-0.3
   (package
     (name "rust-pkg-config")
-- 
cgit v1.2.3


From f71b062a8ab6d5f606eddca50fd12a8cfb5c6a34 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 21 Apr 2020 00:46:16 +0200
Subject: gnu: Add rust-prettytable-rs-0.8.

* gnu/packages/crates-io.scm (rust-prettytable-rs-0.8): New variable.
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c688d81a36..63ee90277e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16598,6 +16598,32 @@ replacements, adding colorful diffs.")
     (description "This package provides a visually pretty env_logger.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-prettytable-rs-0.8
+  (package
+    (name "rust-prettytable-rs")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "prettytable-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0bmcsxkcy94hi0jz5db0fz137w5aaf17z2j1ryn2vyh400blpl0g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-atty" ,rust-atty-0.2)
+        ("rust-csv" ,rust-csv-1.1)
+        ("rust-encode-unicode" ,rust-encode-unicode-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-term" ,rust-term-0.5)
+        ("rust-unicode-width" ,rust-unicode-width-0.1))))
+    (home-page "https://github.com/phsym/prettytable-rs")
+    (synopsis "Library for printing pretty formatted tables in terminal")
+    (description "This package provides a library for printing pretty
+formatted tables in terminal.")
+    (license license:bsd-3)))
+
 (define-public rust-proc-macro-error-0.4
   (package
     (name "rust-proc-macro-error")
-- 
cgit v1.2.3


From 2182dd234d33080ed7d31d71bada7a4a7fc3ffbb Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 22:38:05 +0200
Subject: gnu: Add rust-pretty-assertions-0.2.

* gnu/packages/crates-io.scm (rust-pretty-assertions-0.2): New variable.
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 63ee90277e..1f62a5f5e2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16573,6 +16573,27 @@ dependency to expose a precomputed hash.")
 replacements, adding colorful diffs.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pretty-assertions-0.2
+  (package
+    (name "rust-pretty-assertions")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pretty-assertions" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1b3nv70i16737w3qkk1q5vqswwnb19znz8r9v2kcg1qyhh3h0l8x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-difference" ,rust-difference-1))))
+    (home-page "https://github.com/colin-kiegel/rust-pretty-assertions")
+    (synopsis "Colorful diffs for `assert_eq!` and `assert_ne!`")
+    (description "Overwrite `assert_eq!` and `assert_ne!` with drop-in
+replacements, adding colorful diffs.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pretty-env-logger-0.3
   (package
     (name "rust-pretty-env-logger")
-- 
cgit v1.2.3


From 168a92e0c070808e6d3d5fdc6a65a4139338cef1 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 23:04:17 +0200
Subject: gnu: Add rust-pulldown-cmark-0.0.8.

* gnu/packages/crates-io.scm (rust-pulldown-cmark-0.0.8): New variable.
---
 gnu/packages/crates-io.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1f62a5f5e2..8c5ec2f0bd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17038,6 +17038,23 @@ stack pointer and inspect the properties of the stack.")
      "This package provides a pull parser for CommonMark.")
     (license license:expat)))
 
+(define-public rust-pulldown-cmark-0.0.8
+  (package/inherit rust-pulldown-cmark-0.4
+    (name "rust-pulldown-cmark")
+    (version "0.0.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pulldown-cmark" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hbg68h1w48cp72n95hjmbm70jrb5khc9vipcmjng83wjaxxfn0h"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-0.5)
+        ("rust-getopts" ,rust-getopts-0.2))))))
+
 (define-public rust-quantiles-0.7
   (package
     (name "rust-quantiles")
-- 
cgit v1.2.3


From e845c148ed3d524392845f08c98b16ebd37b478d Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 22:10:11 +0200
Subject: gnu: Add rust-rayon-0.8.

* gnu/packages/crates-io.scm (rust-rayon-0.8): New variable.
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8c5ec2f0bd..6edee04bda 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18164,6 +18164,28 @@ accessors.")
         ("rust-serde" ,rust-serde-1.0)
         ("rust-serde-derive" ,rust-serde-derive-1.0))))))
 
+(define-public rust-rayon-0.8
+  (package/inherit rust-rayon-1.3
+    (name "rust-rayon")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rayon" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1j2l9x98ma63qkh9w8zik0vcpwqf9cvc2ynh66ibjp36nq4gw55n"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-rayon-core" ,rust-rayon-core-1.7))
+      #:cargo-development-inputs
+      (("rust-compiletest-rs" ,rust-compiletest-rs-0.2)
+       ("rust-docopt" ,rust-docopt-0.7)
+       ("rust-futures" ,rust-futures-0.1)
+       ("rust-rand" ,rust-rand-0.3)
+       ("rust-rustc-serialize" ,rust-rustc-serialize-0.3))))))
+
 (define-public rust-rayon-core-1.7
   (package
     (name "rust-rayon-core")
-- 
cgit v1.2.3


From 7c7289e678b7549b16ace34603a1e62ffda309af Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 22:24:05 +0200
Subject: gnu: Add rust-ring-0.16.

* gnu/packages/crates-io.scm (rust-ring-0.16): New variable.
---
 gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6edee04bda..ec0215da17 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18781,6 +18781,36 @@ uses finite automata and guarantees linear time matching on all inputs.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-ring-0.16
+  (package
+    (name "rust-ring")
+    (version "0.16.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ring" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "033sb54dlmiqdivc8v9ykkq3v08lzy0syjf5k1nag2gfcknai98v"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-spin" ,rust-spin-0.5)
+        ("rust-untrusted" ,rust-untrusted-0.7)
+        ("rust-web-sys" ,rust-web-sys-0.3)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ;; build dependencies
+        ("rust-cc" ,rust-cc-1.0))
+       #:cargo-development-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2))))
+    (home-page "https://github.com/briansmith/ring")
+    (synopsis "Safe, fast, small crypto using Rust")
+    (description "This package provided safe, fast, small crypto using Rust.")
+    (license (list license:isc license:openssl))))
+
 (define-public rust-ron-0.4
   (package
     (name "rust-ron")
-- 
cgit v1.2.3


From 98a653c79f5a530bcc8a365365e45344e5eba476 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 25 Apr 2020 12:12:05 +0200
Subject: gnu: Add rust-ring-0.13.

* gnu/packages/crates-io.scm (rust-ring-0.13): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ec0215da17..db30e2f0b3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18811,6 +18811,26 @@ uses finite automata and guarantees linear time matching on all inputs.")
     (description "This package provided safe, fast, small crypto using Rust.")
     (license (list license:isc license:openssl))))
 
+(define-public rust-ring-0.13
+  (package/inherit rust-ring-0.16
+    (name "rust-ring")
+    (version "0.13.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ring" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12j580by6a438i5mw3136cj3lxylywymdr5p8rqlkwrm5s5bck9c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-untrusted" ,rust-untrusted-0.6)
+        ;; build dependencies
+        ("rust-cc" ,rust-cc-1.0))))))
+
 (define-public rust-ron-0.4
   (package
     (name "rust-ron")
-- 
cgit v1.2.3


From ff8abd44cdd189c4093907d03854cbb69470ea82 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 11:26:53 +0100
Subject: gnu: Add rust-rpassword-4.

* gnu/packages/crates-io.scm (rust-rpassword-4): New variable.
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index db30e2f0b3..4dedff2d1f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18860,6 +18860,28 @@ uses finite automata and guarantees linear time matching on all inputs.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-rpassword-4
+  (package
+    (name "rust-rpassword")
+    (version "4.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rpassword" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jnl8wzmdazkpzqs0vsw0n0vm0v4b8chqifd6s84nl9w2ybhx7ym"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/conradkleinespel/rpassword")
+    (synopsis "Read passwords in Rust console applications")
+    (description "This package provides a crate for reading passwords in
+console applications.")
+  (license license:asl2.0)))
+
 (define-public rust-rust-argon2-0.7
   (package
     (name "rust-rust-argon2")
-- 
cgit v1.2.3


From 199816190978616d6f101987aa64a5b1bb421c62 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 14:00:37 +0100
Subject: gnu: Add rust-rspec-1.

* gnu/packages/crates-io.scm (rust-rspec-1.0): New variable.
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4dedff2d1f..7292ab7449 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18860,6 +18860,34 @@ uses finite automata and guarantees linear time matching on all inputs.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-rspec-1
+  (package
+    (name "rust-rspec")
+    (version "1.0.0-beta.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rspec" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1abfzwkbxlwahb243k8d3fp6i135lx1aqmbfl79w9zlpng182ndk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;; TODO unpackaged dev-dependencies
+       #:cargo-inputs
+       (("rust-colored" ,rust-colored-1.9)
+        ("rust-derive-new" ,rust-derive-new-0.5)
+        ("rust-derive-builder" ,rust-derive-builder-0.5)
+        ("rust-expectest" ,rust-expectest-0.9)
+        ("rust-rayon" ,rust-rayon-0.8))
+       #:cargo-development-inputs
+       (("rust-clippy" ,rust-clippy-0.0)))) ;; requires 0.0.153
+    (home-page "https://github.com/rust-rspec/rspec")
+    (synopsis "Write Rspec-like tests with stable rust")
+    (description "This package helps writing Rspec-like tests with stable
+rust.")
+    (license license:mpl2.0)))
+
 (define-public rust-rpassword-4
   (package
     (name "rust-rpassword")
-- 
cgit v1.2.3


From 2f2a094867278ec296a6a186606476a8f57c5200 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 22:44:24 +0200
Subject: gnu: Add rust-rusqlite-0.19.

* gnu/packages/crates-io.scm (rust-rusqlite-0.19): New variable.
---
 gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7292ab7449..1a694605ab 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42,6 +42,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages serialization)
+  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
@@ -18910,6 +18911,48 @@ rust.")
 console applications.")
   (license license:asl2.0)))
 
+(define-public rust-rusqlite-0.19
+  (package
+    (name "rust-rusqlite")
+    (version "0.19.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rusqlite" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19xq7s0kzhlljm3hqx0vidr91ia8hl49r4m5gwdj9dyywgks5g3f"))))
+    (build-system cargo-build-system)
+    (inputs
+     `(("sqlite" ,sqlite)))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-byteorder" ,rust-byteorder-1.3)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-csv" ,rust-csv-1.1)
+        ("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
+        ("rust-fallible-streaming-iterator"
+         ,rust-fallible-streaming-iterator-0.1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.15)
+        ("rust-lru-cache" ,rust-lru-cache-0.1)
+        ("rust-memchr" ,rust-memchr-2.2)
+        ("rust-serde-json" ,rust-serde-json-1.0)
+        ("rust-time" ,rust-time-0.1)
+        ("rust-url" ,rust-url-1.7)
+        ("rust-uuid" ,rust-uuid-0.7))
+       #:cargo-development-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-1.1)
+        ("rust-tempdir" ,rust-tempdir-0.3)
+        ("rust-unicase" ,rust-unicase-2.4)
+        ("rust-uuid" ,rust-uuid-0.7))))
+    (home-page "https://github.com/rusqlite/rusqlite")
+    (synopsis "Wrapper for SQLite")
+    (description "This prackage provides a wrapper for SQLite.")
+    (license license:expat)))
+
 (define-public rust-rust-argon2-0.7
   (package
     (name "rust-rust-argon2")
-- 
cgit v1.2.3


From b469d7e58f6e6016347f26ad11dba04799a69692 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 22:35:33 +0200
Subject: gnu: Add rust-rustls-0.16.

* gnu/packages/crates-io.scm (rust-rustls-0.16): New variable.
---
 gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1a694605ab..9a68752ac3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19411,6 +19411,37 @@ rustc compiler.")
      "Automatically apply the suggestions made by rustc.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rustls-0.16
+  (package
+    (name "rust-rustls")
+    (version "0.16.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17n0fx3fpkg4fhpdplrdhkissnl003kj90vzbqag11vkpyqihnmj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;; 1/114 tests fail (test file not found)
+       #:cargo-inputs
+       (("rust-base64" ,rust-base64-0.10)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-sct" ,rust-sct-0.6)
+        ("rust-webpki" ,rust-webpki-0.21))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.2)
+        ("rust-env-logger" ,rust-env-logger-0.6)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-tempfile" ,rust-tempfile-3.0)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.17))))
+    (home-page "https://github.com/ctz/rustls")
+  (synopsis "Modern TLS library written in Rust")
+  (description "This package provides a modern TLS library written in Rust.")
+  (license (list license:asl2.0 license:isc license:expat))))
+
 (define-public rust-rusttype-0.8
   (package
     (name "rust-rusttype")
-- 
cgit v1.2.3


From 9bc97f1259efb2807c8217be465aa8ca21cbac6c Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 25 Apr 2020 12:12:29 +0200
Subject: gnu: Add rust-rustls-0.12.

* gnu/packages/crates-io.scm (rust-rustls-0.12): New variable.
---
 gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9a68752ac3..017cbb0697 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19442,6 +19442,38 @@ rustc compiler.")
   (description "This package provides a modern TLS library written in Rust.")
   (license (list license:asl2.0 license:isc license:expat))))
 
+(define-public rust-rustls-0.12
+  (package/inherit rust-rustls-0.16
+    (name "rust-rustls")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1k8b8cc0pjkv5cxdgs43jif7nslzsxair9b2sifgvjag7a4f8wmb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;; 1/45 tests fails due to some missing file
+       #:cargo-inputs
+       (("rust-base64" ,rust-base64-0.9)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-ring" ,rust-ring-0.13)
+        ("rust-sct" ,rust-sct-0.3)
+        ("rust-untrusted" ,rust-untrusted-0.6)
+        ("rust-webpki" ,rust-webpki-0.18))
+       #:cargo-development-inputs
+       (("rust-ct-logs" ,rust-ct-logs-0.3)
+        ("rust-docopt" ,rust-docopt-0.8)
+        ("rust-env-logger" ,rust-env-logger-0.4)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-mio" ,rust-mio-0.6)
+        ("rust-regex" ,rust-regex-0.2)
+        ("rust-serde" ,rust-serde-1.0)
+        ("rust-serde-derive" ,rust-serde-derive-1.0)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.14))))))
+
 (define-public rust-rusttype-0.8
   (package
     (name "rust-rusttype")
-- 
cgit v1.2.3


From 59771653d4ff789762b8982c2c3c9700aa804ad2 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 22:52:16 +0200
Subject: gnu: Add rust-sct-0.6.

* gnu/packages/crates-io.scm (rust-sct-0.6): New variable.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 017cbb0697..9d5568ed5c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19973,6 +19973,29 @@ Pwrite traits from the scroll crate.")
 Pwrite traits from the scroll crate.")
     (license license:expat)))
 
+(define-public rust-sct-0.6
+  (package
+    (name "rust-sct")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sct" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0g4dz7las43kcpi9vqv9c6l1afjkdv3g3w3s7d2w7a7w77wjl173"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ring" ,rust-ring-0.16)
+        ("rust-untrusted" ,rust-untrusted-0.7))
+       #:cargo-development-inputs
+       (("rust-cc" ,rust-cc-1.0))))
+    (home-page "https://github.com/ctz/sct.rs")
+    (synopsis "Certificate transparency SCT verification library")
+    (description "Certificate transparency SCT verification library")
+    (license (list license:asl2.0 license:isc license:expat))))
+
 (define-public rust-seahash-3.0
   (package
     (name "rust-seahash")
-- 
cgit v1.2.3


From 86eb83b288b01a8125fb23c4413788c61da3a70f Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 25 Apr 2020 12:29:10 +0200
Subject: gnu: Add rust-sct-0.3.

* gnu/packages/crates-io.scm (rust-sct-0.3): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9d5568ed5c..055a53c22a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19996,6 +19996,26 @@ Pwrite traits from the scroll crate.")
     (description "Certificate transparency SCT verification library")
     (license (list license:asl2.0 license:isc license:expat))))
 
+(define-public rust-sct-0.3
+  (package/inherit rust-sct-0.6
+    (name "rust-sct")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sct" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0z090j3lvy0lqbhmpswm4vb2n4i8dqswy0l93abdx9biipnhlm5l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ring" ,rust-ring-0.13)
+        ("rust-untrusted" ,rust-untrusted-0.6))
+       #:cargo-development-inputs
+       (("rust-cc" ,rust-cc-1.0))))))
+
+
 (define-public rust-seahash-3.0
   (package
     (name "rust-seahash")
-- 
cgit v1.2.3


From 60d19eca1f74b024d8ae982a873b43de10cb057e Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 12:34:05 +0100
Subject: gnu: Add rust-sha2-asm-0.5.

* gnu/packages/crates-io.scm (rust-sha2-asm-0.5): New variable.
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 055a53c22a..b06baa623f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20889,6 +20889,27 @@ for the serde framework.")
      "Assembly implementation of SHA-1 compression function.")
     (license license:expat)))
 
+(define-public rust-sha2-asm-0.5
+  (package
+    (name "rust-sha2-asm")
+    (version "0.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sha2-asm" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0k3qwv2yl8fyi2i6cprfb8d874ii5kmcmckgnjkwnz2ac9fayyl1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cc" ,rust-cc-1.0)))) ;; build dependency
+    (home-page "https://github.com/RustCrypto/asm-hashes")
+    (synopsis "Assembly implementation of SHA-2")
+    (description "This package provides an assembly implementations of hash
+functions core functionality.")
+    (license license:expat)))
+
 (define-public rust-shader-version-0.6
   (package
     (name "rust-shader-version")
-- 
cgit v1.2.3


From dca13c5d7915c901acca322ecf4289b33a4d5303 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Mar 2020 12:35:50 +0100
Subject: gnu: Add rust-sha2-0.8.

* gnu/packages/crates-io.scm (rust-sha2-0.8): New variable.
---
 gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b06baa623f..d80cfba4cc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20889,6 +20889,35 @@ for the serde framework.")
      "Assembly implementation of SHA-1 compression function.")
     (license license:expat)))
 
+(define-public rust-sha2-0.8
+  (package
+    (name "rust-sha2")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sha2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1827pplynq0ahxid1xq281kiv56kj2afp7gm97v7gw71sbgll117"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-block-buffer" ,rust-block-buffer-0.7)
+        ("rust-digest" ,rust-digest-0.8)
+        ("rust-fake-simd" ,rust-fake-simd-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-opaque-debug" ,rust-opaque-debug-0.2)
+        ("rust-sha2-asm" ,rust-sha2-asm-0.5))
+       #:cargo-development-inputs
+       (("rust-cc" ,rust-cc-1.0) ;; FIXME for rust-sha2-asm, why again?
+        ("rust-digest" ,rust-digest-0.8)
+        ("rust-hex-literal" ,rust-hex-literal-0.1))))
+    (home-page "https://github.com/RustCrypto/hashes")
+    (synopsis "SHA-2 hash functions")
+    (description "SHA-2 hash functions")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-sha2-asm-0.5
   (package
     (name "rust-sha2-asm")
-- 
cgit v1.2.3


From 20505910c97a6eafeef2134412d0575a08dbe60d Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 23:04:30 +0200
Subject: gnu: Add rust-skeptic-0.9.

* gnu/packages/crates-io.scm (rust-skeptic-0.9): New variable.
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d80cfba4cc..32e29a8f65 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21254,6 +21254,27 @@ variants in pure Rust.")
      "SipHash functions from rust-core < 1.13.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-skeptic-0.9
+  (package
+    (name "rust-skeptic")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "skeptic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0savk91xy74izw9z6vn6ialkaqrp81w7dayha801b52h670qszfx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-pulldown-cmark" ,rust-pulldown-cmark-0.0.8)
+        ("rust-tempdir" ,rust-tempdir-0.3))))
+    (home-page "https://github.com/budziq/rust-skeptic")
+    (synopsis "Test your Rust markdown documentation via Cargo")
+    (description "Test your Rust markdown documentation via Cargo")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-skeptic-0.13
   (package
     (name "rust-skeptic")
-- 
cgit v1.2.3


From 3e76f5eb8274ae9ea5ca348011db3830dbfeff03 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 23:19:22 +0200
Subject: gnu: Add rust-spmc-0.3.

* gnu/packages/crates-io.scm (rust-spmc-0.3): New variable.
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 32e29a8f65..72e259a107 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21665,6 +21665,27 @@ initializers are available.")
          "07ywqn1vrpi3c43fmvsx7pawk9h3rb77yyqbnhap2micl454kb6f"))))
     (arguments '(#:skip-build? #t))))
 
+(define-public rust-spmc-0.3
+  (package
+    (name "rust-spmc")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "spmc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rgcqgj6b3d0cshi7277akr2xk0cx11rkmviaahy7a3pla6l5a02"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;; tests hang
+       #:cargo-development-inputs
+       (("rust-loom" ,rust-loom-0.2))))
+    (home-page "https://github.com/seanmonstar/spmc")
+    (synopsis "Simple SPMC channel")
+    (description "Simple SPMC channel")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-spsc-buffer-0.1
   (package
     (name "rust-spsc-buffer")
-- 
cgit v1.2.3


From 5db08ef460a1f63763bcf8c9f9bf531ed17692db Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 21:59:17 +0200
Subject: gnu: Add rust-string-0.2.

* gnu/packages/crates-io.scm (rust-string-0.2): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 72e259a107..d201476337 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22027,6 +22027,26 @@ crate.")
     (license (list license:unlicense
                    license:expat))))
 
+(define-public rust-string-0.2
+  (package
+    (name "rust-string")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "string" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vaxz85ja52fn66akgvggb29wqa5bpj3y38syykpr1pbrjzi8hfj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-bytes" ,rust-bytes-0.4))))
+    (home-page "https://github.com/carllerche/string")
+    (synopsis "UTF-8 encoded string with configurable byte storage")
+    (description "This package provides a UTF-8 encoded string with
+configurable byte storage.")
+    (license license:expat)))
+
 (define-public rust-string-cache-0.7
   (package
     (name "rust-string-cache")
-- 
cgit v1.2.3


From 685b4f8d6f4cd287269d80a0365e26d4f7307f55 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 22:37:13 +0200
Subject: gnu: Add rust-term-0.2.

* gnu/packages/crates-io.scm (rust-term-0.2): New variable.
---
 gnu/packages/crates-io.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d201476337..fbe287a0c0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23114,6 +23114,22 @@ directories.")
        (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
         ("rust-winapi" ,rust-winapi-0.2))))))
 
+(define-public rust-term-0.2
+  (package/inherit rust-term-0.4
+    (name "rust-term")
+    (version "0.2.14")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "term" version))
+        (file-name (string-append name "-" version ".crate"))
+        (sha256
+         (base32 "109jmzddq1kz6wm2ndgddy7yrlqcw2i36ygxl0fcymc0sda7w1zj"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
+        ("rust-winapi" ,rust-winapi-0.2))))))
+
 (define-public rust-term-grid-0.1
   (package
     (name "rust-term-grid")
-- 
cgit v1.2.3


From ef7fdc2c81df238fae5feebde24ce2830ad83c38 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 23:12:18 +0200
Subject: gnu: Add rust-tokio-0.2.

* gnu/packages/crates-io.scm (rust-tokio-0.2): New variable.
---
 gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fbe287a0c0..d99b2873d3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23669,6 +23669,51 @@ in Rust.")
      "Simple, lightweight template engine.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-tokio-0.2
+  (package
+    (name "rust-tokio")
+    (version "0.2.18")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04v7rfkrlr8cx30ygy0n45skf6pdbif0zisn9a5xrdnjfb81dvrl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.5)
+        ("rust-fnv" ,rust-fnv-1.0)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-iovec" ,rust-iovec-0.1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memchr" ,rust-memchr-2.2)
+        ("rust-mio" ,rust-mio-0.6)
+        ("rust-mio-named-pipes" ,rust-mio-named-pipes-0.1)
+        ("rust-mio-uds" ,rust-mio-uds-0.6)
+        ("rust-num-cpus" ,rust-num-cpus-1.10)
+        ("rust-parking-lot" ,rust-parking-lot-0.10)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.1)
+        ("rust-signal-hook-registry" ,rust-signal-hook-registry-1.2)
+        ("rust-slab" ,rust-slab-0.4)
+        ("rust-tokio-macros" ,rust-tokio-macros-0.2)
+        ("rust-winapi" ,rust-winapi-0.3))
+      #:cargo-development-inputs
+      (("rust-futures" ,rust-futures-0.3)
+       ("rust-loom" ,rust-loom-0.3)
+       ("rust-proptest" ,rust-proptest-0.9)
+       ("rust-tempfile" ,rust-tempfile-3.1)
+       ("rust-tokio-test" ,rust-tokio-test-0.2))))
+    (home-page "https://tokio.rs")
+    (synopsis "Event-driven, non-blocking I/O platform")
+    (description
+     "An event-driven, non-blocking I/O platform for writing asynchronous I/O
+backed applications.")
+    (license license:expat)))
+
 (define-public rust-tokio-0.1
   (package
     (name "rust-tokio")
-- 
cgit v1.2.3


From 4af563b90ffbceb8d8ef2d12a442bbd58af09ec8 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 21:47:07 +0200
Subject: gnu: Add rust-tokio-buf-0.1.

* gnu/packages/crates-io.scm (rust-tokio-buf-0.1): New variable.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d99b2873d3..59ce7afa46 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23768,6 +23768,30 @@ backed applications.")
 backed applications.")
     (license license:expat)))
 
+(define-public rust-tokio-buf-0.1
+  (package
+    (name "rust-tokio-buf")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-buf" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0inwrkh8knqy44mr9h2i305zyy4pxhfy90y0gr5rm1akdks21clg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.4)
+        ("rust-either" ,rust-either-1.5)
+        ("rust-futures" ,rust-futures-0.1))
+       #:cargo-development-inputs
+       (("rust-tokio-mock-task" ,rust-tokio-mock-task-0.1))))
+    (home-page "https://tokio.rs")
+    (synopsis "Asynchronous stream of byte buffers")
+    (description "Asynchronous stream of byte buffers")
+    (license license:expat)))
+
 ;; Cyclic dependency with tokio-io
 (define-public rust-tokio-codec-0.1
   (package
-- 
cgit v1.2.3


From 92c4b7c0fd74b4e71ad70bd94211e4dba35a012f Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 23:39:43 +0200
Subject: gnu: Add rust-tokio-macros-0.2.

* gnu/packages/crates-io.scm (rust-tokio-macros-0.2): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 59ce7afa46..4caf3c051c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24014,6 +24014,31 @@ the current thread.")
 futures efficiently")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-tokio-macros-0.2
+  (package
+    (name "rust-tokio-macros")
+    (version "0.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1283aq0l7rnh79zzqk4r34dgimvwcymrzmg1yah9ai2nmb3arhzh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;; FIXME tests use bytes-0.5, require Rust >= 1.39
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1.0)
+        ("rust-quote" ,rust-quote-1.0)
+        ("rust-syn" ,rust-syn-1.0))
+       #:cargo-development-inputs
+       (("rust-tokio" ,rust-tokio-0.2))))
+    (home-page "https://tokio.rs")
+    (synopsis "Tokio's proc macros")
+    (description "This package provides Tokio's proc macros.")
+    (license license:expat)))
+
 (define-public rust-tokio-mock-task-0.1
   (package
     (name "rust-tokio-mock-task")
-- 
cgit v1.2.3


From e645d58ce1574008a6cdd9269bc9bff9fa185402 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 21 Apr 2020 00:39:38 +0200
Subject: gnu: Add rust-tokio-named-pipes-0.1.

* gnu/packages/crates-io.scm (rust-tokio-named-pipes-0.1): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4caf3c051c..e9796b8757 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24060,6 +24060,31 @@ futures efficiently")
     (description "Mock a Tokio task.")
     (license license:expat)))
 
+(define-public rust-tokio-named-pipes-0.1
+  (package
+    (name "rust-tokio-named-pipes")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-named-pipes" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1bjy59wdl2anl22w6qyzkff1afv7ynayfpms10iqna2j6142sa4x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.4)
+        ("rust-futures" ,rust-futures-0.1)
+        ("rust-mio" ,rust-mio-0.6)
+        ("rust-mio-named-pipes" ,rust-mio-named-pipes-0.1)
+        ("rust-tokio" ,rust-tokio-0.1))))
+    (home-page "https://github.com/nikvolf/tokio-named-pipes")
+    (synopsis "Windows named pipe bindings for tokio")
+    (description "This package provides bindings for Windows named pipe for
+Tokio.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-tokio-process-0.2
   (package
     (name "rust-tokio-process")
-- 
cgit v1.2.3


From 6001456946ae18a7e616c810c4069449f3092c02 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Fri, 24 Apr 2020 23:31:55 +0200
Subject: gnu: Add rust-tokio-mockstream-1.

* gnu/packages/crates-io.scm (rust-tokio-mockstream-1): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e9796b8757..230e1d27a6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24060,6 +24060,31 @@ futures efficiently")
     (description "Mock a Tokio task.")
     (license license:expat)))
 
+(define-public rust-tokio-mockstream-1
+  (package
+    (name "rust-tokio-mockstream")
+    (version "1.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-mockstream" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mg1i39cl8x32wxwbn74hlirks8a6f3g0gfzkb0n0zwbxwvc9gs1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-futures" ,rust-futures-0.1)
+        ("rust-tokio-io" ,rust-tokio-io-0.1))
+       #:cargo-development-inputs
+       (("rust-bytes" ,rust-bytes-0.4))))
+    (home-page "https://github.com/aatxe/tokio-mockstream")
+    (synopsis "Fake stream for testing network applications backed by
+buffers")
+    (description "This package provides a fake stream for testing network
+applications backed by buffers.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-tokio-named-pipes-0.1
   (package
     (name "rust-tokio-named-pipes")
-- 
cgit v1.2.3


From c834cf98066f4e332124172ac6a8a92790e2d5fb Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 23:12:35 +0200
Subject: gnu: Add rust-tokio-rustls-0.12.

* gnu/packages/crates-io.scm (rust-tokio-rustls-0.12): New variable.
---
 gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 230e1d27a6..3e7d574a5e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24189,6 +24189,37 @@ futures.")
      "Event loop that drives Tokio I/O resources.")
     (license license:expat)))
 
+(define-public rust-tokio-rustls-0.12
+  (package
+    (name "rust-tokio-rustls")
+    (version "0.12.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-rustls" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1k6rpw4nmgsamh8vbf8xqrf4rr5sqs18i93561bydflajz0gw6hl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;; FIXME requires Rust >= 1.39 for building
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.5)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-rustls" ,rust-rustls-0.16)
+        ("rust-tokio" ,rust-tokio-0.2)
+        ("rust-webpki" ,rust-webpki-0.21))
+       #:cargo-development-inputs
+       (("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-tokio" ,rust-tokio-0.2)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.18))))
+    (home-page "https://github.com/quininer/tokio-rustls")
+    (synopsis "Asynchronous TLS/SSL streams for Tokio using Rustls")
+    (description "This package provides asynchronous TLS/SSL streams for Tokio
+using Rustls.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-tokio-signal-0.2
   (package
     (name "rust-tokio-signal")
-- 
cgit v1.2.3


From c3e71dcea52417d65f8c2aa162cfbf948bc59386 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 23:30:20 +0200
Subject: gnu: Add rust-tokio-test-0.2.

* gnu/packages/crates-io.scm (rust-tokio-test-0.2): New variable.
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3e7d574a5e..1aed6ae43b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24285,6 +24285,32 @@ futures.")
     (description "Synchronization utilities.")
     (license license:expat)))
 
+(define-public rust-tokio-test-0.2
+  (package
+    (name "rust-tokio-test")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio-test" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0v81p2n853b1kzyla3dbfmnazirn6s3n8p3z8k20bmdn370lj07d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;; FIXME requires Rust >= 1.39 for building
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.5)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-tokio" ,rust-tokio-0.2))
+       #:cargo-development-inputs
+       (("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-tokio" ,rust-tokio-0.2))))
+    (home-page "https://tokio.rs")
+    (synopsis "Testing utilities for Tokio- and futures-based code")
+    (description "Testing utilities for Tokio- and futures-based code")
+    (license license:expat)))
+
 (define-public rust-tokio-tcp-0.1
   (package
     (name "rust-tokio-tcp")
-- 
cgit v1.2.3


From 25078818e93c8b2bad1654953f36e539835eef16 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 25 Apr 2020 12:22:08 +0200
Subject: gnu: Add rust-untrusted-0.6.

* gnu/packages/crates-io.scm (rust-untrusted-0.6): New variable.
---
 gnu/packages/crates-io.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1aed6ae43b..886cc6fce1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25185,6 +25185,18 @@ whitespace from a string.")
 untrusted inputs in Rust.")
     (license license:isc)))
 
+(define-public rust-untrusted-0.6
+  (package/inherit rust-untrusted-0.7
+    (name "rust-untrusted")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "untrusted" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0byf88b7ca1kb5aap8f6npp6xncvg95dnma8ipmnmd4n9r5izkam"))))))
+
 (define-public rust-url-2.1
   (package
     (name "rust-url")
-- 
cgit v1.2.3


From 5415f9d2a0cbd8b892ce4560b5bd47d23b4d6dbc Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 22:03:15 +0200
Subject: gnu: Add rust-want-0.2.

* gnu/packages/crates-io.scm (rust-want-0.2): New variable.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 886cc6fce1..fad514644e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25865,6 +25865,29 @@ specified across Unix and Windows platforms.")
         ("rust-rand" ,rust-rand-0.3)
         ("rust-rustc-serialize" ,rust-rustc-serialize-0.3))))))
 
+(define-public rust-want-0.2
+  (package
+    (name "rust-want")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "want" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0c52g7b4hhj033jc56sx9z3krivyciz0hlblixq2gc448zx5wfdn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;; 2/5 tests fail
+       #:cargo-inputs
+       (("rust-futures" ,rust-futures-0.1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-try-lock" ,rust-try-lock-0.2))))
+    (home-page "https://github.com/seanmonstar/want")
+    (synopsis "Detect when another Future wants a result")
+    (description "Detect when another Future wants a result.")
+    (license license:expat)))
+
 (define-public rust-wasi-0.9
   (package
     (name "rust-wasi")
-- 
cgit v1.2.3


From 0e52427150044afecefd9f4534d491a6b569e5e2 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 22:35:56 +0200
Subject: gnu: Add rust-webpki-0.21.

* gnu/packages/crates-io.scm (rust-webpki-0.21): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fad514644e..ccda9bf203 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26643,6 +26643,31 @@ protocol extensions.  Look at the crate wayland-client for usable bindings.")
      "Bindings for all Web APIs, a procedurally generated crate from WebIDL.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-webpki-0.21
+  (package
+    (name "rust-webpki")
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "webpki" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vv3x2alvczfy6jhx79c9h00d1nliqf7s5jlvcd6npc6f8chxxgi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;; tests fail to build "missing file tests/ed25519/ee.der"
+       #:cargo-inputs
+       (("rust-ring" ,rust-ring-0.16)
+        ("rust-untrusted" ,rust-untrusted-0.7))
+       #:cargo-development-inputs
+       (("rust-base64" ,rust-base64-0.9))))
+    (home-page "https://github.com/briansmith/webpki")
+    (synopsis "Web PKI X.509 Certificate Verification")
+    (description "This packge provides Web PKI X.509 Certificate
+Verification.")
+    (license license:isc)))
+
 (define-public rust-weedle-0.10
   (package
     (name "rust-weedle")
-- 
cgit v1.2.3


From 8c28fbc3bef2c4ece6fb07a0b81a35fb89b85db3 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 25 Apr 2020 12:37:04 +0200
Subject: gnu: Add rust-webpki-0.18.

* gnu/packages/crates-io.scm (rust-webpki-0.18): New variable.
---
 gnu/packages/crates-io.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ccda9bf203..9ade4b73d6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26668,6 +26668,25 @@ protocol extensions.  Look at the crate wayland-client for usable bindings.")
 Verification.")
     (license license:isc)))
 
+(define-public rust-webpki-0.18
+  (package/inherit rust-webpki-0.21
+    (name "rust-webpki")
+    (version "0.18.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "webpki" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zx1v8afa4ig97dyqfrnlj5i7pib6dnfw88qn2iiqhfq2rrrdmqp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ring" ,rust-ring-0.13)
+        ("rust-untrusted" ,rust-untrusted-0.6))
+       #:cargo-development-inputs
+       (("rust-base64" ,rust-base64-0.9))))))
+
 (define-public rust-weedle-0.10
   (package
     (name "rust-weedle")
-- 
cgit v1.2.3


From f96097da8ac3a5e0e818608cc4b4848a00362c00 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 19 Apr 2020 22:57:44 +0200
Subject: gnu: Add rust-webpki-roots-0.18.

* gnu/packages/crates-io.scm (rust-webpki-roots-0.18): New variable.
---
 gnu/packages/crates-io.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9ade4b73d6..b42cd82241 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26687,6 +26687,25 @@ Verification.")
        #:cargo-development-inputs
        (("rust-base64" ,rust-base64-0.9))))))
 
+(define-public rust-webpki-roots-0.18
+  (package
+    (name "rust-webpki-roots")
+    (version "0.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "webpki-roots" version))
+      (file-name (string-append name "-" version ".tar.gz"))
+      (sha256
+       (base32 "1d4ss607rgi9pj01zzqa13c1p3m35z314yh6lmjaj4kzvwv5gkci"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-webpki" ,rust-webpki-0.21))))
+    (home-page "https://github.com/ctz/webpki-roots")
+    (synopsis "Mozilla's CA root certificates for use with webpki")
+    (description "Mozilla's CA root certificates for use with webpki")
+    (license license:mpl2.0)))
+
 (define-public rust-weedle-0.10
   (package
     (name "rust-weedle")
-- 
cgit v1.2.3


From 5b4051bf0bba1623f81381fccd680f509c5482ed Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 25 Apr 2020 11:41:19 +0200
Subject: gnu: Add rust-webpki-roots-0.17.

* gnu/packages/crates-io.scm (rust-webpki-roots-0.17): New variable.
---
 gnu/packages/crates-io.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b42cd82241..df7e6a8a89 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26706,6 +26706,18 @@ Verification.")
     (description "Mozilla's CA root certificates for use with webpki")
     (license license:mpl2.0)))
 
+(define-public rust-webpki-roots-0.17
+  (package/inherit rust-webpki-roots-0.18
+    (name "rust-webpki-roots")
+    (version "0.17.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "webpki-roots" version))
+      (file-name (string-append name "-" version ".tar.gz"))
+      (sha256
+       (base32 "12vi8dh0yik0h4f0b9dnlw5i3gxyky7iblbksh6zcq4xvlvswqm2"))))))
+
 (define-public rust-weedle-0.10
   (package
     (name "rust-weedle")
-- 
cgit v1.2.3


From 1431405e3fd5fdb31d01245d4e43815c90914021 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sat, 25 Apr 2020 13:25:05 +0200
Subject: gnu: Add rust-webpki-roots-0.14.

* gnu/packages/crates-io.scm (rust-webpki-roots-0.14): New variable.
---
 gnu/packages/crates-io.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index df7e6a8a89..e34135cab9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26718,6 +26718,22 @@ Verification.")
       (sha256
        (base32 "12vi8dh0yik0h4f0b9dnlw5i3gxyky7iblbksh6zcq4xvlvswqm2"))))))
 
+(define-public rust-webpki-roots-0.14
+  (package/inherit rust-webpki-roots-0.18
+    (name "rust-webpki-roots")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "webpki-roots" version))
+      (file-name (string-append name "-" version ".tar.gz"))
+      (sha256
+       (base32 "05zw919077i3jadbvdsvl69wv2siijg2pjbykl6fyi7hmgb7bggd"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-untrusted" ,rust-untrusted-0.6)
+        ("rust-webpki" ,rust-webpki-0.18))))))
+
 (define-public rust-weedle-0.10
   (package
     (name "rust-weedle")
-- 
cgit v1.2.3


From cfb9bc26cc1d6d239e837dcb7423045c0d4fadec Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Mon, 20 Apr 2020 22:33:09 +0200
Subject: gnu: Add rust-zbase32-0.1.

* gnu/packages/crates-io.scm (rust-zbase32-0.1): New variable.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e34135cab9..a0be3575b8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27443,6 +27443,29 @@ to XDG Base Directory specification")
        (("rust-clippy" ,rust-clippy-0.0)
         ("rust-linked-hash-map" ,rust-linked-hash-map-0.3))))))
 
+(define-public rust-zbase32-0.1
+  (package
+    (name "rust-zbase32")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "zbase32" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gz3nmiaidscb5c85rh3qxi8i584gz5xm3amlxqminl8jq27k40g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;; dependency cypthon not yet availalbe
+       #:cargo-development-inputs
+       (;; ("rust-cpython" ,rust-cpython-0.2)  TODO
+        ("rust-quickcheck" ,rust-quickcheck-0.7)
+        ("rust-rand" ,rust-rand-0.6))))
+    (home-page "https://gitlab.com/pgerber/zbase32-rust")
+    (synopsis "Implementation of zbase32")
+    (description "This package provides an implementation of zbase32.")
+    (license license:lgpl3+)))
+
 (define-public rust-zip-0.5
   (package
     (name "rust-zip")
-- 
cgit v1.2.3


From 5effc5bfe1f9bbe94be9ac8bd40e2f2875b08720 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 23 Apr 2020 23:10:51 +0200
Subject: gnu: Add rust-nettle-sys-2.

* gnu/packages/crates-io.scm (rust-nettle-sys-2): New variable.
* gnu/packages/patches/rust-nettle-sys-disable-vendor.patch: New file.
* gnu/local.mk: Add it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/crates-io.scm                         | 31 ++++++++++++++
 .../patches/rust-nettle-sys-disable-vendor.patch   | 48 ++++++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 gnu/packages/patches/rust-nettle-sys-disable-vendor.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 0797efb93e..3d9f418133 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1433,6 +1433,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
   %D%/packages/patches/rust-bootstrap-stage0-test.patch		\
   %D%/packages/patches/rust-coresimd-doctest.patch		\
+  %D%/packages/patches/rust-nettle-sys-disable-vendor.patch	 \
   %D%/packages/patches/rust-reproducible-builds.patch		 \
   %D%/packages/patches/rust-openssl-sys-no-vendor.patch	\
   %D%/packages/patches/rxvt-unicode-escape-sequences.patch	\
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a0be3575b8..5980282399 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38,6 +38,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages nettle)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -13184,6 +13185,36 @@ types as proposed in RFC 1158.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-nettle-sys-2
+  (package
+    (name "rust-nettle-sys")
+    (version "2.0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nettle-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yq1w6dlcmg89x529i7s20j29afdhgim7qnsa7978fszzwrr6qmq"))
+       (patches (search-patches "rust-nettle-sys-disable-vendor.patch"))))
+    (build-system cargo-build-system)
+    (native-inputs
+     `(("clang" ,clang)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("nettle", nettle)))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-development-inputs
+       (("rust-bindgen" ,rust-bindgen-0.51)
+        ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (home-page "https://gitlab.com/sequoia-pgp/nettle-sys")
+    (synopsis "Low-level Rust bindings for the Nettle cryptographic library")
+    (description "This package provides low-level Rust bindings for the Nettle
+cryptographic library.")
+    (license ;; licensed under either of these, at your option
+     (list license:lgpl3 license:gpl2 license:gpl3))))
+
 (define-public rust-new-debug-unreachable-1.0
   (package
     (name "rust-new-debug-unreachable")
diff --git a/gnu/packages/patches/rust-nettle-sys-disable-vendor.patch b/gnu/packages/patches/rust-nettle-sys-disable-vendor.patch
new file mode 100644
index 0000000000..ae5ef5ebe0
--- /dev/null
+++ b/gnu/packages/patches/rust-nettle-sys-disable-vendor.patch
@@ -0,0 +1,48 @@
+Subject: nettle-sys: clear out "vendored" feature cruft from build.rs
+From: Daniel Kahn Gillmor's avatarDaniel Kahn Gillmor 
+
+https://salsa.debian.org/rust-team/debcargo-conf/-/commit/0c71150ad26bb66a8396dcdab055181af232ddc5
+https://sources.debian.org/src/rust-nettle-sys/2.0.4-3/debian/patches/disable-vendor.diff/
+--- a/Cargo.toml	2019-10-23 13:08:07.000000000 -0400
++++ b/Cargo.toml	2019-10-23 14:08:46.644064014 -0400
+@@ -29,12 +29,9 @@
+ version = "0.51.1"
+ default-features = false
+ 
+-[build-dependencies.nettle-src]
+-version = "3.5.1-0"
+-optional = true
+-
+ [build-dependencies.pkg-config]
+ version = "0.3"
+ 
+ [features]
+ vendored = ["nettle-src"]
++nettle-src = []
+diff --git a/build.rs b/build.rs
+index 44f7af3..ede4b2f 100644
+--- a/build.rs
++++ b/build.rs
+@@ -1,7 +1,5 @@
+ extern crate bindgen;
+ extern crate pkg_config;
+-#[cfg(feature = "vendored")]
+-extern crate nettle_src;
+ 
+ use std::env;
+ use std::fs;
+@@ -36,14 +34,6 @@ fn main() {
+     println!("cargo:rerun-if-env-changed=NETTLE_STATIC");
+     println!("cargo:rerun-if-env-changed={}", NETTLE_PREGENERATED_BINDINGS);
+ 
+-    #[cfg(feature = "vendored")]
+-    {
+-        let artifacts = nettle_src::Build::new().build();
+-        println!("cargo:vendored=1");
+-        env::set_var("PKG_CONFIG_PATH",
+-                     artifacts.lib_dir().join("pkgconfig"));
+-    }
+-
+     let nettle = pkg_config::probe_library("nettle hogweed").unwrap();
+ 
+     let mode = match env::var_os("NETTLE_STATIC") {
-- 
cgit v1.2.3


From 098f1d722ba553fddd41a2b9e183fe983b708ff9 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 23 Apr 2020 23:12:36 +0200
Subject: gnu: Add rust-nettle-7.

* gnu/packages/crates-io.scm (rust-nettle-7): New variable.
* gnu/packages/patches/rust-nettle-disable-vendor.patch: New file.
* gnu/local.mk: Add it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/crates-io.scm                         | 44 ++++++++++++++++++++++
 .../patches/rust-nettle-disable-vendor.patch       | 13 +++++++
 3 files changed, 58 insertions(+)
 create mode 100644 gnu/packages/patches/rust-nettle-disable-vendor.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3d9f418133..2c05360bae 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1433,6 +1433,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
   %D%/packages/patches/rust-bootstrap-stage0-test.patch		\
   %D%/packages/patches/rust-coresimd-doctest.patch		\
+  %D%/packages/patches/rust-nettle-disable-vendor.patch		 \
   %D%/packages/patches/rust-nettle-sys-disable-vendor.patch	 \
   %D%/packages/patches/rust-reproducible-builds.patch		 \
   %D%/packages/patches/rust-openssl-sys-no-vendor.patch	\
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5980282399..9237a282b7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38,6 +38,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
@@ -13185,6 +13186,49 @@ types as proposed in RFC 1158.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-nettle-7
+  (package
+    (name "rust-nettle")
+    (version "7.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nettle" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1n6dwy9zba8853bmxzhwaashd3np0wxpx0pj43brm0hb8n2sxbxi"))
+       (patches (search-patches "rust-nettle-disable-vendor.patch"))))
+    (build-system cargo-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("clang" ,clang)
+       ("gmp" ,gmp)
+       ("nettle" ,nettle)))
+    (arguments
+     `(#:skip-build? #t ;; provides nothing, has no tests
+       #:cargo-inputs
+       (("rust-getrandom" ,rust-getrandom-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-nettle-sys" ,rust-nettle-sys-2)
+        ("rust-thiserror" ,rust-thiserror-1.0))
+       #:cargo-development-inputs
+       (("rust-bindgen" ,rust-bindgen-0.51)
+        ("rust-pkg-config" ,rust-pkg-config-0.3))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'set-missing-env-vars
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; FIXME: why do we need to set this?
+             (setenv "LIBCLANG_PATH"
+                     (string-append (assoc-ref inputs "clang") "/lib"))
+             #t)))))
+    (home-page "https://gitlab.com/sequoia-pgp/nettle-rs")
+  (synopsis "Rust bindings for the Nettle cryptographic library")
+  (description "This package provides Rust bindings for the Nettle
+cryptographic library.")
+  (license (list license:lgpl3 license:gpl2 license:gpl3))))
+
 (define-public rust-nettle-sys-2
   (package
     (name "rust-nettle-sys")
diff --git a/gnu/packages/patches/rust-nettle-disable-vendor.patch b/gnu/packages/patches/rust-nettle-disable-vendor.patch
new file mode 100644
index 0000000000..5b52821cdb
--- /dev/null
+++ b/gnu/packages/patches/rust-nettle-disable-vendor.patch
@@ -0,0 +1,13 @@
+Subject: nettle: clear out "vendored" feature cruft from build.rs
+From: Daniel Kahn Gillmor's avatarDaniel Kahn Gillmor 
+
+https://salsa.debian.org/rust-team/debcargo-conf/-/commit/b608e6beaa1d38c14fc16ad53780d94954a91900
+https://sources.debian.org/src/rust-nettle/7.0.0-1/debian/patches/disable-vendor.diff/
+--- a/Cargo.toml	1969-12-31 19:00:00.000000000 -0500
++++ b/Cargo.toml	2019-10-23 19:12:01.076181971 -0400
+@@ -35,4 +35,4 @@
+ version = "1"
+ 
+ [features]
+-vendored = ["nettle-sys/vendored"]
++vendored = []
-- 
cgit v1.2.3


From 4c4ae8b595e85e62496b4fa8ff2587eb74a1262b Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 5 Mar 2020 23:59:43 +0100
Subject: gnu: Add sequoia.

* gnu/packages/sequoia.scm: New file.
* gnu/local.mk: Add it.
---
 gnu/local.mk             |   1 +
 gnu/packages/sequoia.scm | 162 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)
 create mode 100644 gnu/packages/sequoia.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index 2c05360bae..daf6bd0306 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -472,6 +472,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/search.scm			\
   %D%/packages/security-token.scm		\
   %D%/packages/selinux.scm			\
+  %D%/packages/sequoia.scm			\
   %D%/packages/serialization.scm		\
   %D%/packages/serveez.scm			\
   %D%/packages/shells.scm			\
diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
new file mode 100644
index 0000000000..1c21c9c893
--- /dev/null
+++ b/gnu/packages/sequoia.scm
@@ -0,0 +1,162 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019, 2020 Hartmut Goebel 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (gnu packages sequoia)
+  #:use-module (guix build-system cargo)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages check) ;; python-pytest
+  #:use-module (gnu packages crates-io)
+  #:use-module (gnu packages libffi) ;; python-cffi
+  #:use-module (gnu packages llvm)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages nettle)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz) ;; python-setuptools
+  #:use-module (gnu packages serialization)
+  #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages tls))
+
+(define-public sequoia
+  (package
+    (name "sequoia")
+    (version "0.16.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.com/sequoia-pgp/sequoia.git")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "0iwzi2ylrwz56s77cd4vcf89ig6ipy4w6kp2pfwqvd2d00x54dhk"))
+       (file-name (git-file-name name version))))
+    (build-system cargo-build-system)
+    (outputs '("out" "python"))
+    (native-inputs
+     `(("clang" ,clang)
+       ("pkg-config" ,pkg-config)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-runner" ,python-pytest-runner)))
+    (inputs
+     `(("capnproto" ,capnproto)
+       ("gmp" ,gmp)
+       ("nettle" ,nettle)
+       ("openssl" ,openssl)
+       ("python" ,python)
+       ("python-cffi" ,python-cffi)
+       ("sqlite" ,sqlite)))
+    (arguments
+     `(#:tests? #f ;; building the tests requires 9.7GB total
+       #:cargo-inputs
+       (("rust-assert-cli" ,rust-assert-cli-0.6)
+        ("rust-anyhow" ,rust-anyhow-1.0)
+        ("rust-base64", rust-base64-0.11)
+        ;;("rust-buffered-reader" included
+        ("rust-bzip2", rust-bzip2-0.3)
+        ("rust-capnp" ,rust-capnp-0.10)
+        ("rust-capnp-rpc" ,rust-capnp-rpc-0.10)
+        ("rust-capnpc" ,rust-capnpc-0.10)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-clap" ,rust-clap-2)
+        ("rust-clap" ,rust-clap-2)
+        ("rust-colored" ,rust-colored-1.9.1)
+        ("rust-crossterm" ,rust-crossterm-0.13)
+        ("rust-ctor", rust-ctor-0.1)
+        ("rust-dirs" ,rust-dirs-2.0)
+        ;;("rust-failure" included
+        ("rust-filetime" ,rust-filetime-0.2)
+        ("rust-flate2", rust-flate2-1.0)
+        ("rust-fs2" ,rust-fs2-0.4)
+        ("rust-futures" ,rust-futures-0.1)
+        ("rust-http" ,rust-http-0.1)
+        ("rust-hyper" ,rust-hyper-0.12)
+        ("rust-hyper-tls" ,rust-hyper-tls-0.3)
+        ("rust-idna", rust-idna-0.2)
+        ("rust-itertools" ,rust-itertools-0.8)
+        ("rust-lalrpop-util", rust-lalrpop-util-0.17)
+        ("rust-lazy-static", rust-lazy-static-1.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memsec", rust-memsec-0.5)
+        ("rust-native-tls" ,rust-native-tls-0.2)
+        ("rust-nettle", rust-nettle-7)
+        ("rust-parity-tokio-ipc" ,rust-parity-tokio-ipc-0.4)
+        ("rust-percent-encoding" ,rust-percent-encoding-2.1)
+        ("rust-prettytable-rs" ,rust-prettytable-rs-0.8)
+        ("rust-proc-macro2" ,rust-proc-macro2-1.0)
+        ("rust-quickcheck", rust-quickcheck-0.9)
+        ("rust-rand", rust-rand-0.7)
+        ("rust-regex", rust-regex-1.3)
+        ("rust-rusqlite" ,rust-rusqlite-0.19)
+        ("rust-tempfile" ,rust-tempfile-3.1)
+        ("rust-thiserror" ,rust-thiserror-1.0)
+        ("rust-tokio" ,rust-tokio-0.1)
+        ("rust-tokio-core" ,rust-tokio-core-0.1)
+        ("rust-unicode-normalization", rust-unicode-normalization-0.1)
+        ("rust-url" ,rust-url-2.1)
+        ("rust-zbase32" ,rust-zbase32-0.1))
+       #:cargo-development-inputs
+       (("rust-bindgen" ,rust-bindgen-0.51) ;; FIXME for nettle-sys and rusqlite
+        ("rust-lalrpop" ,rust-lalrpop-0.17)
+        ("rust-rpassword" ,rust-rpassword-4))
+       #:phases
+       (modify-phases %standard-phases
+         ;; Run make instead of using the rust build system, as
+         ;; suggested by the installation instructions
+         (replace 'build (lambda _ (invoke "make" "build-release") #t))
+         (replace 'check
+           (lambda* (#:key tests?  #:allow-other-keys)
+             (if tests?
+                 (invoke "make" "check")
+                 #t)))
+         (replace 'install (lambda _ (invoke "make" "install") #t))
+         (add-after 'unpack 'adjust-prefix
+           (lambda* (#:key outputs #:allow-other-keys)
+             (setenv "PREFIX" (assoc-ref outputs "out"))
+             #t))
+         (add-after 'unpack 'fix-fo-python-output
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (pyout (assoc-ref outputs "python")))
+               (substitute* "ffi/lang/python/Makefile"
+                 ;; adjust prefix for python package
+                 (("PREFIX\\s*\\??=.*")
+                  (string-append "PREFIX = " pyout "\n"))
+                 ;; fix rpath to include the main package
+                 (("\\WLDFLAGS=" text)
+                  (string-append text "'-Wl,-rpath=" out "/lib '"))
+                 ;; make setuptools install into the prefix, see
+                 ;; guix/build/python-build-system.scm for explanation
+                 (("\\ssetup.py\\s+install\\s")
+                  " setup.py install --root=/ --single-version-externally-managed "))
+               #t)))
+         (add-after 'unpack 'set-missing-env-vars
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; FIXME: why do we need to set this here?
+             (setenv "LIBCLANG_PATH"
+                     (string-append (assoc-ref inputs "clang") "/lib"))
+             #t)))))
+    (home-page "https://sequoia-pgp.org")
+    (synopsis "New OpenPGP implementation")
+    (description "Sequoia is a new OpenPGP implementation.  It consists of
+several crates, providing both a low-level and a high-level API for dealing
+with OpenPGP data.")
+    (license license:gpl2+)))
-- 
cgit v1.2.3


From 051f3254cd56aa8f3cb65a7e35ef8578af2cd3c5 Mon Sep 17 00:00:00 2001
From: pinoaffe 
Date: Tue, 5 May 2020 09:31:11 +0200
Subject: gnu: Add AutoSSH service.

* gnu/services/ssh.scm (): New record type.
(autossh-service-type): New variable.
(autossh-service-activation, autossh-file-name): New procedures.
* doc/guix.texi (Networking Services): Document this.

Signed-off-by: Oleg Pykhalov 
---
 doc/guix.texi        |  75 ++++++++++++++++++++++++++++++++++++
 gnu/services/ssh.scm | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 180 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 0020739aec..812d08a8ef 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -79,6 +79,7 @@ Copyright @copyright{} 2020 Naga Malleswari@*
 Copyright @copyright{} 2020 Brice Waegeneire@*
 Copyright @copyright{} 2020 R Veera Kumar@*
 Copyright @copyright{} 2020 Pierre Langlois@*
+Copyright @copyright{} 2020 pinoaffe@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -14390,6 +14391,80 @@ Whether to enable password-based authentication.
 @end table
 @end deftp
 
+@cindex AutoSSH
+@deffn {Scheme Variable} autossh-service-type
+This is the type for the @uref{https://www.harding.motd.ca/autossh,
+AutoSSH} program that runs a copy of @code{ssh} and monitors it,
+restarting it as necessary should it die or stop passing traffic.
+AutoSSH can be run manually from the commandline by passing arguments to
+the binary @code{autossh} from the package @code{autossh}, but it can
+also be run as a guix service. This latter usecase is documented here.
+
+AutoSSH can be used to forward local traffic to a remote machine using an SSH tunnel,
+and it respects the @file{~/.ssh/config} of the user it is run as.
+
+For example, to specify a service running autossh as the user @code{pino}
+and forwarding all local connections to port @code{8081} to @code{remote:8081}
+using an SSH tunnel, add this call to the operating system's @code{services} field:
+
+@lisp
+(service autossh-service-type
+         (autossh-configuration
+          (user "pino")
+          (ssh-options (list "-T" "-N" "-L" "8081:localhost:8081" "remote.net"))))
+@end lisp
+@end deffn
+
+@deftp {Data Type} autossh-configuration
+This data type represents the configuration of an AutoSSH service.
+
+@table @asis
+
+@item @code{user} (default @code{"autossh"})
+The user as which the AutoSSH service is to be run.
+This assumes that the specified user exists.
+
+@item @code{poll} (default @code{600})
+Specifies the connection poll time in seconds.
+
+@item @code{first-poll} (default @code{#f})
+Specifies how long autossh waits before the first connection test in seconds.
+After this first test, polling is resumed at the pace defined in @code{poll}.
+When set to @code{#f}, the first poll is not treated specially and
+will also use the connection poll specified in @code{poll}
+
+@item @code{gate-time} (default @code{30})
+Specifies (in seconds) how long an SSH connection must be active
+before it is considered successful.
+
+@item @code{log-level} (default @code{1})
+The log level, corresponding to the levels used by syslog
+(so @code{0} is the most silent while @code{7} is the chattiest.)
+
+@item @code{max-start} (default @code{#f})
+The maximum number of times SSH may be (re)started before AutoSSH exits.
+When set to @code{#f}, no maximum is configured and AutoSSH may restart indefinitely.
+
+@item @code{message} (default @code{""})
+The message to append to the echo message sent when testing connections.
+
+@item @code{port} (default @code{"0"})
+The ports used for monitoring the connection. When set to @code{"0"},
+monitoring is disabled. When set to @code{"n"} where @code{n} is a positive integer,
+ports @code{n} and @code{n+1} are used for monitoring the connection, such that
+port @code{n} is the base monitoring port and @code{n+1} is the echo port.
+When set to @code{"n:m"} where @code{n} and @code{m} are positive integers,
+the ports @code{n} and @code{n+1} are used for monitoring the connection, such
+that port @code{n} is the base monitoring port and @code{m} is the echo port.
+
+@item @code{ssh-options} (default @code{'()})
+The list of commandline arguments to pass to ssh when it is run.
+Options @code{-f} and @code{-M ....} are reserved for AutoSSH
+and may cause undefined behaviour.
+
+@end table
+@end deftp
+
 @defvr {Scheme Variable} %facebook-host-aliases
 This variable contains a string for use in @file{/etc/hosts}
 (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}).  Each
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index d2dbb8f80d..ced21c0742 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2016 Julien Lepiller 
 ;;; Copyright © 2017 Clément Lassieur 
 ;;; Copyright © 2019 Ricardo Wurmus 
+;;; Copyright © 2020 pinoaffe 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -45,7 +46,11 @@
             dropbear-configuration
             dropbear-configuration?
             dropbear-service-type
-            dropbear-service))
+            dropbear-service
+
+            autossh-configuration
+            autossh-configuration?
+            autossh-service-type))
 
 ;;; Commentary:
 ;;;
@@ -628,4 +633,103 @@ daemon} with the given @var{config}, a @code{}
 object."
   (service dropbear-service-type config))
 
+
+;;;
+;;; AutoSSH.
+;;;
+
+
+(define-record-type* 
+  autossh-configuration make-autossh-configuration
+  autossh-configuration?
+  (user            autossh-configuration-user
+                   (default "autossh"))
+  (poll            autossh-configuration-poll
+                   (default 600))
+  (first-poll      autossh-configuration-first-poll
+                   (default #f))
+  (gate-time       autossh-configuration-gate-time
+                   (default 30))
+  (log-level       autossh-configuration-log-level
+                   (default 1))
+  (max-start       autossh-configuration-max-start
+                   (default #f))
+  (message         autossh-configuration-message
+                   (default ""))
+  (port            autossh-configuration-port
+                   (default "0"))
+  (ssh-options     autossh-configuration-ssh-options
+                   (default '())))
+
+(define (autossh-file-name config file)
+  "Return a path in /var/run/autossh/ that is writable
+   by @code{user} from @code{config}."
+  (string-append "/var/run/autossh/"
+                 (autossh-configuration-user config)
+                 "/" file))
+
+(define (autossh-shepherd-service config)
+  (shepherd-service
+   (documentation "Automatically set up ssh connections (and keep them alive).")
+   (provision '(autossh))
+   (start #~(make-forkexec-constructor
+             (list #$(file-append autossh "/bin/autossh")
+                   #$@(autossh-configuration-ssh-options config))
+             #:user #$(autossh-configuration-user config)
+             #:group (passwd:gid (getpw #$(autossh-configuration-user config)))
+             #:pid-file #$(autossh-file-name config "pid")
+             #:log-file #$(autossh-file-name config "log")
+             #:environment-variables
+             '(#$(string-append "AUTOSSH_PIDFILE="
+                                (autossh-file-name config "pid"))
+               #$(string-append "AUTOSSH_LOGFILE="
+                                (autossh-file-name config "log"))
+               #$(string-append "AUTOSSH_POLL="
+                                (number->string
+                                 (autossh-configuration-poll config)))
+               #$(string-append "AUTOSSH_FIRST_POLL="
+                                (number->string
+                                 (or
+                                  (autossh-configuration-first-poll config)
+                                  (autossh-configuration-poll config))))
+               #$(string-append "AUTOSSH_GATETIME="
+                                (number->string
+                                 (autossh-configuration-gate-time config)))
+               #$(string-append "AUTOSSH_LOGLEVEL="
+                                (number->string
+                                 (autossh-configuration-log-level config)))
+               #$(string-append "AUTOSSH_MAXSTART="
+                                (number->string
+                                 (or (autossh-configuration-max-start config)
+                                     -1)))
+               #$(string-append "AUTOSSH_MESSAGE="
+                                (autossh-configuration-message config))
+               #$(string-append "AUTOSSH_PORT="
+                                (autossh-configuration-port config)))))
+   (stop #~(make-kill-destructor))))
+
+(define (autossh-service-activation config)
+  (with-imported-modules '((guix build utils))
+    #~(begin
+        (use-modules (guix build utils))
+        (define %user
+          (getpw #$(autossh-configuration-user config)))
+        (let* ((directory #$(autossh-file-name config ""))
+               (log (string-append directory "/log")))
+          (mkdir-p directory)
+          (chown directory (passwd:uid %user) (passwd:gid %user))
+          (call-with-output-file log (const #t))
+          (chown log (passwd:uid %user) (passwd:gid %user))))))
+
+(define autossh-service-type
+  (service-type
+   (name 'autossh)
+   (description "Automatically set up ssh connections (and keep them alive).")
+   (extensions
+    (list (service-extension shepherd-root-service-type
+                             (compose list autossh-shepherd-service))
+          (service-extension activation-service-type
+                             autossh-service-activation)))
+   (default-value (autossh-configuration))))
+
 ;;; ssh.scm ends here
-- 
cgit v1.2.3


From 78fbf2bd70e8af00a3ce5b05a5e25258e34f84cc Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Tue, 28 Apr 2020 14:12:34 +0200
Subject: system: vm: Move operating-system-uuid.

* gnu/system/vm.scm (operating-system-uuid): Move to ...
* gnu/system.scm: ... here.
---
 gnu/system.scm    | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 gnu/system/vm.scm | 48 ------------------------------------------------
 2 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 107b93db31..0c5d5df365 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -120,6 +120,7 @@
             operating-system-etc-directory
             operating-system-locale-directory
             operating-system-boot-script
+            operating-system-uuid
 
             system-linux-image-file-name
             operating-system-with-gc-roots
@@ -989,6 +990,55 @@ we're running in the final root."
                #:mapped-devices mapped-devices
                #:keyboard-layout (operating-system-keyboard-layout os)))
 
+(define* (operating-system-uuid os #:optional (type 'dce))
+  "Compute UUID object with a deterministic \"UUID\" for OS, of the given
+TYPE (one of 'iso9660 or 'dce).  Return a UUID object."
+  ;; Note: For this to be deterministic, we must not hash things that contains
+  ;; (directly or indirectly) procedures, for example.  That rules out
+  ;; anything that contains gexps, thunk or delayed record fields, etc.
+
+  (define service-name
+    (compose service-type-name service-kind))
+
+  (define (file-system-digest fs)
+    ;; Return a hashable digest that does not contain 'dependencies' since
+    ;; this field can contain procedures.
+    (let ((device (file-system-device fs)))
+      (list (file-system-mount-point fs)
+            (file-system-type fs)
+            (file-system-device->string device)
+            (file-system-options fs))))
+
+  (if (eq? type 'iso9660)
+      (let ((pad (compose (cut string-pad <> 2 #\0)
+                          number->string))
+            (h   (hash (map service-name (operating-system-services os))
+                       3600)))
+        (bytevector->uuid
+         (string->iso9660-uuid
+          (string-append "1970-01-01-"
+                         (pad (hash (operating-system-host-name os) 24)) "-"
+                         (pad (quotient h 60)) "-"
+                         (pad (modulo h 60)) "-"
+                         (pad (hash (map file-system-digest
+                                         (operating-system-file-systems os))
+                                    100))))
+         'iso9660))
+      (bytevector->uuid
+       (uint-list->bytevector
+        (list (hash (map file-system-digest
+                         (operating-system-file-systems os))
+                    (- (expt 2 32) 1))
+              (hash (operating-system-host-name os)
+                    (- (expt 2 32) 1))
+              (hash (map service-name (operating-system-services os))
+                    (- (expt 2 32) 1))
+              (hash (map file-system-digest (operating-system-file-systems os))
+                    (- (expt 2 32) 1)))
+        (endianness little)
+        4)
+       type)))
+
 (define (locale-name->definition* name)
   "Variant of 'locale-name->definition' that raises an error upon failure."
   (match (locale-name->definition name)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 6f81ac16ff..2fdf954883 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -604,54 +604,6 @@ system."
 ;;; VM and disk images.
 ;;;
 
-(define* (operating-system-uuid os #:optional (type 'dce))
-  "Compute UUID object with a deterministic \"UUID\" for OS, of the given
-TYPE (one of 'iso9660 or 'dce).  Return a UUID object."
-  ;; Note: For this to be deterministic, we must not hash things that contains
-  ;; (directly or indirectly) procedures, for example.  That rules out
-  ;; anything that contains gexps, thunk or delayed record fields, etc.
-
-  (define service-name
-    (compose service-type-name service-kind))
-
-  (define (file-system-digest fs)
-    ;; Return a hashable digest that does not contain 'dependencies' since
-    ;; this field can contain procedures.
-    (let ((device (file-system-device fs)))
-      (list (file-system-mount-point fs)
-            (file-system-type fs)
-            (file-system-device->string device)
-            (file-system-options fs))))
-
-  (if (eq? type 'iso9660)
-      (let ((pad (compose (cut string-pad <> 2 #\0)
-                          number->string))
-            (h   (hash (map service-name (operating-system-services os))
-                       3600)))
-        (bytevector->uuid
-         (string->iso9660-uuid
-          (string-append "1970-01-01-"
-                         (pad (hash (operating-system-host-name os) 24)) "-"
-                         (pad (quotient h 60)) "-"
-                         (pad (modulo h 60)) "-"
-                         (pad (hash (map file-system-digest
-                                         (operating-system-file-systems os))
-                                    100))))
-         'iso9660))
-      (bytevector->uuid
-       (uint-list->bytevector
-        (list (hash (map file-system-digest
-                         (operating-system-file-systems os))
-                    (- (expt 2 32) 1))
-              (hash (operating-system-host-name os)
-                    (- (expt 2 32) 1))
-              (hash (map service-name (operating-system-services os))
-                    (- (expt 2 32) 1))
-              (hash (map file-system-digest (operating-system-file-systems os))
-                    (- (expt 2 32) 1)))
-        (endianness little)
-        4)
-       type)))
 
 (define* (system-disk-image os
                             #:key
-- 
cgit v1.2.3


From fd1351ab0a209fb2cd3bd4de04fb9e2a515dea31 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Tue, 28 Apr 2020 14:14:21 +0200
Subject: build: store-copy: Export file-size procedure.

* guix/build/store-copy.scm (file-size): Export it.
---
 guix/build/store-copy.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guix/build/store-copy.scm b/guix/build/store-copy.scm
index 549aa4f28b..ad551bca98 100644
--- a/guix/build/store-copy.scm
+++ b/guix/build/store-copy.scm
@@ -35,6 +35,7 @@
 
             read-reference-graph
 
+            file-size
             closure-size
             populate-store))
 
-- 
cgit v1.2.3


From 5990e95b607b888edd862a2ccb5ca69dcd17d801 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Tue, 28 Apr 2020 14:16:33 +0200
Subject: build: install: Ignore chown exceptions.

Changing ownership may require root permissions. As image can now be generated
without root permissions (no VM involved), ignore those exceptions.

* gnu/build/install.scm (evaluate-populate-directive): Ignore chown
exceptions.
---
 gnu/build/install.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index c0d4d44091..9753792216 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -51,9 +51,14 @@ that the fonts, background images, etc. referred to by BOOTCFG are not GC'd."
     (copy-file bootcfg pivot)
     (rename-file pivot target)))
 
-(define (evaluate-populate-directive directive target)
+(define* (evaluate-populate-directive directive target
+                                      #:key
+                                      (default-gid 0)
+                                      (default-uid 0))
   "Evaluate DIRECTIVE, an sexp describing a file or directory to create under
-directory TARGET."
+directory TARGET.  DEFAULT-UID and DEFAULT-GID are the default UID and GID in
+the context of the caller.  If the directive matches those defaults then,
+'chown' won't be run."
   (let loop ((directive directive))
     (catch 'system-error
       (lambda ()
@@ -63,7 +68,12 @@ directory TARGET."
           (('directory name uid gid)
            (let ((dir (string-append target name)))
              (mkdir-p dir)
-             (chown dir uid gid)))
+             ;; If called from a context without "root" permissions, "chown"
+             ;; to root will fail.  In that case, do not try to run "chown"
+             ;; and assume that the file will be chowned elsewhere (when
+             ;; interned in the store for instance).
+             (or (and (= uid default-uid) (= gid default-gid))
+                 (chown dir uid gid))))
           (('directory name uid gid mode)
            (loop `(directory ,name ,uid ,gid))
            (chmod (string-append target name) mode))
-- 
cgit v1.2.3


From 892bbea750e5733979ee0423cbdfcea222b07925 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Tue, 5 May 2020 14:26:35 +0200
Subject: build: install: Do not set store GID.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There's no need to set the store GID as is will be done by the guix-daemon,
with the following snippet:

  if (chown(chrootStoreDir.c_str(), 0, buildUser.getGID()) == -1)
        throw SysError(format("cannot change ownership of ‘%1%’") % chrootStoreDir);

* gnu/build/install.scm (directives): Do not set store GID.
---
 gnu/build/install.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index 9753792216..59a118e905 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -101,9 +101,7 @@ the context of the caller.  If the directive matches those defaults then,
 (define (directives store)
   "Return a list of directives to populate the root file system that will host
 STORE."
-  `(;; Note: the store's GID is fixed precisely so we can set it here rather
-    ;; than at activation time.
-    (directory ,store 0 30000 #o1775)
+  `((directory ,store 0 0 #o1775)
 
     (directory "/etc")
     (directory "/var/log")                          ; for shepherd
-- 
cgit v1.2.3


From f8fd1157174fd523d36dcfa756c965a54c30d5ae Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Tue, 28 Apr 2020 16:17:59 +0200
Subject: build: bootloader: Add install-efi procedure.

* gnu/build/bootloader.scm (install-efi): New procedure copied from (gnu build vm).
(install-efi-loader): New exported procedure, wrapping install-efi.
* gnu/build/vm.scm (initialize-hard-disk): Adapt to use install-efi-loader.
---
 gnu/build/bootloader.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++-
 gnu/build/vm.scm         | 19 +++-------------
 2 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/gnu/build/bootloader.scm b/gnu/build/bootloader.scm
index 9570d6dd18..498022f6db 100644
--- a/gnu/build/bootloader.scm
+++ b/gnu/build/bootloader.scm
@@ -18,8 +18,12 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (gnu build bootloader)
+  #:use-module (guix build utils)
+  #:use-module (guix utils)
   #:use-module (ice-9 binary-ports)
-  #:export (write-file-on-device))
+  #:use-module (ice-9 format)
+  #:export (write-file-on-device
+            install-efi-loader))
 
 
 ;;;
@@ -36,3 +40,53 @@
             (seek output offset SEEK_SET)
             (put-bytevector output bv))
           #:binary #t)))))
+
+
+;;;
+;;; EFI bootloader.
+;;;
+
+(define (install-efi grub grub-config esp)
+  "Write a self-contained GRUB EFI loader to the mounted ESP using GRUB-CONFIG."
+  (let* ((system %host-type)
+         ;; Hard code the output location to a well-known path recognized by
+         ;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviour":
+         ;; http://www.uefi.org/sites/default/files/resources/UEFI%20Spec%202_6.pdf
+         (grub-mkstandalone (string-append grub "/bin/grub-mkstandalone"))
+         (efi-directory (string-append esp "/EFI/BOOT"))
+         ;; Map grub target names to boot file names.
+         (efi-targets (cond ((string-prefix? "x86_64" system)
+                             '("x86_64-efi" . "BOOTX64.EFI"))
+                            ((string-prefix? "i686" system)
+                             '("i386-efi" . "BOOTIA32.EFI"))
+                            ((string-prefix? "armhf" system)
+                             '("arm-efi" . "BOOTARM.EFI"))
+                            ((string-prefix? "aarch64" system)
+                             '("arm64-efi" . "BOOTAA64.EFI")))))
+    ;; grub-mkstandalone requires a TMPDIR to prepare the firmware image.
+    (setenv "TMPDIR" esp)
+
+    (mkdir-p efi-directory)
+    (invoke grub-mkstandalone "-O" (car efi-targets)
+            "-o" (string-append efi-directory "/"
+                                (cdr efi-targets))
+            ;; Graft the configuration file onto the image.
+            (string-append "boot/grub/grub.cfg=" grub-config))))
+
+(define (install-efi-loader grub-efi esp)
+  "Install in ESP directory the given GRUB-EFI bootloader.  Configure it to
+load the Grub bootloader located in the 'Guix_image' root partition."
+  (let ((grub-config "grub.cfg"))
+    (call-with-output-file grub-config
+      (lambda (port)
+        ;; Create a tiny configuration file telling the embedded grub where to
+        ;; load the real thing.  XXX This is quite fragile, and can prevent
+        ;; the image from booting when there's more than one volume with this
+        ;; label present.  Reproducible almost-UUIDs could reduce the risk
+        ;; (not eliminate it).
+        (format port
+                "insmod part_msdos~@
+               search --set=root --label Guix_image~@
+               configfile /boot/grub/grub.cfg~%")))
+    (install-efi grub-efi grub-config esp)
+    (delete-file grub-config)))
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 9caa110463..bc6071daa9 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -27,6 +27,7 @@
   #:use-module (guix build store-copy)
   #:use-module (guix build syscalls)
   #:use-module (guix store database)
+  #:use-module (gnu build bootloader)
   #:use-module (gnu build linux-boot)
   #:use-module (gnu build install)
   #:use-module (gnu system uuid)
@@ -610,30 +611,16 @@ passing it a directory name where it is mounted."
 
     (when esp
       ;; Mount the ESP somewhere and install GRUB UEFI image.
-      (let ((mount-point (string-append target "/boot/efi"))
-            (grub-config (string-append target "/tmp/grub-standalone.cfg")))
+      (let ((mount-point (string-append target "/boot/efi")))
         (display "mounting EFI system partition...\n")
         (mkdir-p mount-point)
         (mount (partition-device esp) mount-point
                (partition-file-system esp))
 
-        ;; Create a tiny configuration file telling the embedded grub
-        ;; where to load the real thing.
-        ;; XXX This is quite fragile, and can prevent the image from booting
-        ;; when there's more than one volume with this label present.
-        ;; Reproducible almost-UUIDs could reduce the risk (not eliminate it).
-        (call-with-output-file grub-config
-          (lambda (port)
-            (format port
-                    "insmod part_msdos~@
-                    search --set=root --label Guix_image~@
-                    configfile /boot/grub/grub.cfg~%")))
-
         (display "creating EFI firmware image...")
-        (install-efi grub-efi mount-point grub-config)
+        (install-efi-loader grub-efi mount-point)
         (display "done.\n")
 
-        (delete-file grub-config)
         (umount mount-point)))
 
     ;; Register BOOTCFG as a GC root.
-- 
cgit v1.2.3


From f19cf27c2b9ff92e2c0fd931ef7fde39c376adaa Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Tue, 28 Apr 2020 14:15:28 +0200
Subject: image: Add a new API.

Raw disk-images and ISO9660 images are created in a Qemu virtual machine. This
is quite fragile, very slow, and almost unusable without KVM.

For all these reasons, add support for host image generation. This implies the
use new image generation mechanisms.

- Raw disk images: images of partitions are created using tools such as mke2fs
  and mkdosfs depending on the partition file-system type. The partition
  images are then assembled into a final image using genimage.

- ISO9660 images: the ISO root directory is populated within the store. GNU
  xorriso is then called on that directory, in the exact same way as this is
  done in (gnu build vm) module.

Those mechanisms are built upon the new (gnu image) module.

* gnu/image.scm: New file.
* gnu/system/image.scm: New file.
* gnu/build/image: New file.
* gnu/local.mk: Add them.
* gnu/system/vm.scm (system-disk-image): Rename to system-disk-image-in-vm.
* gnu/ci.scm (qemu-jobs): Adapt to new API.
* gnu/tests/install.scm (run-install): Ditto.
* guix/scripts/system.scm (system-derivation-for-action): Ditto.
---
 gnu/build/image.scm     | 273 +++++++++++++++++++++++++
 gnu/build/install.scm   |   1 -
 gnu/ci.scm              |  45 ++--
 gnu/image.scm           |  76 +++++++
 gnu/local.mk            |   3 +
 gnu/system/image.scm    | 532 ++++++++++++++++++++++++++++++++++++++++++++++++
 gnu/system/vm.scm       |  17 +-
 gnu/tests/install.scm   |  22 +-
 guix/scripts/system.scm |  13 +-
 9 files changed, 932 insertions(+), 50 deletions(-)
 create mode 100644 gnu/build/image.scm
 create mode 100644 gnu/image.scm
 create mode 100644 gnu/system/image.scm

diff --git a/gnu/build/image.scm b/gnu/build/image.scm
new file mode 100644
index 0000000000..fe8e11aa1b
--- /dev/null
+++ b/gnu/build/image.scm
@@ -0,0 +1,273 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
+;;; Copyright © 2016 Christopher Allan Webber 
+;;; Copyright © 2016, 2017 Leo Famulari 
+;;; Copyright © 2017 Marius Bakke 
+;;; Copyright © 2020 Tobias Geerinckx-Rice 
+;;; Copyright © 2020 Mathieu Othacehe 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (gnu build image)
+  #:use-module (guix build store-copy)
+  #:use-module (guix build syscalls)
+  #:use-module (guix build utils)
+  #:use-module (guix store database)
+  #:use-module (gnu build bootloader)
+  #:use-module (gnu build install)
+  #:use-module (gnu build linux-boot)
+  #:use-module (gnu image)
+  #:use-module (gnu system uuid)
+  #:use-module (ice-9 ftw)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-19)
+  #:use-module (srfi srfi-34)
+  #:use-module (srfi srfi-35)
+  #:export (make-partition-image
+            genimage
+            initialize-efi-partition
+            initialize-root-partition
+
+            make-iso9660-image))
+
+(define (sexp->partition sexp)
+  "Take SEXP, a tuple as returned by 'partition->gexp', and turn it into a
+ record."
+  (match sexp
+    ((size file-system label uuid)
+     (partition (size size)
+                (file-system file-system)
+                (label label)
+                (uuid uuid)))))
+
+(define (size-in-kib size)
+  "Convert SIZE expressed in bytes, to kilobytes and return it as a string."
+  (number->string
+   (inexact->exact (ceiling (/ size 1024)))))
+
+(define (estimate-partition-size root)
+  "Given the ROOT directory, evalute and return its size.  As this doesn't
+take the partition metadata size into account, take a 25% margin."
+  (* 1.25 (file-size root)))
+
+(define* (make-ext4-image partition target root
+                          #:key
+                          (owner-uid 0)
+                          (owner-gid 0))
+  "Handle the creation of EXT4 partition images. See 'make-partition-image'."
+  (let ((size (partition-size partition))
+        (label (partition-label partition))
+        (uuid (partition-uuid partition))
+        (options "lazy_itable_init=1,lazy_journal_init=1"))
+    (invoke "mke2fs" "-t" "ext4" "-d" root
+            "-L" label "-U" (uuid->string uuid)
+            "-E" (format #f "root_owner=~a:~a,~a"
+                         owner-uid owner-gid options)
+            target
+            (format #f "~ak"
+                    (size-in-kib
+                     (if (eq? size 'guess)
+                         (estimate-partition-size root)
+                         size))))))
+
+(define* (make-vfat-image partition target root)
+  "Handle the creation of VFAT partition images.  See 'make-partition-image'."
+  (let ((size (partition-size partition))
+        (label (partition-label partition)))
+    (invoke "mkdosfs" "-n" label "-C" target "-F" "16" "-S" "1024"
+            (size-in-kib
+             (if (eq? size 'guess)
+                 (estimate-partition-size root)
+                 size)))
+    (for-each (lambda (file)
+                (unless (member file '("." ".."))
+                  (invoke "mcopy" "-bsp" "-i" target
+                          (string-append root "/" file)
+                          (string-append "::" file))))
+              (scandir root))))
+
+(define* (make-partition-image partition-sexp target root)
+  "Create and return the image of PARTITION-SEXP as TARGET.  Use the given
+ROOT directory to populate the image."
+  (let* ((partition (sexp->partition partition-sexp))
+         (type (partition-file-system partition)))
+    (cond
+     ((string=? type "ext4")
+      (make-ext4-image partition target root))
+     ((string=? type "vfat")
+      (make-vfat-image partition target root))
+     (else
+      (format (current-error-port)
+              "Unsupported partition type~%.")))))
+
+(define* (genimage config target)
+  "Use genimage to generate in TARGET directory, the image described in the
+given CONFIG file."
+  ;; genimage needs a 'root' directory.
+  (mkdir "root")
+  (invoke "genimage" "--config" config
+          "--outputpath" target))
+
+(define* (register-closure prefix closure
+                           #:key
+                           (deduplicate? #t) (reset-timestamps? #t)
+                           (schema (sql-schema)))
+  "Register CLOSURE in PREFIX, where PREFIX is the directory name of the
+target store and CLOSURE is the name of a file containing a reference graph as
+produced by #:references-graphs..  As a side effect, if RESET-TIMESTAMPS? is
+true, reset timestamps on store files and, if DEDUPLICATE? is true,
+deduplicates files common to CLOSURE and the rest of PREFIX."
+  (let ((items (call-with-input-file closure read-reference-graph)))
+    (register-items items
+                    #:prefix prefix
+                    #:deduplicate? deduplicate?
+                    #:reset-timestamps? reset-timestamps?
+                    #:registration-time %epoch
+                    #:schema schema)))
+
+(define* (initialize-efi-partition root
+                                   #:key
+                                   bootloader-package
+                                   #:allow-other-keys)
+  "Install in ROOT directory, an EFI loader using BOOTLOADER-PACKAGE."
+  (install-efi-loader bootloader-package root))
+
+(define* (initialize-root-partition root
+                                    #:key
+                                    bootcfg
+                                    bootcfg-location
+                                    (deduplicate? #t)
+                                    references-graphs
+                                    (register-closures? #t)
+                                    system-directory
+                                    #:allow-other-keys)
+  "Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to
+install the bootloader configuration.
+
+If REGISTER-CLOSURES? is true, register REFERENCES-GRAPHS in the store.  If
+DEDUPLICATE? is true, then also deduplicate files common to CLOSURES and the
+rest of the store when registering the closures. SYSTEM-DIRECTORY is the name
+of the directory of the 'system' derivation."
+  (populate-root-file-system system-directory root)
+  (populate-store references-graphs root)
+
+  (when register-closures?
+    (for-each (lambda (closure)
+                (register-closure root
+                                  closure
+                                  #:reset-timestamps? #t
+                                  #:deduplicate? deduplicate?))
+              references-graphs))
+
+  (when bootcfg
+    (install-boot-config bootcfg bootcfg-location root)))
+
+(define* (make-iso9660-image xorriso grub-mkrescue-environment
+                             grub bootcfg system-directory root target
+                             #:key (volume-id "Guix_image") (volume-uuid #f)
+                             register-closures? (references-graphs '())
+                             (compression? #t))
+  "Given a GRUB package, creates an iso image as TARGET, using BOOTCFG as
+GRUB configuration and OS-DRV as the stuff in it."
+  (define grub-mkrescue
+    (string-append grub "/bin/grub-mkrescue"))
+
+  (define grub-mkrescue-sed.sh
+    (string-append (getcwd) "/" "grub-mkrescue-sed.sh"))
+
+  ;; Use a modified version of grub-mkrescue-sed.sh, see below.
+  (copy-file (string-append xorriso
+                            "/bin/grub-mkrescue-sed.sh")
+             grub-mkrescue-sed.sh)
+
+  ;; Force grub-mkrescue-sed.sh to use the build directory instead of /tmp
+  ;; that is read-only inside the build container.
+  (substitute* grub-mkrescue-sed.sh
+    (("/tmp/") (string-append (getcwd) "/"))
+    (("MKRESCUE_SED_XORRISO_ARGS \\$x")
+     (format #f "MKRESCUE_SED_XORRISO_ARGS $(echo $x | sed \"s|/tmp|~a|\")"
+             (getcwd))))
+
+  ;; 'grub-mkrescue' calls out to mtools programs to create 'efi.img', a FAT
+  ;; file system image, and mtools honors SOURCE_DATE_EPOCH for the mtime of
+  ;; those files.  The epoch for FAT is Jan. 1st 1980, not 1970, so choose
+  ;; that.
+  (setenv "SOURCE_DATE_EPOCH"
+          (number->string
+           (time-second
+            (date->time-utc (make-date 0 0 0 0 1 1 1980 0)))))
+
+  ;; Our patched 'grub-mkrescue' honors this environment variable and passes
+  ;; it to 'mformat', which makes it the serial number of 'efi.img'.  This
+  ;; allows for deterministic builds.
+  (setenv "GRUB_FAT_SERIAL_NUMBER"
+          (number->string (if volume-uuid
+
+                              ;; On 32-bit systems the 2nd argument must be
+                              ;; lower than 2^32.
+                              (string-hash (iso9660-uuid->string volume-uuid)
+                                           (- (expt 2 32) 1))
+
+                              #x77777777)
+                          16))
+
+  (setenv "MKRESCUE_SED_MODE" "original")
+  (setenv "MKRESCUE_SED_XORRISO" (string-append xorriso "/bin/xorriso"))
+  (setenv "MKRESCUE_SED_IN_EFI_NO_PT" "yes")
+
+  (for-each (match-lambda
+              ((name . value) (setenv name value)))
+            grub-mkrescue-environment)
+
+  (apply invoke grub-mkrescue
+         (string-append "--xorriso=" grub-mkrescue-sed.sh)
+         "-o" target
+         (string-append "boot/grub/grub.cfg=" bootcfg)
+         root
+         "--"
+         ;; Set all timestamps to 1.
+         "-volume_date" "all_file_dates" "=1"
+
+         `(,@(if compression?
+                 '(;; ‘zisofs’ compression reduces the total image size by
+                   ;; ~60%.
+                   "-zisofs" "level=9:block_size=128k" ; highest compression
+                   ;; It's transparent to our Linux-Libre kernel but not to
+                   ;; GRUB.  Don't compress the kernel, initrd, and other
+                   ;; files read by grub.cfg, as well as common
+                   ;; already-compressed file names.
+                   "-find" "/" "-type" "f"
+                   ;; XXX Even after "--" above, and despite documentation
+                   ;; claiming otherwise, "-or" is stolen by grub-mkrescue
+                   ;; which then chokes on it (as ‘-o …’) and dies.  Don't use
+                   ;; "-or".
+                   "-not" "-wholename" "/boot/*"
+                   "-not" "-wholename" "/System/*"
+                   "-not" "-name" "unicode.pf2"
+                   "-not" "-name" "bzImage"
+                   "-not" "-name" "*.gz"   ; initrd & all man pages
+                   "-not" "-name" "*.png"  ; includes grub-image.png
+                   "-exec" "set_filter" "--zisofs"
+                   "--")
+                 '())
+           "-volid" ,(string-upcase volume-id)
+           ,@(if volume-uuid
+             `("-volume_date" "uuid"
+               ,(string-filter (lambda (value)
+                                 (not (char=? #\- value)))
+                               (iso9660-uuid->string
+                                volume-uuid)))
+             '()))))
diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index 59a118e905..b18654f1cc 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -25,7 +25,6 @@
   #:export (install-boot-config
             evaluate-populate-directive
             populate-root-file-system
-            register-closure
             install-database-and-gc-roots
             populate-single-profile-directory))
 
diff --git a/gnu/ci.scm b/gnu/ci.scm
index fb2596c809..0430cf594b 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -38,6 +38,7 @@
                 #:select (lookup-compressor self-contained-tarball))
   #:use-module (gnu bootloader)
   #:use-module (gnu bootloader u-boot)
+  #:use-module (gnu image)
   #:use-module (gnu packages)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages base)
@@ -49,6 +50,7 @@
   #:use-module (gnu packages make-bootstrap)
   #:use-module (gnu packages package-management)
   #:use-module (gnu system)
+  #:use-module (gnu system image)
   #:use-module (gnu system vm)
   #:use-module (gnu system install)
   #:use-module (gnu tests)
@@ -209,32 +211,23 @@ system.")
     (expt 2 20))
 
   (if (member system %guixsd-supported-systems)
-      (if (member system %u-boot-systems)
-          (list (->job 'flash-image
-                       (run-with-store store
-                         (mbegin %store-monad
-                           (set-guile-for-build (default-guile))
-                           (system-disk-image
-                            (operating-system (inherit installation-os)
-                             (bootloader (bootloader-configuration
-                                          (bootloader u-boot-bootloader)
-                                          (target #f))))
-                            #:disk-image-size
-                            (* 1500 MiB))))))
-          (list (->job 'usb-image
-                       (run-with-store store
-                         (mbegin %store-monad
-                           (set-guile-for-build (default-guile))
-                           (system-disk-image installation-os
-                                              #:disk-image-size
-                                              (* 1500 MiB)))))
-                (->job 'iso9660-image
-                       (run-with-store store
-                         (mbegin %store-monad
-                           (set-guile-for-build (default-guile))
-                           (system-disk-image installation-os
-                                              #:file-system-type
-                                              "iso9660"))))))
+      (list (->job 'usb-image
+                   (run-with-store store
+                     (mbegin %store-monad
+                       (set-guile-for-build (default-guile))
+                       (system-image
+                        (image
+                         (inherit efi-disk-image)
+                         (size (* 1500 MiB))
+                         (operating-system installation-os))))))
+            (->job 'iso9660-image
+                   (run-with-store store
+                     (mbegin %store-monad
+                       (set-guile-for-build (default-guile))
+                       (system-image
+                        (image
+                         (inherit iso9660-image)
+                         (operating-system installation-os)))))))
       '()))
 
 (define channel-build-system
diff --git a/gnu/image.scm b/gnu/image.scm
new file mode 100644
index 0000000000..b05fc69dc5
--- /dev/null
+++ b/gnu/image.scm
@@ -0,0 +1,76 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Mathieu Othacehe 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (gnu image)
+  #:use-module (guix records)
+  #:export (partition
+            partition?
+            partition-device
+            partition-size
+            partition-file-system
+            partition-label
+            partition-uuid
+            partition-flags
+            partition-initializer
+
+            image
+            image-name
+            image-format
+            image-size
+            image-operating-system
+            image-partitions
+            image-compression?
+            image-volatile-root?
+            image-substitutable?))
+
+
+;;;
+;;; Partition record.
+;;;
+
+(define-record-type*  partition make-partition
+  partition?
+  (device      partition-device (default #f))
+  (size        partition-size)
+  (file-system partition-file-system (default "ext4"))
+  (label       partition-label (default #f))
+  (uuid        partition-uuid (default #f))
+  (flags       partition-flags (default '()))
+  (initializer partition-initializer (default #f)))
+
+
+;;;
+;;; Image record.
+;;;
+
+(define-record-type* 
+  image make-image
+  image?
+  (format             image-format) ;symbol
+  (size               image-size  ;size in bytes as integer
+                      (default 'guess))
+  (operating-system   image-operating-system  ;
+                      (default #f))
+  (partitions         image-partitions ;list of 
+                      (default '()))
+  (compression?       image-compression? ;boolean
+                      (default #t))
+  (volatile-root?     image-volatile-root? ;boolean
+                      (default #t))
+  (substitutable?     image-substitutable? ;boolean
+                      (default #t)))
diff --git a/gnu/local.mk b/gnu/local.mk
index daf6bd0306..4e0521baa5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -62,6 +62,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/bootloader/u-boot.scm                     \
   %D%/bootloader/depthcharge.scm                \
   %D%/ci.scm					\
+  %D%/image.scm					\
   %D%/packages.scm				\
   %D%/packages/abduco.scm			\
   %D%/packages/abiword.scm			\
@@ -606,6 +607,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/system.scm				\
   %D%/system/accounts.scm			\
   %D%/system/file-systems.scm			\
+  %D%/system/image.scm 				\
   %D%/system/install.scm			\
   %D%/system/keyboard.scm			\
   %D%/system/linux-container.scm		\
@@ -626,6 +628,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/build/activation.scm			\
   %D%/build/bootloader.scm			\
   %D%/build/cross-toolchain.scm			\
+  %D%/build/image.scm				\
   %D%/build/file-systems.scm			\
   %D%/build/install.scm				\
   %D%/build/linux-boot.scm			\
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
new file mode 100644
index 0000000000..571b7af5f3
--- /dev/null
+++ b/gnu/system/image.scm
@@ -0,0 +1,532 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Mathieu Othacehe 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (gnu system image)
+  #:use-module (guix gexp)
+  #:use-module (guix modules)
+  #:use-module (guix monads)
+  #:use-module (guix records)
+  #:use-module (guix store)
+  #:use-module (guix ui)
+  #:use-module (guix utils)
+  #:use-module ((guix self) #:select (make-config.scm))
+  #:use-module (gnu bootloader)
+  #:use-module (gnu bootloader grub)
+  #:use-module (gnu image)
+  #:use-module (gnu services)
+  #:use-module (gnu services base)
+  #:use-module (gnu system)
+  #:use-module (gnu system file-systems)
+  #:use-module (gnu system uuid)
+  #:use-module (gnu system vm)
+  #:use-module (guix packages)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bootloaders)
+  #:use-module (gnu packages cdrom)
+  #:use-module (gnu packages disk)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages genimage)
+  #:use-module (gnu packages guile)
+  #:autoload   (gnu packages gnupg) (guile-gcrypt)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages mtools)
+  #:use-module ((srfi srfi-1) #:prefix srfi-1:)
+  #:use-module (srfi srfi-11)
+  #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-35)
+  #:use-module (rnrs bytevectors)
+  #:use-module (ice-9 match)
+  #:export (esp-partition
+            root-partition
+
+            efi-disk-image
+            iso9660-image
+
+            find-image
+            system-image))
+
+
+;;;
+;;; Images definitions.
+;;;
+
+(define esp-partition
+  (partition
+   (size (* 40 (expt 2 20)))
+   (label "GNU-ESP") ;cosmetic only
+   ;; Use "vfat" here since this property is used when mounting.  The actual
+   ;; FAT-ness is based on file system size (16 in this case).
+   (file-system "vfat")
+   (flags '(esp))
+   (initializer (gexp initialize-efi-partition))))
+
+(define root-partition
+  (partition
+   (size 'guess)
+   (label "Guix_image")
+   (file-system "ext4")
+   (flags '(boot))
+   (initializer (gexp initialize-root-partition))))
+
+(define efi-disk-image
+  (image
+   (format 'disk-image)
+   (partitions (list esp-partition root-partition))))
+
+(define iso9660-image
+  (image
+   (format 'iso9660)
+   (partitions
+    (list (partition
+           (size 'guess)
+           (label "GUIX_IMAGE")
+           (flags '(boot)))))
+   ;; XXX: Temporarily disable compression to speed-up the tests.
+   (compression? #f)))
+
+
+;;
+;; Helpers.
+;;
+
+(define not-config?
+  ;; Select (guix …) and (gnu …) modules, except (guix config).
+  (match-lambda
+    (('guix 'config) #f)
+    (('guix rest ...) #t)
+    (('gnu rest ...) #t)
+    (rest #f)))
+
+(define (partition->gexp partition)
+  "Turn PARTITION, a  object, into a list-valued gexp suitable for
+'make-partition-image'."
+  #~'(#$@(list (partition-size partition))
+      #$(partition-file-system partition)
+      #$(partition-label partition)
+      #$(and=> (partition-uuid partition)
+               uuid-bytevector)))
+
+(define gcrypt-sqlite3&co
+  ;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs.
+  (srfi-1:append-map
+   (lambda (package)
+     (cons package
+           (match (package-transitive-propagated-inputs package)
+             (((labels packages) ...)
+              packages))))
+   (list guile-gcrypt guile-sqlite3)))
+
+(define-syntax-rule (with-imported-modules* gexp* ...)
+  (with-extensions gcrypt-sqlite3&co
+    (with-imported-modules `(,@(source-module-closure
+                                '((gnu build vm)
+                                  (gnu build image)
+                                  (guix store database))
+                                #:select? not-config?)
+                             ((guix config) => ,(make-config.scm)))
+      #~(begin
+          (use-modules (gnu build vm)
+                       (gnu build image)
+                       (guix store database)
+                       (guix build utils))
+          gexp* ...))))
+
+
+;;
+;; Disk image.
+;;
+
+(define* (system-disk-image image
+                            #:key
+                            (name "disk-image")
+                            bootcfg
+                            bootloader
+                            register-closures?
+                            (inputs '()))
+  "Return as a file-like object, the disk-image described by IMAGE.  Said
+image can be copied on a USB stick as is.  BOOTLOADER is the bootloader that
+will be installed and configured according to BOOTCFG parameter.
+
+Raw images of the IMAGE partitions are first created.  Then, genimage is used
+to assemble the partition images into a disk-image without resorting to a
+virtual machine.
+
+INPUTS is a list of inputs (as for packages).  When REGISTER-CLOSURES? is
+true, register INPUTS in the store database of the image so that Guix can be
+used in the image."
+
+  (define genimage-name "image")
+
+  (define (image->genimage-cfg image)
+    ;; Return as a file-like object, the genimage configuration file
+    ;; describing the given IMAGE.
+    (define (format->image-type format)
+      ;; Return the genimage format corresponding to FORMAT.  For now, only
+      ;; the hdimage format (raw disk-image) is supported.
+      (case format
+        ((disk-image) "hdimage")
+        (else
+         (raise (condition
+                 (&message
+                  (message
+                   (format #f (G_ "Unsupported image type ~a~%.") format))))))))
+
+    (define (partition->dos-type partition)
+      ;; Return the MBR partition type corresponding to the given PARTITION.
+      ;; See: https://en.wikipedia.org/wiki/Partition_type.
+      (let ((flags (partition-flags partition)))
+        (cond
+         ((member 'esp flags) "0xEF")
+         (else "0x83"))))
+
+    (define (partition-image partition)
+      ;; Return as a file-like object, an image of the given PARTITION.  A
+      ;; directory, filled by calling the PARTITION initializer procedure, is
+      ;; first created within the store.  Then, an image of this directory is
+      ;; created using tools such as 'mke2fs' or 'mkdosfs', depending on the
+      ;; partition file-system type.
+      (let* ((os (image-operating-system image))
+             (schema (local-file (search-path %load-path
+                                              "guix/store/schema.sql")))
+             (graph (match inputs
+                      (((names . _) ...)
+                       names)))
+             (root-builder
+              (with-imported-modules*
+               (let* ((initializer #$(partition-initializer partition)))
+                 (sql-schema #$schema)
+
+                 ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be
+                 ;; decoded.
+                 (setenv "GUIX_LOCPATH"
+                         #+(file-append glibc-utf8-locales "/lib/locale"))
+                 (setlocale LC_ALL "en_US.utf8")
+
+                 (initializer #$output
+                              #:references-graphs '#$graph
+                              #:deduplicate? #f
+                              #:system-directory #$os
+                              #:bootloader-package
+                              #$(bootloader-package bootloader)
+                              #:bootcfg #$bootcfg
+                              #:bootcfg-location
+                              #$(bootloader-configuration-file bootloader)))))
+             (image-root
+              (computed-file "partition-image-root" root-builder
+                             #:options `(#:references-graphs ,inputs)))
+             (type (partition-file-system partition))
+             (image-builder
+              (with-imported-modules*
+               (let ((inputs '#$(list e2fsprogs dosfstools mtools)))
+                 (set-path-environment-variable "PATH" '("bin" "sbin") inputs)
+                 (make-partition-image #$(partition->gexp partition)
+                                       #$output
+                                       #$image-root)))))
+        (computed-file "partition.img" image-builder)))
+
+    (define (partition->config partition)
+      ;; Return the genimage partition configuration for PARTITION.
+      (let ((label (partition-label partition))
+            (dos-type (partition->dos-type partition))
+            (image (partition-image partition)))
+        #~(format #f "~/partition ~a {
+                                      ~/~/partition-type = ~a
+                                      ~/~/image = \"~a\"
+                                      ~/}"  #$label #$dos-type #$image)))
+
+    (let* ((format (image-format image))
+           (image-type (format->image-type format))
+           (partitions (image-partitions image))
+           (partitions-config (map partition->config partitions))
+           (builder
+            #~(begin
+                (let ((format (@ (ice-9 format) format)))
+                  (call-with-output-file #$output
+                    (lambda (port)
+                      (format port
+                              "\
+image ~a {
+~/~a {}
+~{~a~^~%~}
+}~%" #$genimage-name #$image-type (list #$@partitions-config))))))))
+      (computed-file "genimage.cfg" builder)))
+
+  (let* ((substitutable? (image-substitutable? image))
+         (builder
+          (with-imported-modules*
+           (let ((inputs '#$(list genimage coreutils findutils)))
+             (set-path-environment-variable "PATH" '("bin" "sbin") inputs)
+             (genimage #$(image->genimage-cfg image) #$output))))
+         (image-dir (computed-file "image-dir" builder)))
+    (computed-file name
+                   #~(symlink
+                      (string-append #$image-dir "/" #$genimage-name)
+                      #$output)
+                   #:options `(#:substitutable? ,substitutable?))))
+
+
+;;
+;; ISO9660 image.
+;;
+
+(define (has-guix-service-type? os)
+  "Return true if OS contains a service of the type GUIX-SERVICE-TYPE."
+  (not (not (srfi-1:find (lambda (service)
+                           (eq? (service-kind service) guix-service-type))
+                         (operating-system-services os)))))
+
+(define* (system-iso9660-image image
+                               #:key
+                               (name "iso9660-image")
+                               bootcfg
+                               bootloader
+                               register-closures?
+                               (inputs '())
+                               (grub-mkrescue-environment '()))
+  "Return as a file-like object a bootable, stand-alone iso9660 image.
+
+INPUTS is a list of inputs (as for packages).  When REGISTER-CLOSURES? is
+true, register INPUTS in the store database of the image so that Guix can be
+used in the image. "
+  (define root-label
+    (match (image-partitions image)
+      ((partition)
+       (partition-label partition))))
+
+  (define root-uuid
+    (match (image-partitions image)
+      ((partition)
+       (uuid-bytevector (partition-uuid partition)))))
+
+  (let* ((os (image-operating-system image))
+         (bootloader (bootloader-package bootloader))
+         (compression? (image-compression? image))
+         (substitutable? (image-substitutable? image))
+         (schema (local-file (search-path %load-path
+                                          "guix/store/schema.sql")))
+         (graph (match inputs
+                  (((names . _) ...)
+                   names)))
+         (root-builder
+          (with-imported-modules*
+           (sql-schema #$schema)
+
+           ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded.
+           (setenv "GUIX_LOCPATH"
+                   #+(file-append glibc-utf8-locales "/lib/locale"))
+           (setlocale LC_ALL "en_US.utf8")
+
+           (initialize-root-partition #$output
+                                      #:references-graphs '#$graph
+                                      #:deduplicate? #f
+                                      #:system-directory #$os)))
+         (image-root
+          (computed-file "image-root" root-builder
+                         #:options `(#:references-graphs ,inputs)))
+         (builder
+          (with-imported-modules*
+           (let* ((inputs '#$(list parted e2fsprogs dosfstools xorriso
+                                   sed grep coreutils findutils gawk)))
+             (set-path-environment-variable "PATH" '("bin" "sbin") inputs)
+             (make-iso9660-image #$xorriso
+                                 '#$grub-mkrescue-environment
+                                 #$bootloader
+                                 #$bootcfg
+                                 #$os
+                                 #$image-root
+                                 #$output
+                                 #:references-graphs '#$graph
+                                 #:register-closures? #$register-closures?
+                                 #:compression? #$compression?
+                                 #:volume-id #$root-label
+                                 #:volume-uuid #$root-uuid)))))
+    (computed-file name builder
+                   #:options `(#:references-graphs ,inputs
+                               #:substitutable? ,substitutable?))))
+
+
+;;
+;; Image creation.
+;;
+
+(define (root-partition? partition)
+  "Return true if PARTITION is the root partition, false otherwise."
+  (member 'boot (partition-flags partition)))
+
+(define (find-root-partition image)
+  "Return the root partition of the given IMAGE."
+  (srfi-1:find root-partition? (image-partitions image)))
+
+(define (image->root-file-system image)
+  "Return the IMAGE root partition file-system type."
+  (let ((format (image-format image)))
+    (if (eq? format 'iso9660)
+        "iso9660"
+        (partition-file-system (find-root-partition image)))))
+
+(define (root-size image)
+  "Return the root partition size of IMAGE."
+  (let* ((image-size (image-size image))
+         (root-partition (find-root-partition image))
+         (root-size (partition-size root-partition)))
+    (cond
+     ((and (eq? root-size 'guess) image-size)
+      image-size)
+     (else root-size))))
+
+(define* (image-with-os base-image os)
+  "Return an image based on BASE-IMAGE but with the operating-system field set
+to OS.  Also set the UUID and the size of the root partition."
+  (define root-file-system
+    (srfi-1:find
+     (lambda (fs)
+       (string=? (file-system-mount-point fs) "/"))
+     (operating-system-file-systems os)))
+
+  (let*-values (((partitions) (image-partitions base-image))
+                ((root-partition other-partitions)
+                 (srfi-1:partition root-partition? partitions)))
+    (image
+     (inherit base-image)
+     (operating-system os)
+     (partitions
+      (cons (partition
+             (inherit (car root-partition))
+             (uuid (file-system-device root-file-system))
+             (size (root-size base-image)))
+            other-partitions)))))
+
+(define (operating-system-for-image image)
+  "Return an operating-system based on the one specified in IMAGE, but
+suitable for image creation.  Assign an UUID to the root file-system, so that
+it can be used for bootloading."
+  (define volatile-root? (image-volatile-root? image))
+
+  (define (root-uuid os)
+    ;; UUID of the root file system, computed in a deterministic fashion.
+    ;; This is what we use to locate the root file system so it has to be
+    ;; different from the user's own file system UUIDs.
+    (let ((type (if (eq? (image-format image) 'iso9660)
+                    'iso9660
+                    'dce)))
+      (operating-system-uuid os type)))
+
+  (let* ((root-file-system-type (image->root-file-system image))
+         (base-os (image-operating-system image))
+         (file-systems-to-keep
+          (srfi-1:remove
+           (lambda (fs)
+             (string=? (file-system-mount-point fs) "/"))
+           (operating-system-file-systems base-os)))
+         (format (image-format image))
+         (os
+          (operating-system
+            (inherit base-os)
+            (initrd (lambda (file-systems . rest)
+                      (apply (operating-system-initrd base-os)
+                             file-systems
+                             #:volatile-root? volatile-root?
+                             rest)))
+            (bootloader (if (eq? format 'iso9660)
+                            (bootloader-configuration
+                             (inherit
+                              (operating-system-bootloader base-os))
+                             (bootloader grub-mkrescue-bootloader))
+                            (operating-system-bootloader base-os)))
+            (file-systems (cons (file-system
+                                  (mount-point "/")
+                                  (device "/dev/placeholder")
+                                  (type root-file-system-type))
+                                file-systems-to-keep))))
+         (uuid (root-uuid os)))
+    (operating-system
+      (inherit os)
+      (file-systems (cons (file-system
+                            (mount-point "/")
+                            (device uuid)
+                            (type root-file-system-type))
+                          file-systems-to-keep)))))
+
+(define* (make-system-image image)
+  "Return the derivation of IMAGE.  It can be a raw disk-image or an ISO9660
+image, depending on IMAGE format."
+  (define substitutable? (image-substitutable? image))
+
+  (let* ((os (operating-system-for-image image))
+         (image* (image-with-os image os))
+         (register-closures? (has-guix-service-type? os))
+         (bootcfg (operating-system-bootcfg os))
+         (bootloader (bootloader-configuration-bootloader
+                      (operating-system-bootloader os))))
+    (case (image-format image)
+      ((disk-image)
+       (system-disk-image image*
+                          #:bootcfg bootcfg
+                          #:bootloader bootloader
+                          #:register-closures? register-closures?
+                          #:inputs `(("system" ,os)
+                                     ("bootcfg" ,bootcfg))))
+      ((iso9660)
+       (system-iso9660-image image*
+                             #:bootcfg bootcfg
+                             #:bootloader bootloader
+                             #:register-closures? register-closures?
+                             #:inputs `(("system" ,os)
+                                        ("bootcfg" ,bootcfg))
+                             #:grub-mkrescue-environment
+                             '(("MKRESCUE_SED_MODE" . "mbr_hfs")))))))
+
+(define (find-image file-system-type)
+  "Find and return an image that could match the given FILE-SYSTEM-TYPE.  This
+is useful to adapt to interfaces written before the addition of the 
+record."
+  ;; XXX: Add support for system and target here, or in the caller.
+  (match file-system-type
+    ("iso9660" iso9660-image)
+    (_ efi-disk-image)))
+
+(define (system-image image)
+  "Wrap 'make-system-image' call, so that it is used only if the given IMAGE
+is supported.  Otherwise, fallback to image creation in a VM.  This is
+temporary and should be removed once 'make-system-image' is able to deal with
+all types of images."
+  (define substitutable? (image-substitutable? image))
+  (define volatile-root? (image-volatile-root? image))
+
+  (let* ((image-os (image-operating-system image))
+         (image-root-filesystem-type (image->root-file-system image))
+         (bootloader (bootloader-configuration-bootloader
+                      (operating-system-bootloader image-os)))
+         (bootloader-name (bootloader-name bootloader))
+         (size (image-size image))
+         (format (image-format image)))
+    (mbegin %store-monad
+      (if (and (or (eq? bootloader-name 'grub)
+                   (eq? bootloader-name 'extlinux))
+               (eq? format 'disk-image))
+          ;; Fallback to image creation in a VM when it is not yet supported
+          ;; by this module.
+          (system-disk-image-in-vm image-os
+                                   #:disk-image-size size
+                                   #:file-system-type image-root-filesystem-type
+                                   #:volatile? volatile-root?
+                                   #:substitutable? substitutable?)
+          (lower-object
+           (make-system-image image))))))
+
+;;; image.scm ends here
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 2fdf954883..37840ce355 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -77,7 +77,7 @@
 
             system-qemu-image/shared-store
             system-qemu-image/shared-store-script
-            system-disk-image
+            system-disk-image-in-vm
             system-docker-image
 
             virtual-machine
@@ -604,14 +604,13 @@ system."
 ;;; VM and disk images.
 ;;;
 
-
-(define* (system-disk-image os
-                            #:key
-                            (name "disk-image")
-                            (file-system-type "ext4")
-                            (disk-image-size (* 900 (expt 2 20)))
-                            (volatile? #t)
-                            (substitutable? #t))
+(define* (system-disk-image-in-vm os
+                                  #:key
+                                  (name "disk-image")
+                                  (file-system-type "ext4")
+                                  (disk-image-size (* 900 (expt 2 20)))
+                                  (volatile? #t)
+                                  (substitutable? #t))
   "Return the derivation of a disk image of DISK-IMAGE-SIZE bytes of the
 system described by OS.  Said image can be copied on a USB stick as is.  When
 VOLATILE? is true, the root file system is made volatile; this is useful
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 23f60c68bf..2e5913953e 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -22,9 +22,11 @@
 (define-module (gnu tests install)
   #:use-module (gnu)
   #:use-module (gnu bootloader extlinux)
+  #:use-module (gnu image)
   #:use-module (gnu tests)
   #:use-module (gnu tests base)
   #:use-module (gnu system)
+  #:use-module (gnu system image)
   #:use-module (gnu system install)
   #:use-module (gnu system vm)
   #:use-module ((gnu build vm) #:select (qemu-command))
@@ -229,14 +231,18 @@ packages defined in installation-os."
                        ;; we cheat a little bit by adding TARGET to its GC
                        ;; roots.  This way, we know 'guix system init' will
                        ;; succeed.
-                       (image  (system-disk-image
-                                (operating-system-with-gc-roots
-                                 os (list target))
-                                #:disk-image-size install-size
-                                #:file-system-type
-                                installation-disk-image-file-system-type
-                                ;; Don't provide substitutes; too big.
-                                #:substitutable? #f)))
+                       (image
+                        (system-image
+                         (image
+                          (inherit
+                           (find-image
+                            installation-disk-image-file-system-type))
+                          (size install-size)
+                          (operating-system
+                            (operating-system-with-gc-roots
+                             os (list target)))
+                          ;; Don't provide substitutes; too big.
+                          (substitutable? #f)))))
     (define install
       (with-imported-modules '((guix build utils)
                                (gnu build marionette))
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 2664c66a30..3c8691a08c 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -54,9 +54,11 @@
   #:autoload   (gnu build linux-modules)
                  (device-module-aliases matching-modules)
   #:use-module (gnu system linux-initrd)
+  #:use-module (gnu image)
   #:use-module (gnu system)
   #:use-module (gnu bootloader)
   #:use-module (gnu system file-systems)
+  #:use-module (gnu system image)
   #:use-module (gnu system mapped-devices)
   #:use-module (gnu system linux-container)
   #:use-module (gnu system uuid)
@@ -692,12 +694,11 @@ checking this by themselves in their 'check' procedure."
                                                 (* 70 (expt 2 20)))
                                             #:mappings mappings))
     ((disk-image)
-     (system-disk-image os
-                        #:name (match file-system-type
-                                 ("iso9660" "image.iso")
-                                 (_         "disk-image"))
-                        #:disk-image-size image-size
-                        #:file-system-type file-system-type))
+     (system-image
+      (image
+       (inherit (find-image file-system-type))
+       (size image-size)
+       (operating-system os))))
     ((docker-image)
      (system-docker-image os))))
 
-- 
cgit v1.2.3


From 77f5296236693fe6ade4eee1dfc077c18dc2204c Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Tue, 28 Apr 2020 16:37:57 +0200
Subject: vm: Remove obsolete procedures.

* gnu/build/vm.scm (install-efi, make-iso9660-image): Remove those procedures
that are now implemented in (gnu build image) module,
(initialize-hard-disk): remove efi support.
* gnu/system/vm.scm (iso9660-image): Remove it,
(qemu-image): adapt it to remove ISO9660 support.
---
 gnu/build/vm.scm  | 156 +-----------------------------------------------------
 gnu/system/vm.scm | 151 ++++++----------------------------------------------
 2 files changed, 18 insertions(+), 289 deletions(-)

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index bc6071daa9..1a888b1a51 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -57,8 +57,7 @@
             estimated-partition-size
             root-partition-initializer
             initialize-partition-table
-            initialize-hard-disk
-            make-iso9660-image))
+            initialize-hard-disk))
 
 ;;; Commentary:
 ;;;
@@ -417,159 +416,6 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
     (mkdir-p directory)
     (symlink bootcfg (string-append directory "/bootcfg"))))
 
-(define (install-efi grub esp config-file)
-  "Write a self-contained GRUB EFI loader to the mounted ESP using CONFIG-FILE."
-  (let* ((system %host-type)
-         ;; Hard code the output location to a well-known path recognized by
-         ;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviour":
-         ;; http://www.uefi.org/sites/default/files/resources/UEFI%20Spec%202_6.pdf
-         (grub-mkstandalone (string-append grub "/bin/grub-mkstandalone"))
-         (efi-directory (string-append esp "/EFI/BOOT"))
-         ;; Map grub target names to boot file names.
-         (efi-targets (cond ((string-prefix? "x86_64" system)
-                             '("x86_64-efi" . "BOOTX64.EFI"))
-                            ((string-prefix? "i686" system)
-                             '("i386-efi" . "BOOTIA32.EFI"))
-                            ((string-prefix? "armhf" system)
-                             '("arm-efi" . "BOOTARM.EFI"))
-                            ((string-prefix? "aarch64" system)
-                             '("arm64-efi" . "BOOTAA64.EFI")))))
-    ;; grub-mkstandalone requires a TMPDIR to prepare the firmware image.
-    (setenv "TMPDIR" esp)
-
-    (mkdir-p efi-directory)
-    (invoke grub-mkstandalone "-O" (car efi-targets)
-            "-o" (string-append efi-directory "/"
-                                (cdr efi-targets))
-            ;; Graft the configuration file onto the image.
-            (string-append "boot/grub/grub.cfg=" config-file))))
-
-(define* (make-iso9660-image xorriso grub-mkrescue-environment
-                             grub config-file os-drv target
-                             #:key (volume-id "Guix_image") (volume-uuid #f)
-                             register-closures? (closures '()))
-  "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as
-GRUB configuration and OS-DRV as the stuff in it."
-  (define grub-mkrescue
-    (string-append grub "/bin/grub-mkrescue"))
-
-  (define grub-mkrescue-sed.sh
-    (string-append xorriso "/bin/grub-mkrescue-sed.sh"))
-
-  (define target-store
-    (string-append "/tmp/root" (%store-directory)))
-
-  (define items
-    ;; The store items to add to the image.
-    (delete-duplicates
-     (append-map (lambda (closure)
-                   (map store-info-item
-                        (call-with-input-file (string-append "/xchg/" closure)
-                          read-reference-graph)))
-                 closures)))
-
-  (populate-root-file-system os-drv "/tmp/root")
-  (mount (%store-directory) target-store "" MS_BIND)
-
-  (when register-closures?
-    (display "registering closures...\n")
-    (for-each (lambda (closure)
-                (register-closure
-                 "/tmp/root"
-                 (string-append "/xchg/" closure)
-
-                 ;; TARGET-STORE is a read-only bind-mount so we shouldn't try
-                 ;; to modify it.
-                 #:deduplicate? #f
-                 #:reset-timestamps? #f))
-              closures)
-    (register-bootcfg-root "/tmp/root" config-file))
-
-  ;; 'grub-mkrescue' calls out to mtools programs to create 'efi.img', a FAT
-  ;; file system image, and mtools honors SOURCE_DATE_EPOCH for the mtime of
-  ;; those files.  The epoch for FAT is Jan. 1st 1980, not 1970, so choose
-  ;; that.
-  (setenv "SOURCE_DATE_EPOCH"
-          (number->string
-           (time-second
-            (date->time-utc (make-date 0 0 0 0 1 1 1980 0)))))
-
-  ;; Our patched 'grub-mkrescue' honors this environment variable and passes
-  ;; it to 'mformat', which makes it the serial number of 'efi.img'.  This
-  ;; allows for deterministic builds.
-  (setenv "GRUB_FAT_SERIAL_NUMBER"
-          (number->string (if volume-uuid
-
-                              ;; On 32-bit systems the 2nd argument must be
-                              ;; lower than 2^32.
-                              (string-hash (iso9660-uuid->string volume-uuid)
-                                           (- (expt 2 32) 1))
-
-                              #x77777777)
-                          16))
-
-  (setenv "MKRESCUE_SED_MODE" "original")
-  (setenv "MKRESCUE_SED_XORRISO" (string-append xorriso
-                                                "/bin/xorriso"))
-  (setenv "MKRESCUE_SED_IN_EFI_NO_PT" "yes")
-  (for-each (match-lambda
-             ((name . value) (setenv name value)))
-            grub-mkrescue-environment)
-
-  (let ((pipe
-         (apply open-pipe* OPEN_WRITE
-                grub-mkrescue
-                (string-append "--xorriso=" grub-mkrescue-sed.sh)
-                "-o" target
-                (string-append "boot/grub/grub.cfg=" config-file)
-                "etc=/tmp/root/etc"
-                "var=/tmp/root/var"
-                "run=/tmp/root/run"
-                ;; /mnt is used as part of the installation
-                ;; process, as the mount point for the target
-                ;; file system, so create it.
-                "mnt=/tmp/root/mnt"
-                "-path-list" "-"
-                "--"
-
-                ;; Set all timestamps to 1.
-                "-volume_date" "all_file_dates" "=1"
-
-                ;; ‘zisofs’ compression reduces the total image size by ~60%.
-                "-zisofs" "level=9:block_size=128k" ; highest compression
-                ;; It's transparent to our Linux-Libre kernel but not to GRUB.
-                ;; Don't compress the kernel, initrd, and other files read by
-                ;; grub.cfg, as well as common already-compressed file names.
-                "-find" "/" "-type" "f"
-                ;; XXX Even after "--" above, and despite documentation claiming
-                ;; otherwise, "-or" is stolen by grub-mkrescue which then chokes
-                ;; on it (as ‘-o …’) and dies.  Don't use "-or".
-                "-not" "-wholename" "/boot/*"
-                "-not" "-wholename" "/System/*"
-                "-not" "-name" "unicode.pf2"
-                "-not" "-name" "bzImage"
-                "-not" "-name" "*.gz"   ; initrd & all man pages
-                "-not" "-name" "*.png"  ; includes grub-image.png
-                "-exec" "set_filter" "--zisofs"
-                "--"
-
-                "-volid" (string-upcase volume-id)
-                (if volume-uuid
-                    `("-volume_date" "uuid"
-                      ,(string-filter (lambda (value)
-                                        (not (char=? #\- value)))
-                                      (iso9660-uuid->string
-                                       volume-uuid)))
-                    `()))))
-    ;; Pass lines like 'gnu/store/…-x=/gnu/store/…-x' corresponding to the
-    ;; '-path-list -' option.
-    (for-each (lambda (item)
-                (format pipe "~a=~a~%"
-                        (string-drop item 1) item))
-              items)
-    (unless (zero? (close-pipe pipe))
-      (error "oh, my! grub-mkrescue failed" grub-mkrescue))))
-
 (define* (initialize-hard-disk device
                                #:key
                                bootloader-package
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 37840ce355..1cab8997b4 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -269,95 +269,6 @@ substitutable."
                      (eq? (service-kind service) guix-service-type))
                    (operating-system-services os)))))
 
-(define* (iso9660-image #:key
-                        (name "iso9660-image")
-                        file-system-label
-                        file-system-uuid
-                        (system (%current-system))
-                        (target (%current-target-system))
-                        (qemu qemu-minimal)
-                        os
-                        bootcfg-drv
-                        bootloader
-                        (register-closures? (has-guix-service-type? os))
-                        (inputs '())
-                        (grub-mkrescue-environment '())
-                        (substitutable? #t))
-  "Return a bootable, stand-alone iso9660 image.
-
-INPUTS is a list of inputs (as for packages)."
-  (define schema
-    (and register-closures?
-         (local-file (search-path %load-path
-                                  "guix/store/schema.sql"))))
-
-  (expression->derivation-in-linux-vm
-   name
-   (with-extensions gcrypt-sqlite3&co
-     (with-imported-modules `(,@(source-module-closure '((gnu build vm)
-                                                         (guix store database)
-                                                         (guix build utils))
-                                                       #:select? not-config?)
-                              ((guix config) => ,(make-config.scm)))
-       #~(begin
-           (use-modules (gnu build vm)
-                        (guix store database)
-                        (guix build utils))
-
-           (sql-schema #$schema)
-
-           ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded.
-           (setenv "GUIX_LOCPATH"
-                   #+(file-append glibc-utf8-locales "/lib/locale"))
-           (setlocale LC_ALL "en_US.utf8")
-
-           (let ((inputs
-                  '#$(append (list parted e2fsprogs dosfstools xorriso)
-                             (map canonical-package
-                                  (list sed grep coreutils findutils gawk))))
-
-
-                 (graphs     '#$(match inputs
-                                  (((names . _) ...)
-                                   names)))
-                 ;; This variable is unused but allows us to add INPUTS-TO-COPY
-                 ;; as inputs.
-                 (to-register
-                  '#$(map (match-lambda
-                            ((name thing) thing)
-                            ((name thing output) `(,thing ,output)))
-                          inputs)))
-
-             (set-path-environment-variable "PATH" '("bin" "sbin") inputs)
-             (make-iso9660-image #$xorriso
-                                 '#$grub-mkrescue-environment
-                                 #$(bootloader-package bootloader)
-                                 #$bootcfg-drv
-                                 #$os
-                                 "/xchg/guixsd.iso"
-                                 #:register-closures? #$register-closures?
-                                 #:closures graphs
-                                 #:volume-id #$file-system-label
-                                 #:volume-uuid #$(and=> file-system-uuid
-                                                        uuid-bytevector))))))
-   #:system system
-   #:target target
-
-   ;; Keep a local file system for /tmp so that we can populate it directly as
-   ;; root and have files owned by root.  See .
-   #:file-systems (remove (lambda (file-system)
-                            (string=? (file-system-mount-point file-system)
-                                      "/tmp"))
-                          %linux-vm-file-systems)
-
-   #:make-disk-image? #f
-   #:single-file-output? #t
-   #:references-graphs inputs
-   #:substitutable? substitutable?
-
-   ;; Xorriso seems to be quite memory-hungry, so increase the VM's RAM size.
-   #:memory-size 512))
-
 (define* (qemu-image #:key
                      (name "qemu-image")
                      (system (%current-system))
@@ -618,25 +529,14 @@ to USB sticks meant to be read-only.
 
 SUBSTITUTABLE? determines whether the returned derivation should be marked as
 substitutable."
-  (define normalize-label
-    ;; ISO labels are all-caps (case-insensitive), but since
-    ;; 'find-partition-by-label' is case-sensitive, make it all-caps here.
-    (if (string=? "iso9660" file-system-type)
-        string-upcase
-        identity))
-
   (define root-label
-    ;; Volume name of the root file system.
-    (normalize-label "Guix_image"))
+    "Guix_image")
 
   (define (root-uuid os)
     ;; UUID of the root file system, computed in a deterministic fashion.
     ;; This is what we use to locate the root file system so it has to be
     ;; different from the user's own file system UUIDs.
-    (operating-system-uuid os
-                           (if (string=? file-system-type "iso9660")
-                               'iso9660
-                               'dce)))
+    (operating-system-uuid os 'dce))
 
   (define file-systems-to-keep
     (remove (lambda (fs)
@@ -653,11 +553,7 @@ substitutable."
                                 #:volatile-root? volatile?
                                 rest)))
 
-               (bootloader (if (string=? "iso9660" file-system-type)
-                               (bootloader-configuration
-                                 (inherit (operating-system-bootloader os))
-                                 (bootloader grub-mkrescue-bootloader))
-                               (operating-system-bootloader os)))
+               (bootloader (operating-system-bootloader os))
 
                ;; Force our own root file system.  (We need a "/" file system
                ;; to call 'root-uuid'.)
@@ -675,33 +571,20 @@ substitutable."
                                      (type file-system-type))
                                    file-systems-to-keep))))
         (bootcfg (operating-system-bootcfg os)))
-    (if (string=? "iso9660" file-system-type)
-        (iso9660-image #:name name
-                       #:file-system-label root-label
-                       #:file-system-uuid uuid
-                       #:os os
-                       #:bootcfg-drv bootcfg
-                       #:bootloader (bootloader-configuration-bootloader
-                                     (operating-system-bootloader os))
-                       #:inputs `(("system" ,os)
-                                  ("bootcfg" ,bootcfg))
-                       #:grub-mkrescue-environment
-                       '(("MKRESCUE_SED_MODE" . "mbr_hfs"))
-                       #:substitutable? substitutable?)
-        (qemu-image #:name name
-                    #:os os
-                    #:bootcfg-drv bootcfg
-                    #:bootloader (bootloader-configuration-bootloader
-                                  (operating-system-bootloader os))
-                    #:disk-image-size disk-image-size
-                    #:disk-image-format "raw"
-                    #:file-system-type file-system-type
-                    #:file-system-label root-label
-                    #:file-system-uuid uuid
-                    #:copy-inputs? #t
-                    #:inputs `(("system" ,os)
-                               ("bootcfg" ,bootcfg))
-                    #:substitutable? substitutable?))))
+    (qemu-image #:name name
+                #:os os
+                #:bootcfg-drv bootcfg
+                #:bootloader (bootloader-configuration-bootloader
+                              (operating-system-bootloader os))
+                #:disk-image-size disk-image-size
+                #:disk-image-format "raw"
+                #:file-system-type file-system-type
+                #:file-system-label root-label
+                #:file-system-uuid uuid
+                #:copy-inputs? #t
+                #:inputs `(("system" ,os)
+                           ("bootcfg" ,bootcfg))
+                #:substitutable? substitutable?)))
 
 (define* (system-qemu-image os
                             #:key
-- 
cgit v1.2.3


From 7431553bd6a1125a132315b521031a3b0481e096 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 5 May 2020 16:27:55 +0200
Subject: gnu: libcap: Add 2.34.

* gnu/packages/linux.scm (libcap/next): New public variable.
---
 gnu/packages/linux.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8b8945fbea..e2b3d9e6c5 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2171,6 +2171,21 @@ Linux-based operating systems.")
     ;; License is BSD-3 or GPLv2, at the user's choice.
     (license license:gpl2)))
 
+;; libcap 2.31 causes problems for 'fakeroot', so provide this newer variant.
+;; To be merged with libcap on the next rebuild cycle.
+(define-public libcap/next
+  (package
+    (inherit libcap)
+    (version "2.34")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kernel.org/linux/libs/security/linux-privs/"
+                    "libcap2/libcap-" version ".tar.xz"))
+              (sha256
+               (base32
+                "048n1gy2p48vl9hkrr9wymfxxcpwj2aslz2bv79nhl4m2lhd9kdf"))))))
+
 (define-public bridge-utils
   (package
     (name "bridge-utils")
-- 
cgit v1.2.3


From ba151b7e1a9cc0baf932b5c5e0c916e54d2e27f4 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 5 May 2020 16:29:57 +0200
Subject: gnu: fakeroot: Fix test failures.

Fixes .
Reported by Maxim Cournoyer .

* gnu/packages/linux.scm (fakeroot)[inputs]: Change from LIBCAP to LIBCAP/NEXT.
[arguments]: Add substitution for tests that use 'ls' to test for block
devices.
---
 gnu/packages/linux.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e2b3d9e6c5..8eaf79d89f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6641,13 +6641,21 @@ the superuser to make device nodes.")
             ;; We don't have an /etc/passwd entry for "root" - use numeric IDs.
             (substitute* "test/compare-tar"
              (("tar -tvf") "tar --numeric-owner -tvf"))
+
+            ;; coreutils 8.32 changed 'ls' to use the statx() syscall instead
+            ;; of lstat().  fakeroot 1.24 does not support the former, so
+            ;; adjust these tests to use 'test -b' instead of 'ls' to test for
+            ;; block device.  See .
+            (substitute* '("test/t.mknod" "test/t.chmod_dev")
+              (("ls -ld? \\$tmp/hda3")
+               "test -b $tmp/hda3 && echo block || echo fail"))
             #t)))))
     (native-inputs
      `(("acl" ,acl)
        ("sharutils" ,sharutils) ; for the tests
        ("xz" ,xz))) ; for the tests
     (inputs
-     `(("libcap" ,libcap)
+     `(("libcap" ,libcap/next)
        ("util-linux" ,util-linux)))
     (synopsis "Provides a fake root environment")
     (description "@command{fakeroot} runs a command in an environment where
-- 
cgit v1.2.3


From 826c2eecbe59daf338e4c19b1e42c725fefeef2e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Tue, 5 May 2020 16:38:29 +0200
Subject: doc: Typographic improvements.

* doc/guix.texi (Networking Services): Use @var, @option, and @command when
appropriate.  Add two spaces after sentences.
---
 doc/guix.texi | 60 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 812d08a8ef..6b5b8bf6f8 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14394,18 +14394,21 @@ Whether to enable password-based authentication.
 @cindex AutoSSH
 @deffn {Scheme Variable} autossh-service-type
 This is the type for the @uref{https://www.harding.motd.ca/autossh,
-AutoSSH} program that runs a copy of @code{ssh} and monitors it,
+AutoSSH} program that runs a copy of @command{ssh} and monitors it,
 restarting it as necessary should it die or stop passing traffic.
-AutoSSH can be run manually from the commandline by passing arguments to
-the binary @code{autossh} from the package @code{autossh}, but it can
-also be run as a guix service. This latter usecase is documented here.
+AutoSSH can be run manually from the command-line by passing arguments
+to the binary @command{autossh} from the package @code{autossh}, but it
+can also be run as a Guix service.  This latter use case is documented
+here.
 
-AutoSSH can be used to forward local traffic to a remote machine using an SSH tunnel,
-and it respects the @file{~/.ssh/config} of the user it is run as.
+AutoSSH can be used to forward local traffic to a remote machine using
+an SSH tunnel, and it respects the @file{~/.ssh/config} of the user it
+is run as.
 
-For example, to specify a service running autossh as the user @code{pino}
-and forwarding all local connections to port @code{8081} to @code{remote:8081}
-using an SSH tunnel, add this call to the operating system's @code{services} field:
+For example, to specify a service running autossh as the user
+@code{pino} and forwarding all local connections to port @code{8081} to
+@code{remote:8081} using an SSH tunnel, add this call to the operating
+system's @code{services} field:
 
 @lisp
 (service autossh-service-type
@@ -14428,18 +14431,19 @@ This assumes that the specified user exists.
 Specifies the connection poll time in seconds.
 
 @item @code{first-poll} (default @code{#f})
-Specifies how long autossh waits before the first connection test in seconds.
-After this first test, polling is resumed at the pace defined in @code{poll}.
-When set to @code{#f}, the first poll is not treated specially and
-will also use the connection poll specified in @code{poll}
+Specifies how many seconds AutoSSH waits before the first connection
+test.  After this first test, polling is resumed at the pace defined in
+@code{poll}.  When set to @code{#f}, the first poll is not treated
+specially and will also use the connection poll specified in
+@code{poll}.
 
 @item @code{gate-time} (default @code{30})
-Specifies (in seconds) how long an SSH connection must be active
-before it is considered successful.
+Specifies how many seconds an SSH connection must be active before it is
+considered successful.
 
 @item @code{log-level} (default @code{1})
-The log level, corresponding to the levels used by syslog
-(so @code{0} is the most silent while @code{7} is the chattiest.)
+The log level, corresponding to the levels used by syslog---so @code{0}
+is the most silent while @code{7} is the chattiest.
 
 @item @code{max-start} (default @code{#f})
 The maximum number of times SSH may be (re)started before AutoSSH exits.
@@ -14449,18 +14453,20 @@ When set to @code{#f}, no maximum is configured and AutoSSH may restart indefini
 The message to append to the echo message sent when testing connections.
 
 @item @code{port} (default @code{"0"})
-The ports used for monitoring the connection. When set to @code{"0"},
-monitoring is disabled. When set to @code{"n"} where @code{n} is a positive integer,
-ports @code{n} and @code{n+1} are used for monitoring the connection, such that
-port @code{n} is the base monitoring port and @code{n+1} is the echo port.
-When set to @code{"n:m"} where @code{n} and @code{m} are positive integers,
-the ports @code{n} and @code{n+1} are used for monitoring the connection, such
-that port @code{n} is the base monitoring port and @code{m} is the echo port.
+The ports used for monitoring the connection.  When set to @code{"0"},
+monitoring is disabled.  When set to @code{"@var{n}"} where @var{n} is
+a positive integer, ports @var{n} and @var{n}+1 are used for
+monitoring the connection, such that port @var{n} is the base
+monitoring port and @code{n+1} is the echo port.  When set to
+@code{"@var{n}:@var{m}"} where @var{n} and @var{m} are positive
+integers, the ports @var{n} and @var{n}+1 are used for monitoring the
+connection, such that port @var{n} is the base monitoring port and
+@var{m} is the echo port.
 
 @item @code{ssh-options} (default @code{'()})
-The list of commandline arguments to pass to ssh when it is run.
-Options @code{-f} and @code{-M ....} are reserved for AutoSSH
-and may cause undefined behaviour.
+The list of command-line arguments to pass to @command{ssh} when it is
+run.  Options @option{-f} and @option{-M} are reserved for AutoSSH and
+may cause undefined behaviour.
 
 @end table
 @end deftp
-- 
cgit v1.2.3


From f412fcbc447013454e28025ad847cf06dd2026f3 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Tue, 5 May 2020 16:43:18 +0200
Subject: gnu: emacs-modus-operandi-theme: Update to 0.8.1.

* gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme): Update to 0.8.1.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index abb4020e0c..9c4314c05b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -21136,14 +21136,14 @@ Emacs that integrate with major modes like Org-mode.")
 (define-public emacs-modus-operandi-theme
   (package
     (name "emacs-modus-operandi-theme")
-    (version "0.8.0")
+    (version "0.8.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://elpa.gnu.org/packages/"
                            "modus-operandi-theme-" version ".el"))
        (sha256
-        (base32 "09lw556jphrxrmwxkwzfgd4r7ylz99m8awxka4sfj5sa8fbjb3g8"))))
+        (base32 "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb"))))
     (build-system emacs-build-system)
     (home-page "https://gitlab.com/protesilaos/modus-themes")
     (synopsis "Accessible light theme (WCAG AAA)")
-- 
cgit v1.2.3


From 529989265722662cc878fd748592a8d4eb4ff5b6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Tue, 5 May 2020 16:43:28 +0200
Subject: gnu: emacs-modus-vivendi-theme: Update to 0.8.1.

* gnu/packages/emacs-xyz.scm (emacs-modus-vivendi-theme): Update to 0.8.1.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9c4314c05b..d851583af5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -21157,14 +21157,14 @@ standard.  This is the highest standard of its kind.")
 (define-public emacs-modus-vivendi-theme
   (package
     (name "emacs-modus-vivendi-theme")
-    (version "0.8.0")
+    (version "0.8.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://elpa.gnu.org/packages/"
                            "modus-vivendi-theme-" version ".el"))
        (sha256
-        (base32 "0hwkzbx7a9scdr589sb7hw90lsm8yxcn3y5xr3bpyxf8rkr2zl4c"))))
+        (base32 "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1"))))
     (build-system emacs-build-system)
     (home-page "https://gitlab.com/protesilaos/modus-themes")
     (synopsis "Accessible dark theme (WCAG AAA)")
-- 
cgit v1.2.3


From ec5c22c2c6d0b0894e1baaa6de439b9c5ccec73a Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Tue, 5 May 2020 17:27:11 +0200
Subject: gnu: sbcl-cl-webkit: Update to 20200504.

* gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 20200504.
---
 gnu/packages/lisp-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index b032346a30..47cf04b2c1 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -3143,10 +3143,10 @@ is a library for creating graphical user interfaces.")
   (sbcl-package->cl-source-package sbcl-cl-cffi-gtk))
 
 (define-public sbcl-cl-webkit
-  (let ((commit "d97115ca601838dfa60ea7afbb88641d7a526dba"))
+  (let ((commit "f93cb9697e8813068795fe4dc39ac950d814102d"))
     (package
       (name "sbcl-cl-webkit")
-      (version (git-version "2.4" "2" commit))
+      (version (git-version "2.4" "3" commit))
       (source
        (origin
          (method git-fetch)
@@ -3156,7 +3156,7 @@ is a library for creating graphical user interfaces.")
          (file-name (git-file-name "cl-webkit" version))
          (sha256
           (base32
-           "0sdb2l2h5xv5c1m2mfq31i9yl6zjf512fvwwzlvk9nvisyhc4xi3"))))
+           "1sjcw08kjpd5h83sms7zcq2nymddjygk9hm2rpgzrl524an9ziwc"))))
       (build-system asdf-build-system/sbcl)
       (inputs
        `(("cffi" ,sbcl-cffi)
-- 
cgit v1.2.3


From 1ce65f5cff1c7d3b65f51b9c1e42020295129b9f Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 5 May 2020 16:46:10 +0200
Subject: gnu: SOCI: Build with MariaDB instead of MySQL.

* gnu/packages/databases.scm (soci)[inputs]: Remove MYSQL.  Add MARIADB:DEV
and MARIADB:LIB.
---
 gnu/packages/databases.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 23b8f14c54..fb12ca7f7e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3458,7 +3458,8 @@ The drivers officially supported by @code{libdbi} are:
        ("sqlite" ,sqlite)
        ("odbc" ,unixodbc)
        ("boost" ,boost)
-       ("mysql" ,mysql)))
+       ("mariadb:dev" ,mariadb "dev")
+       ("mariadb:lib" ,mariadb "lib")))
     (arguments
      `(#:tests? #f ; Tests may require running database management systems.
        #:phases
-- 
cgit v1.2.3


From 85a906dc58bffa588762d91502db07eb1bd74889 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 5 May 2020 16:46:46 +0200
Subject: gnu: SOCI: Return #t from all phases.

* gnu/packages/databases.scm (soci)[arguments]: Return #t from phase.
---
 gnu/packages/databases.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index fb12ca7f7e..c78d32efee 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3467,7 +3467,8 @@ The drivers officially supported by @code{libdbi} are:
          (add-after 'unpack 'fix-lib-path
            (lambda _
              (substitute* "CMakeLists.txt"
-               (("set\\(SOCI_LIBDIR \"lib64\"\\)") "")))))))
+               (("set\\(SOCI_LIBDIR \"lib64\"\\)") ""))
+             #t)))))
     (synopsis "C++ Database Access Library")
     (description
      "SOCI is an abstraction layer for several database backends, including
-- 
cgit v1.2.3


From 6a25036fb288e1a08c0261632d18766182670224 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Note 
Date: Fri, 1 May 2020 14:15:07 +0000
Subject: gnu: Add gccmakedep.

* gnu/packages/xorg.scm (gccmakedep): New variable.

Signed-off-by: Marius Bakke 
---
 gnu/packages/xorg.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 95479f18da..289a823b06 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -23,6 +23,7 @@
 ;;; Copyright © 2020 Leo Prikler 
 ;;; Copyright © 2020 Florian Pelz 
 ;;; Copyright © 2020 Maxim Cournoyer 
+;;; Copyright © 2020 Jean-Baptiste Note 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6624,3 +6625,24 @@ Thai).")
 a configuration file reusable by xcursorgen.")
     (home-page "https://github.com/eworm-de/xcur2png")
     (license license:gpl3+)))
+
+(define-public gccmakedep
+  (package
+    (name "gccmakedep")
+    (version "1.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://xorg/individual/util/gccmakedep-"
+                           version ".tar.bz2"))
+       (sha256
+        (base32 "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"))))
+    (build-system gnu-build-system)
+    (synopsis "Create dependencies in makefiles using 'gcc -M'")
+    (description
+     "@command{gccmakedep} is a deprecated program which calls @code{gcc -M}
+to output Makefile rules describing the dependencies of each source file, so
+that Make knows which object files must be recompiled when a dependency has
+changed.")
+    (home-page "https://gitlab.freedesktop.org/xorg/util/gccmakedep")
+    (license license:x11)))
-- 
cgit v1.2.3


From 51ac5ce4b509fac151e646deaff41a527270a74f Mon Sep 17 00:00:00 2001
From: Tim Howes via Guix-patches via 
Date: Sat, 2 May 2020 16:54:35 -0700
Subject: gnu: emacs-ess: Update to 18.10.2.

* gnu/packages/statistics.scm (emacs-ess): Update to 18.10.2.
[source]: Use git-fetch and git-file-name.  Fix snippets for removing
julia-mode and removing extra documentation formats.  Add snippets for
installing elisp files and stopping installation of info directory.
Remove snippet for old failing test.  Add snippet for new failing test.
[arguments]: Remove extra "/".
[native-inputs]: Add r-roxygen2.

Signed-off-by: Marius Bakke 
---
 gnu/packages/statistics.scm | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 00b648a54c..0ead92dedf 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Alex Kost 
 ;;; Copyright © 2018 Alex Branham 
+;;; Copyright © 2020 Tim Howes 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5786,42 +5787,51 @@ Java package that provides routines for various statistical distributions.")
 (define-public emacs-ess
   (package
     (name "emacs-ess")
-    (version "17.11")
+    (version "18.10.2")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/emacs-ess/ESS/archive/v"
-                                  version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/emacs-ess/ESS")
+                    (commit (string-append "v" version))))
               (sha256
                (base32
-                "0cbilbsiwvcyf6d5y24mymp57m3ana5dkzab3knfs83w4a3a4c5c"))
-              (file-name (string-append name "-" version ".tar.gz"))
+                "1yq41l2bicwjrc0b731iic20cpcnz6ppigri1jn621qv2qv22vy3"))
+              (file-name (git-file-name name version))
               (modules '((guix build utils)))
               (snippet
                '(begin
                   ;; Stop ESS from trying to bundle an external julia-mode.el.
                   (substitute* "lisp/Makefile"
-                    (("^\tjulia-mode.elc\\\\\n") "")
-                    (("^dist: all julia-mode.el")
-                     "dist: all"))
-                  ;; No need to build docs in so many formats.  Also, skipping
-                  ;; pdf lets us not pull in texlive.
+                    (("^ess-julia.elc: julia-mode.elc") "")
+                    (("^all: julia-mode.el")
+                     "all:"))
+                  ;; Include *.el files in install target.
+                  (substitute* "lisp/Makefile"
+                    (("\t\\$\\(INSTALL) \\$\\(ELC\\) \\$\\(LISPDIR\\)" elc)
+                     (string-append "\t$(INSTALL) $(ELS) ess-autoloads.el "
+                                    "$(LISPDIR)\n" elc)))
+                  ;; Only build docs in info format.
                   (substitute* "doc/Makefile"
-                    (("all  : info text html pdf")
+                    (("all  : info text")
                      "all  : info")
                     (("install: install-info install-other-docs")
                      "install: install-info"))
-                  ;; Test fails upstream
+                  ;; Stop install-info from trying to update the info directory.
+                  (substitute* "doc/Makefile"
+                    ((".*\\$\\(INFODIR\\)/dir.*") ""))
+                  ;; Fix roxygen preview test.
                   (substitute* "test/ess-r-tests.el"
-                    (("ert-deftest ess-r-namespaced-eval-no-srcref-in-errors ()")
-                     "ert-deftest ess-r-namespaced-eval-no-srcref-in-errors () :expected-result :failed"))
+                               (("Add together two numbers.\n")
+                                "Add together two numbers. ")
+                               (("##' add\\(10, 1\\)") "add(10, 1)"))
                   #t))))
     (build-system gnu-build-system)
     (arguments
      (let ((base-directory "/share/emacs/site-lisp"))
        `(#:make-flags (list (string-append "PREFIX=" %output)
-                            (string-append "ETCDIR=" %output "/"
+                            (string-append "ETCDIR=" %output
                                            ,base-directory "/etc")
-                            (string-append "LISPDIR=" %output "/"
+                            (string-append "LISPDIR=" %output
                                            ,base-directory))
          #:phases
          (modify-phases %standard-phases
@@ -5840,6 +5850,7 @@ Java package that provides routines for various statistical distributions.")
        ("r-minimal" ,r-minimal)))
     (native-inputs
      `(("perl" ,perl)
+       ("r-roxygen2" ,r-roxygen2)
        ("texinfo" ,texinfo)))
     (propagated-inputs
      `(("emacs-julia-mode" ,emacs-julia-mode)))
-- 
cgit v1.2.3


From 8b27771b77f024e47b0e12a4da54e4b0dd9fc830 Mon Sep 17 00:00:00 2001
From: Josh Marshall 
Date: Sun, 3 May 2020 18:22:23 -0400
Subject: gnu: Add python-pytest-asyncio.

* gnu/packages/check.scm (python-pytest-asyncio): New public variable.

Signed-off-by: Marius Bakke 
---
 gnu/packages/check.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 427607e6de..213363f645 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -32,6 +32,7 @@
 ;;; Copyright © 2019 Chris Marusich 
 ;;; Copyright © 2020 Lars-Dominik Braun 
 ;;; Copyright © 2020 Brice Waegeneire 
+;;; Copyright © 2020 Josh Marshall 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1408,6 +1409,30 @@ executed.")
 (define-public python2-coverage
   (package-with-python2 python-coverage))
 
+(define-public python-pytest-asyncio
+  (package
+    (name "python-pytest-asyncio")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-asyncio" version))
+       (sha256
+        (base32 "1bysy4nii13bm7h345wxf8fxcjhab7l374pqdv7vwv3izl053b4z"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-coverage" ,python-coverage)
+       ("python-async-generator" ,python-async-generator)
+       ("python-hypothesis" ,python-hypothesis)
+       ("python-pytest" ,python-pytest)))
+    (home-page "https://github.com/pytest-dev/pytest-asyncio")
+    (synopsis "Pytest support for asyncio")
+    (description "Python asyncio code is usually written in the form of
+coroutines, which makes it slightly more difficult to test using normal
+testing tools.  @code{pytest-asyncio} provides useful fixtures and markers
+to make testing async code easier.")
+    (license license:asl2.0)))
+
 (define-public python-cov-core
   (package
     (name "python-cov-core")
-- 
cgit v1.2.3


From ec4fea69df8969ec61fcb554255a0a7f02421c74 Mon Sep 17 00:00:00 2001
From: Giacomo Leidi 
Date: Mon, 4 May 2020 16:58:24 +0200
Subject: services: For "sddm" pam service, include "limits.conf".

* gnu/services/base.scm (pam-limits-service-type): For "sddm" pam
service, include "limits.conf".

Signed-off-by: Marius Bakke 
---
 gnu/services/base.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 0f119cc2f9..a031ccc04b 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1379,7 +1379,7 @@ information on the configuration file syntax."
                               (module "pam_limits.so")
                               (arguments '("conf=/etc/security/limits.conf")))))
              (if (member (pam-service-name pam)
-                         '("login" "su" "slim" "gdm-password"))
+                         '("login" "su" "slim" "gdm-password" "sddm"))
                  (pam-service
                   (inherit pam)
                   (session (cons pam-limits
-- 
cgit v1.2.3


From 751d1f01e4f0607d41e4c859d944753b18466652 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Note 
Date: Mon, 4 May 2020 20:01:10 +0000
Subject: doc: cookbook: Fix sbcl-ttf-fonts package name.

* doc/guix-cookbook.texi (StumpWM): Adjust sbcl-ttf-fonts package name.

Signed-off-by: Marius Bakke 
---
 doc/guix-cookbook.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi
index f58d18d47c..2a605276e6 100644
--- a/doc/guix-cookbook.texi
+++ b/doc/guix-cookbook.texi
@@ -1594,7 +1594,7 @@ An example configuration can look like this:
 @cindex stumpwm fonts
 By default StumpWM uses X11 fonts, which could be small or pixelated on
 your system.  You could fix this by installing StumpWM contrib Lisp
-module @code{sbcl-stumpwm-ttf-fonts}, adding it to Guix system packages:
+module @code{sbcl-ttf-fonts}, adding it to Guix system packages:
 
 @lisp
 (use-modules (gnu))
@@ -1603,7 +1603,7 @@ module @code{sbcl-stumpwm-ttf-fonts}, adding it to Guix system packages:
 (operating-system
   ;; …
   (packages (append (list sbcl stumpwm `(,stumpwm "lib"))
-                    sbcl-stumpwm-ttf-fonts font-dejavu %base-packages)))
+                    sbcl-ttf-fonts font-dejavu %base-packages)))
 @end lisp
 
 Then you need to add the following code to a StumpWM configuration file
-- 
cgit v1.2.3


From 45c137e30f3e8aa27fac61e0736028906a80028c Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 5 May 2020 17:21:17 +0200
Subject: gnu: hyperledger-iroha: Build with the latest Boost.

* gnu/packages/hyperledger.scm (hyperledger-iroha)[inputs]: Change from
BOOST-1.69.0 to BOOST.
---
 gnu/packages/hyperledger.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm
index 86eb86d3b5..c1b8215584 100644
--- a/gnu/packages/hyperledger.scm
+++ b/gnu/packages/hyperledger.scm
@@ -188,7 +188,7 @@ link-time.  New implementations can be added as well.")
        ("rxcpp" ,rxcpp)
        ("spdlog" ,spdlog)))
     (inputs
-     `(("boost" ,boost-1.69)
+     `(("boost" ,boost)
        ("gflags" ,gflags)
        ("grpc" ,grpc-1.16.1)
        ("hyperledger-iroha-ed25519" ,hyperledger-iroha-ed25519)
-- 
cgit v1.2.3


From 86f5decd2066889bf2e60df388d6c812aede0917 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Tue, 5 May 2020 12:13:43 +0200
Subject: syscalls: 'define-c-struct' supports cross-compilation.

Reported by Jan (janneke) Nieuwenhuizen .

Before that, we'd always use the 'sizeof' and 'alignof' value obtained
from the host at macro-expansion time.

* guix/build/syscalls.scm (sizeof*, alignof*): When the target word size
differs from the host word size, emit a call to 'sizeof'/'alignof'.
---
 guix/build/syscalls.scm | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 73b439fb7d..00d8ceb480 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -23,6 +23,7 @@
 
 (define-module (guix build syscalls)
   #:use-module (system foreign)
+  #:use-module (system base target)
   #:use-module (rnrs bytevectors)
   #:autoload   (ice-9 binary-ports) (get-bytevector-n)
   #:use-module (srfi srfi-1)
@@ -194,9 +195,14 @@
      (* (sizeof* type) n))
     ((_ type)
      (let-syntax ((v (lambda (s)
-                       (let ((val (sizeof type)))
-                         (syntax-case s ()
-                           (_ val))))))
+                       ;; When compiling natively, call 'sizeof' at expansion
+                       ;; time; otherwise, emit code to call it at run time.
+                       (syntax-case s ()
+                         (_
+                          (if (= (target-word-size)
+                                 (with-target %host-type target-word-size))
+                              (sizeof type)
+                              #'(sizeof type)))))))
        v))))
 
 (define-syntax alignof*
@@ -208,9 +214,14 @@
      (alignof* type))
     ((_ type)
      (let-syntax ((v (lambda (s)
-                       (let ((val (alignof type)))
-                         (syntax-case s ()
-                           (_ val))))))
+                       ;; When compiling natively, call 'sizeof' at expansion
+                       ;; time; otherwise, emit code to call it at run time.
+                       (syntax-case s ()
+                         (_
+                          (if (= (target-word-size)
+                                 (with-target %host-type target-word-size))
+                              (alignof type)
+                              #'(alignof type)))))))
        v))))
 
 (define-syntax align                             ;as found in (system foreign)
-- 
cgit v1.2.3


From 0701274446bbd39b053a0c65947fd7f1319f7bf6 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Tue, 5 May 2020 23:29:14 +0200
Subject: nls: Update.

---
 po/doc/guix-manual.ru.po | 18748 +++++++++++++++++++++++----------------------
 1 file changed, 9751 insertions(+), 8997 deletions(-)

diff --git a/po/doc/guix-manual.ru.po b/po/doc/guix-manual.ru.po
index 027476aa59..04174f6909 100644
--- a/po/doc/guix-manual.ru.po
+++ b/po/doc/guix-manual.ru.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: guix-manual 1.1.0-pre1\n"
+"Project-Id-Version: guix-manual 1.1.0-pre2\n"
 "Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2020-02-12 00:12+0100\n"
-"PO-Revision-Date: 2020-04-09 12:55+0300\n"
+"POT-Creation-Date: 2020-04-09 18:27+0200\n"
+"PO-Revision-Date: 2020-04-24 10:22+0300\n"
 "Last-Translator: Pavlo Marianov \n"
 "Language-Team: Russian \n"
 "Language: ru\n"
@@ -20,11 +20,11 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 2.2.3\n"
 
-#. #-#-#-#-#  contributing.pot (guix 1.1.0-pre1)  #-#-#-#-#
+#. #-#-#-#-#  contributing.pot (guix 1.1.0-pre2)  #-#-#-#-#
 #. type: chapter
-#. #-#-#-#-#  guix.pot (guix 1.1.0-pre1)  #-#-#-#-#
+#. #-#-#-#-#  guix.pot (guix 1.1.0-pre2)  #-#-#-#-#
 #. type: menuentry
-#: doc/contributing.texi:1 doc/contributing.texi:2 doc/guix.texi:151
+#: doc/contributing.texi:1 doc/contributing.texi:2 doc/guix.texi:155
 #, no-wrap
 msgid "Contributing"
 msgstr "Содействие"
@@ -48,7 +48,9 @@ msgstr "соглашение разработчика"
 
 #. type: Plain text
 #: doc/contributing.texi:17
-msgid "We want to provide a warm, friendly, and harassment-free environment, so that anyone can contribute to the best of their abilities.  To this end our project uses a ``Contributor Covenant'', which was adapted from @url{http://contributor-covenant.org/}.  You can find a local version in the @file{CODE-OF-CONDUCT} file in the source tree."
+#, fuzzy
+#| msgid "We want to provide a warm, friendly, and harassment-free environment, so that anyone can contribute to the best of their abilities.  To this end our project uses a ``Contributor Covenant'', which was adapted from @url{http://contributor-covenant.org/}.  You can find a local version in the @file{CODE-OF-CONDUCT} file in the source tree."
+msgid "We want to provide a warm, friendly, and harassment-free environment, so that anyone can contribute to the best of their abilities.  To this end our project uses a ``Contributor Covenant'', which was adapted from @url{https://contributor-covenant.org/}.  You can find a local version in the @file{CODE-OF-CONDUCT} file in the source tree."
 msgstr "Мы хотим предоставить ламповое окружение, которое не напрягает, так чтобы каждый мог внести вклад, занимаясь тем, что хорошо получается. Для этого наш проект использует \"Кодекс поведения участника\", наследованный из @url{http://contributor-covenant.org/}. Локальную версию документа можно найти в файле @file{CODE-OF-CONDUCT} в дереве исходников."
 
 #. type: Plain text
@@ -92,8 +94,8 @@ msgid "The right tools."
 msgstr "Правильные инструменты."
 
 #. type: section
-#: doc/contributing.texi:31 doc/contributing.texi:278
-#: doc/contributing.texi:279
+#: doc/contributing.texi:31 doc/contributing.texi:305
+#: doc/contributing.texi:306
 #, no-wrap
 msgid "Packaging Guidelines"
 msgstr "Принципы опакечивания"
@@ -104,8 +106,8 @@ msgid "Growing the distribution."
 msgstr "Разрастание дистрибутива."
 
 #. type: section
-#: doc/contributing.texi:31 doc/contributing.texi:726
-#: doc/contributing.texi:727
+#: doc/contributing.texi:31 doc/contributing.texi:789
+#: doc/contributing.texi:790
 #, no-wrap
 msgid "Coding Style"
 msgstr "Стиль кодирования"
@@ -116,8 +118,8 @@ msgid "Hygiene of the contributor."
 msgstr "Гигиена участника."
 
 #. type: section
-#: doc/contributing.texi:31 doc/contributing.texi:824
-#: doc/contributing.texi:825
+#: doc/contributing.texi:31 doc/contributing.texi:887
+#: doc/contributing.texi:888
 #, no-wrap
 msgid "Submitting Patches"
 msgstr "Отправка исправлений"
@@ -128,8 +130,8 @@ msgid "Share your work."
 msgstr "Поделитесь своей работой."
 
 #. type: section
-#: doc/contributing.texi:31 doc/contributing.texi:1048
-#: doc/contributing.texi:1049
+#: doc/contributing.texi:31 doc/contributing.texi:1111
+#: doc/contributing.texi:1112
 #, no-wrap
 msgid "Tracking Bugs and Patches"
 msgstr "Отслеживание ошибок и патчей"
@@ -140,8 +142,8 @@ msgid "Using Debbugs."
 msgstr "Использование Debbugs"
 
 #. type: section
-#: doc/contributing.texi:31 doc/contributing.texi:1097
-#: doc/contributing.texi:1098
+#: doc/contributing.texi:31 doc/contributing.texi:1160
+#: doc/contributing.texi:1161
 #, no-wrap
 msgid "Commit Access"
 msgstr "Доступ к коммитам"
@@ -205,12 +207,12 @@ msgstr ""
 #. type: Plain text
 #: doc/contributing.texi:69
 msgid "... meaning that changes to this file are all signed with key @code{3CE464558A84FDC69DB40CFB090B11993D9AEBB5} (you may need to fetch this key from a key server, if you have not done it yet)."
-msgstr ""
+msgstr "... это означает, что все изменения в этом файле подписаны ключом @code{3CE464558A84FDC69DB40CFB090B11993D9AEBB5} (вам может потребоваться получить этот ключ с сервера ключей, если вы еще этого не сделали)."
 
 #. type: Plain text
 #: doc/contributing.texi:72
 msgid "From there on, you can authenticate all the commits included in your checkout by running:"
-msgstr ""
+msgstr "После этого вы можете аутентифицировать все проверенные коммиты, запустив:"
 
 #. type: example
 #: doc/contributing.texi:75
@@ -224,15 +226,15 @@ msgid "The first run takes a couple of minutes, but subsequent runs are faster."
 msgstr "Первый запуск занимает пару минут, но последующие запускаются быстрее."
 
 #. type: quotation
-#: doc/contributing.texi:79 doc/contributing.texi:1144 doc/guix.texi:492
-#: doc/guix.texi:541 doc/guix.texi:1558 doc/guix.texi:1823 doc/guix.texi:2034
-#: doc/guix.texi:2243 doc/guix.texi:2438 doc/guix.texi:4244 doc/guix.texi:4460
-#: doc/guix.texi:4761 doc/guix.texi:5002 doc/guix.texi:5123 doc/guix.texi:5175
-#: doc/guix.texi:6766 doc/guix.texi:6834 doc/guix.texi:8543 doc/guix.texi:8555
-#: doc/guix.texi:10609 doc/guix.texi:11155 doc/guix.texi:11707
-#: doc/guix.texi:14407 doc/guix.texi:20844 doc/guix.texi:26096
-#: doc/guix.texi:26307 doc/guix.texi:26466 doc/guix.texi:26587
-#: doc/guix.texi:26769
+#: doc/contributing.texi:79 doc/contributing.texi:1207 doc/guix.texi:496
+#: doc/guix.texi:545 doc/guix.texi:1562 doc/guix.texi:1827 doc/guix.texi:2038
+#: doc/guix.texi:2259 doc/guix.texi:2454 doc/guix.texi:4265 doc/guix.texi:4481
+#: doc/guix.texi:4782 doc/guix.texi:5012 doc/guix.texi:5133 doc/guix.texi:5185
+#: doc/guix.texi:6839 doc/guix.texi:6909 doc/guix.texi:8642 doc/guix.texi:8654
+#: doc/guix.texi:10708 doc/guix.texi:11267 doc/guix.texi:11819
+#: doc/guix.texi:14564 doc/guix.texi:21036 doc/guix.texi:26359
+#: doc/guix.texi:26570 doc/guix.texi:26729 doc/guix.texi:26850
+#: doc/guix.texi:27032
 #, no-wrap
 msgid "Note"
 msgstr "Примечание"
@@ -266,38 +268,38 @@ msgstr "Если вам Guix не удаётся использовать при
 #. type: item
 #: doc/contributing.texi:101
 #, no-wrap
-msgid "@url{http://gnu.org/software/autoconf/, GNU Autoconf};"
-msgstr "@url{http://gnu.org/software/autoconf/, GNU Autoconf};"
+msgid "@url{https://gnu.org/software/autoconf/, GNU Autoconf};"
+msgstr "@url{https://gnu.org/software/autoconf/, GNU Autoconf};"
 
 #. type: item
 #: doc/contributing.texi:102
 #, no-wrap
-msgid "@url{http://gnu.org/software/automake/, GNU Automake};"
-msgstr "@url{http://gnu.org/software/automake/, GNU Automake};"
+msgid "@url{https://gnu.org/software/automake/, GNU Automake};"
+msgstr "@url{https://gnu.org/software/automake/, GNU Automake};"
 
 #. type: item
 #: doc/contributing.texi:103
 #, no-wrap
-msgid "@url{http://gnu.org/software/gettext/, GNU Gettext};"
-msgstr "@url{http://gnu.org/software/gettext/, GNU Gettext};"
+msgid "@url{https://gnu.org/software/gettext/, GNU Gettext};"
+msgstr "@url{https://gnu.org/software/gettext/, GNU Gettext};"
 
 #. type: item
 #: doc/contributing.texi:104
 #, no-wrap
-msgid "@url{http://gnu.org/software/texinfo/, GNU Texinfo};"
-msgstr "@url{http://gnu.org/software/texinfo/, GNU Texinfo};"
+msgid "@url{https://gnu.org/software/texinfo/, GNU Texinfo};"
+msgstr "@url{https://gnu.org/software/texinfo/, GNU Texinfo};"
 
 #. type: item
 #: doc/contributing.texi:105
 #, no-wrap
-msgid "@url{http://www.graphviz.org/, Graphviz};"
-msgstr "@url{http://www.graphviz.org/, Graphviz};"
+msgid "@url{https://www.graphviz.org/, Graphviz};"
+msgstr "@url{https://www.graphviz.org/, Graphviz};"
 
 #. type: item
 #: doc/contributing.texi:106
 #, no-wrap
-msgid "@url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}."
-msgstr "@url{http://www.gnu.org/software/help2man/, GNU Help2man (необязательно)}."
+msgid "@url{https://www.gnu.org/software/help2man/, GNU Help2man (optional)}."
+msgstr "@url{https://www.gnu.org/software/help2man/, GNU Help2man (optional)}."
 
 #. type: Plain text
 #: doc/contributing.texi:111
@@ -452,7 +454,9 @@ msgstr "Заметим, что @command{./pre-inst-env guix pull} @emph{не} о
 
 #. type: Plain text
 #: doc/contributing.texi:222
-msgid "The Perfect Setup to hack on Guix is basically the perfect setup used for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference Manual}).  First, you need more than an editor, you need @url{http://www.gnu.org/software/emacs, Emacs}, empowered by the wonderful @url{http://nongnu.org/geiser/, Geiser}.  To set that up, run:"
+#, fuzzy
+#| msgid "The Perfect Setup to hack on Guix is basically the perfect setup used for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference Manual}).  First, you need more than an editor, you need @url{http://www.gnu.org/software/emacs, Emacs}, empowered by the wonderful @url{http://nongnu.org/geiser/, Geiser}.  To set that up, run:"
+msgid "The Perfect Setup to hack on Guix is basically the perfect setup used for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference Manual}).  First, you need more than an editor, you need @url{https://www.gnu.org/software/emacs, Emacs}, empowered by the wonderful @url{https://nongnu.org/geiser/, Geiser}.  To set that up, run:"
 msgstr "Совершенная установка для программирования Guix --- это лучший способ разработки Guix (@pxref{Using Guile in Emacs,,, guile, Guile Reference Manual}). Во-первых, здесь нужен мощный текстовый редактор, нужен @url{http://www.gnu.org/software/emacs, Emacs}, дополненный замечательным @url{http://nongnu.org/geiser/, Geiser}. Чтобы установить это, введите:"
 
 #. type: example
@@ -505,7 +509,9 @@ msgstr "сокращение шаблонов"
 
 #. type: Plain text
 #: doc/contributing.texi:257
-msgid "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."
+#, fuzzy
+#| msgid "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."
+msgid "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{https://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."
 msgstr "Также мы предоставляем шаблоны стандартных сообщений коммитов git и шаблоны определений пакетов в директории @file{etc/snippets}. Эти шаблоны можно использовать с @url{http://joaotavora.github.io/yasnippet/, YASnippet} и вставлять сниппеты кода, используя короткие строки-триггеры. Возможно, вы захотите добавить директорию сниппетов в переменную Emacs @var{yas-snippet-dirs}."
 
 #. type: lisp
@@ -531,235 +537,309 @@ msgid "The main snippet for @code{scheme-mode} is triggered by typing @code{pack
 msgstr "Основной код для @code{scheme-mode} вызывается при вводе @code{package...} и кнопки @kbd{TAB}. Этот код также вставляет строку триггера @code{origin...}, который может быть расширен в дальнейшем. Код @code{origin...}, в свою очередь, может вставить строки других триггеров, завершающихся @code{...}, который также может быть расширен в дальнейшем."
 
 #. type: cindex
-#: doc/contributing.texi:281
+#: doc/contributing.texi:277
+#, no-wrap
+msgid "insert or update copyright"
+msgstr "внести или обновить авторские права"
+
+#. type: code{#1}
+#: doc/contributing.texi:278
+#, no-wrap
+msgid "M-x guix-copyright"
+msgstr "M-x guix-copyright"
+
+#. type: code{#1}
+#: doc/contributing.texi:279
+#, no-wrap
+msgid "M-x copyright-update"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:283
+msgid "Additionaly we provide insertion and automatic update of a copyright in @file{etc/copyright.el}.  You may want to set your full name, mail, and load a file."
+msgstr "Кроме того, мы предоставляем автоматическое обновление авторских прав в @file{etc/copyright.el}. Возможно, вы захотите указать свое полное имя, почту и загрузить файл."
+
+#. type: lisp
+#: doc/contributing.texi:289
+#, no-wrap
+msgid ""
+"(setq user-full-name \"Alice Doe\")\n"
+"(setq user-mail-address \"alice@@mail.org\")\n"
+";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
+"(load-file \"~/src/guix/etc/copyright.el\")\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:292
+msgid "To insert a copyright at the current line invoke @code{M-x guix-copyright}."
+msgstr "Чтобы ввести авторское право в текущей строке, вызовите @code{M-x guix-copyright}."
+
+#. type: Plain text
+#: doc/contributing.texi:294
+msgid "To update a copyright you need to specify a @code{copyright-names-regexp}."
+msgstr "Для обновления авторских прав необходимо указать @code{copyright-names-regexp}."
+
+#. type: lisp
+#: doc/contributing.texi:298
+#, no-wrap
+msgid ""
+"(setq copyright-names-regexp\n"
+"      (format \"%s <%s>\" user-full-name user-mail-address))\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:304
+msgid "You can check if your copyright is up to date by evaluating @code{M-x copyright-update}.  If you want to do it automatically after each buffer save then add @code{(add-hook 'after-save-hook 'copyright-update)} in Emacs."
+msgstr "Вы можете проверить актуальность своих авторских прав, вызвав @code{M-x copyright-update}. Если вы хотите делать это автоматически после каждого сохранения в буфер, то добавьте @code{(add-hook 'after-save-hook 'copyright-update)} в Emacs."
+
+#. type: cindex
+#: doc/contributing.texi:308
 #, no-wrap
 msgid "packages, creating"
 msgstr "создание, пакетов"
 
 #. type: Plain text
-#: doc/contributing.texi:285
+#: doc/contributing.texi:312
 msgid "The GNU distribution is nascent and may well lack some of your favorite packages.  This section describes how you can help make the distribution grow."
 msgstr "Дистрибутив GNU - в процессе возникновения и может не содержать ваши любимые пакеты. Этот раздел описывает как можно помочь с развитием дистрибутива."
 
 #. type: Plain text
-#: doc/contributing.texi:293
+#: doc/contributing.texi:320
 msgid "Free software packages are usually distributed in the form of @dfn{source code tarballs}---typically @file{tar.gz} files that contain all the source files.  Adding a package to the distribution means essentially two things: adding a @dfn{recipe} that describes how to build the package, including a list of other packages required to build it, and adding @dfn{package metadata} along with that recipe, such as a description and licensing information."
 msgstr "Пакеты свободного программного обеспечения обычно распространяются в виде @dfn{архивов исходного кода} (файлы @file{tar.gz}), которые содержат все исходные файлы. Добавить пакет в дистрибутив означает, по существу, две вещи: добавление @dfn{рецепта}, в котором обозначено, как собирать пакет, включая список других пакетов, необходимых для сборки данного, а также добавление @dfn{метаданных пакета} вместе с рецептом, как например, описание информации о лицензировании."
 
 #. type: Plain text
-#: doc/contributing.texi:302
+#: doc/contributing.texi:329
 msgid "In Guix all this information is embodied in @dfn{package definitions}.  Package definitions provide a high-level view of the package.  They are written using the syntax of the Scheme programming language; in fact, for each package we define a variable bound to the package definition, and export that variable from a module (@pxref{Package Modules}).  However, in-depth Scheme knowledge is @emph{not} a prerequisite for creating packages.  For more information on package definitions, @pxref{Defining Packages}."
 msgstr "В Guix вся эта информация включена в @dfn{определения пакетов}. Определения пакетов представляют собой высокоуровневый обзор пакета. Они написаны с использованием синтаксиса языка программирования Scheme. Для каждого пакета задаётся набор переменных, которые составляют определение пакета, и затем это определение пакета экспортируется из модуля (@pxref{Package Modules}). Однако основательные знания Scheme @emph{not} не обязательны для создания пакетов. Для информации об определении пакетов см. @pxref{Defining Packages}."
 
 #. type: Plain text
-#: doc/contributing.texi:308
+#: doc/contributing.texi:335
 msgid "Once a package definition is in place, stored in a file in the Guix source tree, it can be tested using the @command{guix build} command (@pxref{Invoking guix build}).  For example, assuming the new package is called @code{gnew}, you may run this command from the Guix build tree (@pxref{Running Guix Before It Is Installed}):"
 msgstr "Когда определение пакета создано, сохранено в файле в дереве исходников Guix, оно может быть протестировано командой @command{guix build} (@pxref{Invoking guix build}). Например, допустим, новый пакет называется @code{gnew}, тогда можно запустить эту команду из дерева сборки Guix (@pxref{Running Guix Before It Is Installed}):"
 
 #. type: example
-#: doc/contributing.texi:311
+#: doc/contributing.texi:338
 #, no-wrap
 msgid "./pre-inst-env guix build gnew --keep-failed\n"
 msgstr "./pre-inst-env guix build gnew --keep-failed\n"
 
 #. type: Plain text
-#: doc/contributing.texi:317
+#: doc/contributing.texi:344
 msgid "Using @code{--keep-failed} makes it easier to debug build failures since it provides access to the failed build tree.  Another useful command-line option when debugging is @code{--log-file}, to access the build log."
 msgstr "Использование @code{--keep-failed} помогает при отладке ошибок сборки, так как эта опция предоставляет доступ к дереву неудачных сборок. Другая полезная опция командной строки при отладке - @code{--log-file}, которая даёт доступ к логу сборки."
 
 #. type: Plain text
-#: doc/contributing.texi:322
+#: doc/contributing.texi:349
 msgid "If the package is unknown to the @command{guix} command, it may be that the source file contains a syntax error, or lacks a @code{define-public} clause to export the package variable.  To figure it out, you may load the module from Guile to get more information about the actual error:"
 msgstr "Если пакет не известен команде @command{guix}, это может означать, что файл исходника содержит синтаксическую ошибку или не имеет предложения @code{define-public}, которое экспортирует переменную пакета. Чтобы разобраться, можно загрузить модуль из Guile и получить больше информации о текущей ошибке:"
 
 #. type: example
-#: doc/contributing.texi:325
+#: doc/contributing.texi:352
 #, no-wrap
 msgid "./pre-inst-env guile -c '(use-modules (gnu packages gnew))'\n"
 msgstr "./pre-inst-env guile -c '(use-modules (gnu packages gnew))'\n"
 
 #. type: Plain text
-#: doc/contributing.texi:332
+#: doc/contributing.texi:359
 msgid "Once your package builds correctly, please send us a patch (@pxref{Submitting Patches}).  Well, if you need help, we will be happy to help you too.  Once the patch is committed in the Guix repository, the new package automatically gets built on the supported platforms by @url{@value{SUBSTITUTE-SERVER}, our continuous integration system}."
 msgstr "Если ваш пакет собирается без ошибок, пришлите нам свой патч (@pxref{Submitting Patches}). Если вам нужна помощь, мы будем рады помочь вам со своей стороны. После фиксации патча в репозитории Guix новый пакет будет автоматически собран для всех поддерживаемых платформ нашей @url{@value{SUBSTITUTE-SERVER} CI-системой}."
 
 #. type: cindex
-#: doc/contributing.texi:333
+#: doc/contributing.texi:360
 #, no-wrap
 msgid "substituter"
 msgstr "заменяющий"
 
 #. type: Plain text
-#: doc/contributing.texi:340
+#: doc/contributing.texi:367
 msgid "Users can obtain the new package definition simply by running @command{guix pull} (@pxref{Invoking guix pull}).  When @code{@value{SUBSTITUTE-SERVER}} is done building the package, installing the package automatically downloads binaries from there (@pxref{Substitutes}).  The only place where human intervention is needed is to review and apply the patch."
 msgstr "Пользователи могут получать новые доступные определения пакетов простым запуском @command{guix pull} (@pxref{Invoking guix pull}). Если @code{@value{SUBSTITUTE-SERVER}} выполнил сборку пакета, установка пакета выполнит автоматическое скачивание бинарных файлов оттуда (@pxref{Substitutes}). Единственное место, где нужна активность человека, - обзор и применение патча."
 
 #. type: subsection
-#: doc/contributing.texi:351 doc/contributing.texi:353
-#: doc/contributing.texi:354
+#: doc/contributing.texi:379 doc/contributing.texi:381
+#: doc/contributing.texi:382
 #, no-wrap
 msgid "Software Freedom"
 msgstr "Свобода программного обеспечения"
 
 #. type: menuentry
-#: doc/contributing.texi:351
+#: doc/contributing.texi:379
 msgid "What may go into the distribution."
 msgstr "Что может быть принято в дистрибутив."
 
 #. type: subsection
-#: doc/contributing.texi:351 doc/contributing.texi:381
-#: doc/contributing.texi:382
+#: doc/contributing.texi:379 doc/contributing.texi:409
+#: doc/contributing.texi:410
 #, no-wrap
 msgid "Package Naming"
 msgstr "Как называть пакеты"
 
 #. type: menuentry
-#: doc/contributing.texi:351
+#: doc/contributing.texi:379
 msgid "What's in a name?"
 msgstr "Что может быть в имени?"
 
 #. type: subsection
-#: doc/contributing.texi:351 doc/contributing.texi:406
-#: doc/contributing.texi:407
+#: doc/contributing.texi:379 doc/contributing.texi:434
+#: doc/contributing.texi:435
 #, no-wrap
 msgid "Version Numbers"
 msgstr "Номера версий"
 
 #. type: menuentry
-#: doc/contributing.texi:351
+#: doc/contributing.texi:379
 msgid "When the name is not enough."
 msgstr "Когда имени не достаточно."
 
 #. type: subsection
-#: doc/contributing.texi:351 doc/contributing.texi:497
-#: doc/contributing.texi:498
+#: doc/contributing.texi:379 doc/contributing.texi:525
+#: doc/contributing.texi:526
 #, no-wrap
 msgid "Synopses and Descriptions"
 msgstr "Краткие обзоры и описания"
 
 #. type: menuentry
-#: doc/contributing.texi:351
+#: doc/contributing.texi:379
 msgid "Helping users find the right package."
 msgstr "Помощь пользователю в поиске нужного пакета."
 
 #. type: subsection
-#: doc/contributing.texi:351 doc/contributing.texi:577
-#: doc/contributing.texi:578
+#: doc/contributing.texi:379 doc/contributing.texi:605
+#: doc/contributing.texi:606
 #, no-wrap
 msgid "Python Modules"
 msgstr "Модули Python"
 
 #. type: menuentry
-#: doc/contributing.texi:351
+#: doc/contributing.texi:379
 msgid "A touch of British comedy."
 msgstr "Английский юмор."
 
 #. type: subsection
-#: doc/contributing.texi:351 doc/contributing.texi:652
-#: doc/contributing.texi:653
+#: doc/contributing.texi:379 doc/contributing.texi:681
+#: doc/contributing.texi:682
 #, no-wrap
 msgid "Perl Modules"
 msgstr "Модули Perl"
 
 #. type: menuentry
-#: doc/contributing.texi:351
+#: doc/contributing.texi:379
 msgid "Little pearls."
 msgstr "Жемчужинки."
 
 #. type: subsection
-#: doc/contributing.texi:351 doc/contributing.texi:668
-#: doc/contributing.texi:669
+#: doc/contributing.texi:379 doc/contributing.texi:697
+#: doc/contributing.texi:698
 #, no-wrap
 msgid "Java Packages"
 msgstr "Пакеты Java"
 
 #. type: menuentry
-#: doc/contributing.texi:351
+#: doc/contributing.texi:379
 msgid "Coffee break."
 msgstr "Кофе-брейк."
 
 #. type: subsection
-#: doc/contributing.texi:351 doc/contributing.texi:688
-#: doc/contributing.texi:689
+#: doc/contributing.texi:379 doc/contributing.texi:717
+#: doc/contributing.texi:718
+#, no-wrap
+msgid "Rust Crates"
+msgstr ""
+
+#. type: menuentry
+#: doc/contributing.texi:379
+#, fuzzy
+#| msgid "Hardware Considerations"
+msgid "Beware of oxidation."
+msgstr "По поводу железа"
+
+#. type: subsection
+#: doc/contributing.texi:379 doc/contributing.texi:751
+#: doc/contributing.texi:752
 #, no-wrap
 msgid "Fonts"
 msgstr "Шрифты"
 
 #. type: menuentry
-#: doc/contributing.texi:351
+#: doc/contributing.texi:379
 msgid "Fond of fonts."
 msgstr "Любителям шрифтов."
 
 #. type: cindex
-#: doc/contributing.texi:357
+#: doc/contributing.texi:385
 #, no-wrap
 msgid "free software"
 msgstr "свободное программное обеспечение"
 
 #. type: Plain text
-#: doc/contributing.texi:365
-msgid "The GNU operating system has been developed so that users can have freedom in their computing.  GNU is @dfn{free software}, meaning that users have the @url{http://www.gnu.org/philosophy/free-sw.html,four essential freedoms}: to run the program, to study and change the program in source code form, to redistribute exact copies, and to distribute modified versions.  Packages found in the GNU distribution provide only software that conveys these four freedoms."
+#: doc/contributing.texi:393
+#, fuzzy
+#| msgid "The GNU operating system has been developed so that users can have freedom in their computing.  GNU is @dfn{free software}, meaning that users have the @url{http://www.gnu.org/philosophy/free-sw.html,four essential freedoms}: to run the program, to study and change the program in source code form, to redistribute exact copies, and to distribute modified versions.  Packages found in the GNU distribution provide only software that conveys these four freedoms."
+msgid "The GNU operating system has been developed so that users can have freedom in their computing.  GNU is @dfn{free software}, meaning that users have the @url{https://www.gnu.org/philosophy/free-sw.html,four essential freedoms}: to run the program, to study and change the program in source code form, to redistribute exact copies, and to distribute modified versions.  Packages found in the GNU distribution provide only software that conveys these four freedoms."
 msgstr "Операционная система GNU разработана, чтобы пользователи имели свободу при работе за компьютером. GNU --- это @dfn{свободное программное обеспечение}, то есть пользователи могут иметь @url{http://www.gnu.org/philosophy/free-sw.html,четыре важнейшие свободы}: запускать программу, изучать и изменять исходный код программы, распространять самостоятельно точные копии и распространять изменённые версии. Пакеты, включенные в дистрибутив GNU, поставляют только программное обеспечение, которое даёт эти четыре свободы."
 
 #. type: Plain text
-#: doc/contributing.texi:371
-msgid "In addition, the GNU distribution follow the @url{http://www.gnu.org/distros/free-system-distribution-guidelines.html,free software distribution guidelines}.  Among other things, these guidelines reject non-free firmware, recommendations of non-free software, and discuss ways to deal with trademarks and patents."
+#: doc/contributing.texi:399
+#, fuzzy
+#| msgid "In addition, the GNU distribution follow the @url{http://www.gnu.org/distros/free-system-distribution-guidelines.html,free software distribution guidelines}.  Among other things, these guidelines reject non-free firmware, recommendations of non-free software, and discuss ways to deal with trademarks and patents."
+msgid "In addition, the GNU distribution follow the @url{https://www.gnu.org/distros/free-system-distribution-guidelines.html,free software distribution guidelines}.  Among other things, these guidelines reject non-free firmware, recommendations of non-free software, and discuss ways to deal with trademarks and patents."
 msgstr "Также дистрибутив GNU следует @url{http://www.gnu.org/distros/free-system-distribution-guidelines.html,рекомендациям для свободных дистрибутивов}. Эти рекомендации, среди прочих указаний, также отклоняют несвободные встроенные программы, рекомендации несвободного программного обеспечения и содержат доводы о том, как взаимодействовать с торговыми марками и патентами."
 
 #. type: Plain text
-#: doc/contributing.texi:379
+#: doc/contributing.texi:407
 msgid "Some otherwise free upstream package sources contain a small and optional subset that violates the above guidelines, for instance because this subset is itself non-free code.  When that happens, the offending items are removed with appropriate patches or code snippets in the @code{origin} form of the package (@pxref{Defining Packages}).  This way, @code{guix build --source} returns the ``freed'' source rather than the unmodified upstream source."
 msgstr "Но тем не менее, некоторые источники пакетов в оригинале содержат небольшие необязательные компоненты, которые нарушают указанные рекомендации, например, это может быть несвободный код. Если это происходит, такие компоненты удаляются применением соответствующих патчей или сниппетов в @code{исходный} код пакета @pxref{Defining Packages}). Так @code{guix build --source} возвращает \"восстановленный свободный\" исходный код вместо изначального исходника."
 
 #. type: cindex
-#: doc/contributing.texi:384
+#: doc/contributing.texi:412
 #, no-wrap
 msgid "package name"
 msgstr "имя пакета"
 
 #. type: Plain text
-#: doc/contributing.texi:392
+#: doc/contributing.texi:420
 msgid "A package has actually two names associated with it: First, there is the name of the @emph{Scheme variable}, the one following @code{define-public}.  By this name, the package can be made known in the Scheme code, for instance as input to another package.  Second, there is the string in the @code{name} field of a package definition.  This name is used by package management commands such as @command{guix package} and @command{guix build}."
 msgstr "Пакет, в действительности, имеет два имени, ассоциированных с ним: первое --- это имя @emph{переменной Scheme}, которая указана в @code{define-public}. Это имя делает пакет доступным в коде Scheme, например, может использоваться как входные данные другого пакета. Второе --- это строка в поле @code{name} в определении пакета. Это имя используется командами управления пакетами, например, @command{guix package} и @command{guix build}."
 
 #. type: Plain text
-#: doc/contributing.texi:397
+#: doc/contributing.texi:425
 msgid "Both are usually the same and correspond to the lowercase conversion of the project name chosen upstream, with underscores replaced with hyphens.  For instance, GNUnet is available as @code{gnunet}, and SDL_net as @code{sdl-net}."
 msgstr "Оба обычно представляют собой строки в нижнем регистре, содержащие имя оригинального проекта с дефисами вместо символов нижнего подчёркивания. Например, GNUnet доступен как @code{gnunet}, а SDL_net --- как @code{sdl-net}."
 
 #. type: Plain text
-#: doc/contributing.texi:402
+#: doc/contributing.texi:430
 msgid "We do not add @code{lib} prefixes for library packages, unless these are already part of the official project name.  But @pxref{Python Modules} and @ref{Perl Modules} for special rules concerning modules for the Python and Perl languages."
 msgstr "Мы не добавляем приставку @code{lib} для пакетов библиотек, несмотря на то, что это уже часть официального имени пакета. Но для @pxref{Python Modules} и @ref{Perl Modules} есть исключения, касающиеся модулей для языков Python и Perl."
 
 #. type: Plain text
-#: doc/contributing.texi:404
+#: doc/contributing.texi:432
 msgid "Font package names are handled differently, @pxref{Fonts}."
 msgstr "При именовании пакетов шрифтов имена меняются, @pxref{Fonts}."
 
 #. type: cindex
-#: doc/contributing.texi:409
+#: doc/contributing.texi:437
 #, no-wrap
 msgid "package version"
 msgstr "версия пакета"
 
 #. type: Plain text
-#: doc/contributing.texi:418
+#: doc/contributing.texi:446
 msgid "We usually package only the latest version of a given free software project.  But sometimes, for instance for incompatible library versions, two (or more) versions of the same package are needed.  These require different Scheme variable names.  We use the name as defined in @ref{Package Naming} for the most recent version; previous versions use the same name, suffixed by @code{-} and the smallest prefix of the version number that may distinguish the two versions."
 msgstr "Обычно мы опакечиваем только последнюю версию некоторого программного обеспечения. Но иногда, например, при наличии несовместимых версий библиотек, нужны две (или более) версии одного пакета. Это требует разных имён переменных Scheme. Мы используем имя, определённое в @ref{Package Naming}, для самой последней версии; предыдущие версии используют такое же имя с добавлением @code{-} и номера версии, что позволяет отличить две версии."
 
 #. type: Plain text
-#: doc/contributing.texi:421
+#: doc/contributing.texi:449
 msgid "The name inside the package definition is the same for all versions of a package and does not contain any version number."
 msgstr "Имя внутри описания пакета остаётся одно для всех версий пакета и не содержит номера версии."
 
 #. type: Plain text
-#: doc/contributing.texi:423
+#: doc/contributing.texi:451
 msgid "For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as follows:"
 msgstr "Например, версии GTK+ 2.24.20 и 3.9.12 могут опакечиваться так:"
 
 #. type: lisp
-#: doc/contributing.texi:435
+#: doc/contributing.texi:463
 #, no-wrap
 msgid ""
 "(define-public gtk+\n"
@@ -785,12 +865,12 @@ msgstr ""
 "    ...))\n"
 
 #. type: Plain text
-#: doc/contributing.texi:437
+#: doc/contributing.texi:465
 msgid "If we also wanted GTK+ 3.8.2, this would be packaged as"
 msgstr "Если нам также нужен GTK+ 3.8.2, он будет размещён в пакете"
 
 #. type: lisp
-#: doc/contributing.texi:443
+#: doc/contributing.texi:471
 #, no-wrap
 msgid ""
 "(define-public gtk+-3.8\n"
@@ -806,23 +886,23 @@ msgstr ""
 "    ...))\n"
 
 #. type: cindex
-#: doc/contributing.texi:447
+#: doc/contributing.texi:475
 #, no-wrap
 msgid "version number, for VCS snapshots"
 msgstr "номер версии, для снимков СКВ"
 
 #. type: Plain text
-#: doc/contributing.texi:453
+#: doc/contributing.texi:481
 msgid "Occasionally, we package snapshots of upstream's version control system (VCS) instead of formal releases.  This should remain exceptional, because it is up to upstream developers to clarify what the stable release is.  Yet, it is sometimes necessary.  So, what should we put in the @code{version} field?"
 msgstr "Порой мы опакечиваем снепшоты исходников из системы контроля версий (СКВ) вместо официальных релизов. Это остаётся исключением, потому что только разработчики оригинальных программ решают, что является стабильным релизом. Иногда это имеет значение. Что же мы должны писать в поле @code{версия}?"
 
 #. type: Plain text
-#: doc/contributing.texi:461
+#: doc/contributing.texi:489
 msgid "Clearly, we need to make the commit identifier of the VCS snapshot visible in the version string, but we also need to make sure that the version string is monotonically increasing so that @command{guix package --upgrade} can determine which version is newer.  Since commit identifiers, notably with Git, are not monotonically increasing, we add a revision number that we increase each time we upgrade to a newer snapshot.  The resulting version string looks like this:"
 msgstr "Ясно, что нужно сделать отображение идентификатора коммита снепшота СКВ внутри строки версии, но мы также должны убедиться, что строка \"версия\" монотонно увеличивается, так чтобы @command{guix package --upgrade} могла определить, какая версия новее. Так как идентификаторы коммитов, что точно, Git, не увеличиваются, мы добавляем номер ревизии, которую мы увеличиваем каждый раз, когда мы обновляем до нового снепшота. Результирующая строка версии выглядит так:"
 
 #. type: example
-#: doc/contributing.texi:470
+#: doc/contributing.texi:498
 #, no-wrap
 msgid ""
 "2.0.11-3.cabba9e\n"
@@ -842,12 +922,12 @@ msgstr ""
 "последняя версия оригинала\n"
 
 #. type: Plain text
-#: doc/contributing.texi:479
+#: doc/contributing.texi:507
 msgid "It is a good idea to strip commit identifiers in the @code{version} field to, say, 7 digits.  It avoids an aesthetic annoyance (assuming aesthetics have a role to play here) as well as problems related to OS limits such as the maximum shebang length (127 bytes for the Linux kernel.)  It is best to use the full commit identifiers in @code{origin}s, though, to avoid ambiguities.  A typical package definition may look like this:"
 msgstr "Хорошая идея обрезать идентификаторы коммитов в поле @code{version}, скажем, до 7 цифр. Это позволяет избежать эстетического раздражения (эстетика здесь имеет значение), а также проблем с ограничениями ОС, как например, максимальная длина (127 байт для ядра Linux). Лучшее - это использовать полный идентификатор коммита в поле источник --- @code{origin} --- что позволяет избегать повторов. Стандартное описание пакета может выглядеть так:"
 
 #. type: lisp
-#: doc/contributing.texi:495
+#: doc/contributing.texi:523
 #, no-wrap
 msgid ""
 "(define my-package\n"
@@ -881,60 +961,62 @@ msgstr ""
 "      )))\n"
 
 #. type: cindex
-#: doc/contributing.texi:500
+#: doc/contributing.texi:528
 #, no-wrap
 msgid "package description"
 msgstr "описание пакета"
 
 #. type: cindex
-#: doc/contributing.texi:501
+#: doc/contributing.texi:529
 #, no-wrap
 msgid "package synopsis"
 msgstr "краткий обзор пакета"
 
 #. type: Plain text
-#: doc/contributing.texi:508
+#: doc/contributing.texi:536
 msgid "As we have seen before, each package in GNU@tie{}Guix includes a synopsis and a description (@pxref{Defining Packages}).  Synopses and descriptions are important: They are what @command{guix package --search} searches, and a crucial piece of information to help users determine whether a given package suits their needs.  Consequently, packagers should pay attention to what goes into them."
 msgstr "Как мы видели ранее, каждый пакет в GNU@tie{}Guix включает краткое описание и полное описание (@pxref{Defining Packages}). Краткие описания и полные описания важны: по ним производится поиск @command{guix package --search}, и это важная информация, которая помогает пользователям определить, насколько пакет соответствует их потребностям. Следовательно, пакеты должны отвечать требованиям, предъявляемым к ним."
 
 #. type: Plain text
-#: doc/contributing.texi:516
+#: doc/contributing.texi:544
 msgid "Synopses must start with a capital letter and must not end with a period.  They must not start with ``a'' or ``the'', which usually does not bring anything; for instance, prefer ``File-frobbing tool'' over ``A tool that frobs files''.  The synopsis should say what the package is---e.g., ``Core GNU utilities (file, text, shell)''---or what it is used for---e.g., the synopsis for GNU@tie{}grep is ``Print lines matching a pattern''."
 msgstr "Краткие описания должны начинаться с прописной буквы и не должны заканчиваться точкой. Они не должны начинаться с артикля (англ. \"a\" или \"the\"), что обычно ничего не значит; например, лучше начать \"File-frobbing tool\" вместо \"A tool that frobs files\".  Краткое описание должно сообщать о том, что представляет собой пакет, то есть: \"Основные утилиты GNU (файлы, текст, оболочка)\", - или для чего он используется, то есть краткое описание для GNU@tie{}grep таково: \"Печать строк, содержащих паттерн\"."
 
 #. type: Plain text
-#: doc/contributing.texi:526
+#: doc/contributing.texi:554
 msgid "Keep in mind that the synopsis must be meaningful for a very wide audience.  For example, ``Manipulate alignments in the SAM format'' might make sense for a seasoned bioinformatics researcher, but might be fairly unhelpful or even misleading to a non-specialized audience.  It is a good idea to come up with a synopsis that gives an idea of the application domain of the package.  In this example, this might give something like ``Manipulate nucleotide sequence alignments'', which hopefully gives the user a better idea of whether this is what they are looking for."
 msgstr "Помните, что краткое описание должно быть понятным для очень широкой аудитории. Например, \"Манипулирование выравниванием в формате SAM\" может быть понятно продвинутым исследователям в области биоинформатики, но совершенно бесполезно или может ввести в заблужение не специалистов. Хорошая идея --- включать в краткое описание идею группы приложений, к которой относится пакет. В данном примере можно предложить такой вариант: \"Манипулирование выравниванием нуклеотидных последовательностей\", что, в целом, даёт пользователю лучшее представление о том, на что они смотрят."
 
 #. type: Plain text
-#: doc/contributing.texi:534
+#: doc/contributing.texi:562
 msgid "Descriptions should take between five and ten lines.  Use full sentences, and avoid using acronyms without first introducing them.  Please avoid marketing phrases such as ``world-leading'', ``industrial-strength'', and ``next-generation'', and avoid superlatives like ``the most advanced''---they are not helpful to users looking for a package and may even sound suspicious.  Instead, try to be factual, mentioning use cases and features."
 msgstr "Описания должны занимать от 5 до 10 строк. Используйте полные предложения, использование аббревиатур возможно при их первичной расшифровке. Пожалуйста, не пишите маркетинговые фразы типа \"мировой лидер\", \"промышленный\", \"следующего поколения\", также избегайте признаки превосходства, как \"самый продвинутый\" --- это не помогает пользователям отыскать пакет, и возможно, звучит сомнительно. Вместо этого рассказывайте о фактах, упоминая особенности и применение."
 
 #. type: cindex
-#: doc/contributing.texi:535
+#: doc/contributing.texi:563
 #, no-wrap
 msgid "Texinfo markup, in package descriptions"
 msgstr "Разметка Texinfo, в описаниях пакетов"
 
 #. type: Plain text
-#: doc/contributing.texi:544
+#: doc/contributing.texi:572
 msgid "Descriptions can include Texinfo markup, which is useful to introduce ornaments such as @code{@@code} or @code{@@dfn}, bullet lists, or hyperlinks (@pxref{Overview,,, texinfo, GNU Texinfo}).  However you should be careful when using some characters for example @samp{@@} and curly braces which are the basic special characters in Texinfo (@pxref{Special Characters,,, texinfo, GNU Texinfo}).  User interfaces such as @command{guix package --show} take care of rendering it appropriately."
 msgstr "Описания могут содержать разметку Texinfo, которая полезна при введении использовании подсветки как @code{@@code} или @code{@@dfn}, списков или гиперссылок (@pxref{Overview,,, texinfo, GNU Texinfo}). Однако будьте внимательны при пользовании символов @samp{@@} и фигурных скобок, которые вляются основными спецсимволами в Texinfo (@pxref{Special Characters,,, texinfo, GNU Texinfo}). Пользовательский интерфейс, например, @command{guix package --show}, учитывает и выводит текст с разметкой."
 
 #. type: Plain text
-#: doc/contributing.texi:550
-msgid "Synopses and descriptions are translated by volunteers @uref{http://translationproject.org/domain/guix-packages.html, at the Translation Project} so that as many users as possible can read them in their native language.  User interfaces search them and display them in the language specified by the current locale."
+#: doc/contributing.texi:578
+#, fuzzy
+#| msgid "Synopses and descriptions are translated by volunteers @uref{http://translationproject.org/domain/guix-packages.html, at the Translation Project} so that as many users as possible can read them in their native language.  User interfaces search them and display them in the language specified by the current locale."
+msgid "Synopses and descriptions are translated by volunteers @uref{https://translationproject.org/domain/guix-packages.html, at the Translation Project} so that as many users as possible can read them in their native language.  User interfaces search them and display them in the language specified by the current locale."
 msgstr "Краткие описания и полные описания переведены участниками @uref{http://translationproject.org/domain/guix-packages.html, проекта Переводов}, это позволяет многим пользователям читать их на родном языке. Пользовательские интерфейсы ищут и отображают их на языке, заданном для текущей локали."
 
 #. type: Plain text
-#: doc/contributing.texi:555
+#: doc/contributing.texi:583
 msgid "To allow @command{xgettext} to extract them as translatable strings, synopses and descriptions @emph{must be literal strings}.  This means that you cannot use @code{string-append} or @code{format} to construct these strings:"
 msgstr "Чтобы дать возможность @command{xgettext} извлекать их как текст для перевода, краткие и полные описания  @emph{должны быть буквенными строками}.  Это означает, что нельзя пользоваться @code{string-append} или @code{format} при составлении этих строк:"
 
 #. type: lisp
-#: doc/contributing.texi:561
+#: doc/contributing.texi:589
 #, no-wrap
 msgid ""
 "(package\n"
@@ -948,12 +1030,12 @@ msgstr ""
 "  (description (string-append \"Эта строка \" \"*не поддерживает*\" \" перевод.\")))\n"
 
 #. type: Plain text
-#: doc/contributing.texi:569
+#: doc/contributing.texi:597
 msgid "Translation is a lot of work so, as a packager, please pay even more attention to your synopses and descriptions as every change may entail additional work for translators.  In order to help them, it is possible to make recommendations or instructions visible to them by inserting special comments like this (@pxref{xgettext Invocation,,, gettext, GNU Gettext}):"
 msgstr "Перевод --- трудоёмкая работа. Как автор пакета, пожалуйста, уделите внимание краткому и полному описаниям, потому что каждое изменение влечет дополнительную работу для переводчиков. Чтобы помочь им, можно сделать рекомендации или инструкции, вставив специальные комментарии, как этот (@pxref{xgettext Invocation,,, gettext, GNU Gettext}):"
 
 #. type: example
-#: doc/contributing.texi:574
+#: doc/contributing.texi:602
 #, no-wrap
 msgid ""
 ";; TRANSLATORS: \"X11 resize-and-rotate\" should not be translated.\n"
@@ -965,343 +1047,380 @@ msgstr ""
 "for the X11 resize-and-rotate (RandR) extension. @dots{}\")\n"
 
 #. type: cindex
-#: doc/contributing.texi:580
+#: doc/contributing.texi:608
 #, no-wrap
 msgid "python"
 msgstr "python"
 
 #. type: Plain text
-#: doc/contributing.texi:586
+#: doc/contributing.texi:614
 msgid "We currently package Python 2 and Python 3, under the Scheme variable names @code{python-2} and @code{python} as explained in @ref{Version Numbers}.  To avoid confusion and naming clashes with other programming languages, it seems desirable that the name of a package for a Python module contains the word @code{python}."
 msgstr "В настоящее время мы поставляем пакеты Python 2 и Python 3 через переменную Scheme под именами @code{python-2} и @code{python} в соответствии с @ref{Version Numbers}. Чтобы предотвратить путанницу и конфликты имён других языков программирования, модули Python содержат слово @code{python}."
 
 #. type: Plain text
-#: doc/contributing.texi:592
-msgid "Some modules are compatible with only one version of Python, others with both.  If the package Foo compiles only with Python 3, we name it @code{python-foo}; if it compiles only with Python 2, we name it @code{python2-foo}. If it is compatible with both versions, we create two packages with the corresponding names."
+#: doc/contributing.texi:621
+#, fuzzy
+#| msgid "Some modules are compatible with only one version of Python, others with both.  If the package Foo compiles only with Python 3, we name it @code{python-foo}; if it compiles only with Python 2, we name it @code{python2-foo}. If it is compatible with both versions, we create two packages with the corresponding names."
+msgid "Some modules are compatible with only one version of Python, others with both.  If the package Foo is compiled with Python 3, we name it @code{python-foo}.  If it is compiled with Python 2, we name it @code{python2-foo}.  Packages should be added when they are necessary; we don't add Python 2 variants of the package unless we are going to use them."
 msgstr "Некоторые модули совместимы только с одной версией Python, другие - с обоими. Если пакет Foo работает только с Python 3, мы называем его @code{python-foo}. Если он работает только с Python 2, мы называем его @code{python2-foo}. Если он совместим с обеими версиями, мы создаём два пакета с соответствующими именами."
 
 #. type: Plain text
-#: doc/contributing.texi:598
+#: doc/contributing.texi:627
 msgid "If a project already contains the word @code{python}, we drop this; for instance, the module python-dateutil is packaged under the names @code{python-dateutil} and @code{python2-dateutil}.  If the project name starts with @code{py} (e.g.@: @code{pytz}), we keep it and prefix it as described above."
 msgstr "Если проект уже содержит слово @code{python}, мы отбрасываем его; например, модуль python-dateutil опакечен под именем @code{python-dateutil} и @code{python2-dateutil}. Если имя проекта начинается с @code{py} (т.е.@:  @code{pytz}), мы оставляем такое имя и добавляем префикс, как это описано выше."
 
 #. type: subsubsection
-#: doc/contributing.texi:599
+#: doc/contributing.texi:628
 #, no-wrap
 msgid "Specifying Dependencies"
 msgstr "Перечисление зависимостей"
 
 #. type: cindex
-#: doc/contributing.texi:600
+#: doc/contributing.texi:629
 #, no-wrap
 msgid "inputs, for Python packages"
 msgstr "входные данные, для пакетов Python"
 
 #. type: Plain text
-#: doc/contributing.texi:605
+#: doc/contributing.texi:634
 msgid "Dependency information for Python packages is usually available in the package source tree, with varying degrees of accuracy: in the @file{setup.py} file, in @file{requirements.txt}, or in @file{tox.ini}."
 msgstr "Информация о зависимостях для пакетов Python обычно доступна в дереве исходников пакета с различной степенью точности --- в файле @file{setup.py}, в @file{requirements.txt} или в @file{tox.ini}."
 
 #. type: Plain text
-#: doc/contributing.texi:611
+#: doc/contributing.texi:640
 msgid "Your mission, when writing a recipe for a Python package, is to map these dependencies to the appropriate type of ``input'' (@pxref{package Reference, inputs}).  Although the @code{pypi} importer normally does a good job (@pxref{Invoking guix import}), you may want to check the following check list to determine which dependency goes where."
 msgstr "Ваша миссия при написании рецепта сборки пакета Python --- отобразить эти зависимости в должном типе \"input\" (@pxref{package Reference, inputs}). Хотя импортёр @code{pypi} обычно отрабатывает хорошо (@pxref{Invoking guix import}), возможно, вы желаете просмотреть приведённый чек-лист, чтобы узнать о зависимостях."
 
 #. type: itemize
-#: doc/contributing.texi:619
+#: doc/contributing.texi:648
 msgid "We currently package Python 2 with @code{setuptools} and @code{pip} installed like Python 3.4 has per default.  Thus you don't need to specify either of these as an input.  @command{guix lint} will warn you if you do."
 msgstr "В настоящее время мы поставляем пакет Python 2 с @code{setuptools} и @code{pip}, установленные как Python 3.4 по умолчанию. Так что не нужно обозначать их как входные данные (input). @command{guix lint} сообщит об ошибке, если это происходит."
 
 #. type: itemize
-#: doc/contributing.texi:625
+#: doc/contributing.texi:654
 msgid "Python dependencies required at run time go into @code{propagated-inputs}.  They are typically defined with the @code{install_requires} keyword in @file{setup.py}, or in the @file{requirements.txt} file."
 msgstr "Зависимости Python, необходимые во время работы, идут в @code{propagated-inputs}. Они обычно определены с ключевым словом @code{install_requires} в @file{setup.py} или в файле @file{requirements.txt}."
 
 #. type: itemize
-#: doc/contributing.texi:633
+#: doc/contributing.texi:662
 msgid "Python packages required only at build time---e.g., those listed with the @code{setup_requires} keyword in @file{setup.py}---or only for testing---e.g., those in @code{tests_require}---go into @code{native-inputs}.  The rationale is that (1) they do not need to be propagated because they are not needed at run time, and (2) in a cross-compilation context, it's the ``native'' input that we'd want."
 msgstr "Пакеты Python, необходимые только во время сборки, то есть обозначенные в списке с ключевым словом @code{setup_requires} в @file{setup.py}, или только для тестов, то есть со словом @code{tests_require}, указываются в @code{native-inputs}. Основная причина в том, что, первое, они не должны распространяться, потому что они не нужны для запуска и работы, и второе, в контексте кросс-компиляции это \"нативные\" входные данные, которые нам требуются."
 
 #. type: itemize
-#: doc/contributing.texi:637
+#: doc/contributing.texi:666
 msgid "Examples are the @code{pytest}, @code{mock}, and @code{nose} test frameworks.  Of course if any of these packages is also required at run-time, it needs to go to @code{propagated-inputs}."
 msgstr "Примерами являются фреймворки тестирования @code{pytest}, @code{mock} и @code{nose}. Конечно, если какой-либо из этих пакетов также необходим во время запуска и работы, его следует указывать в @code{propagated-inputs}."
 
 #. type: itemize
-#: doc/contributing.texi:642
+#: doc/contributing.texi:671
 msgid "Anything that does not fall in the previous categories goes to @code{inputs}, for example programs or C libraries required for building Python packages containing C extensions."
 msgstr "Всё, что не попало в предыдущие категории, указывается в @code{inputs}, например, программы или библиотеки C, необходимые для сборки пакетов Python, которые используют расширения C."
 
 #. type: itemize
-#: doc/contributing.texi:648
+#: doc/contributing.texi:677
 msgid "If a Python package has optional dependencies (@code{extras_require}), it is up to you to decide whether to add them or not, based on their usefulness/overhead ratio (@pxref{Submitting Patches, @command{guix size}})."
 msgstr "Если у пакета Python есть необязательные зависимости (@code{extras_require}), самостоятельно решите, нужно ли их добавлять в зависимости от их полезности или избыточности (@pxref{Submitting Patches, @command{guix size}})."
 
 #. type: cindex
-#: doc/contributing.texi:655
+#: doc/contributing.texi:684
 #, no-wrap
 msgid "perl"
 msgstr "perl"
 
 #. type: Plain text
-#: doc/contributing.texi:666
+#: doc/contributing.texi:695
 msgid "Perl programs standing for themselves are named as any other package, using the lowercase upstream name.  For Perl packages containing a single class, we use the lowercase class name, replace all occurrences of @code{::} by dashes and prepend the prefix @code{perl-}.  So the class @code{XML::Parser} becomes @code{perl-xml-parser}.  Modules containing several classes keep their lowercase upstream name and are also prepended by @code{perl-}.  Such modules tend to have the word @code{perl} somewhere in their name, which gets dropped in favor of the prefix.  For instance, @code{libwww-perl} becomes @code{perl-libwww}."
 msgstr "Программы Perl именуются как и любой другой пакет, используя исходное имя в нижнем регистре. Для пакетов Perl, содержащих отдельный класс мы используем имя класса в нижнем регистре, заменяем все вхождения @code{::} на дефисы и добавляем приставку @code{perl-}. Так класс @code{XML::Parser} становится @code{perl-xml-parser}. Модули, содержащие несколько классов, сохраняют свои изначальные имена в нижнем регистре и также имеют префикс @code{perl-}. Подобные модули имеют тенденцию писать слово @code{perl} где-либо в их имени, так что это слово удаляется, так как префикс содержит это слово. Например, @code{libwww-perl} становится @code{perl-libwww}."
 
 #. type: cindex
-#: doc/contributing.texi:671
+#: doc/contributing.texi:700
 #, no-wrap
 msgid "java"
 msgstr "java"
 
 #. type: Plain text
-#: doc/contributing.texi:674
+#: doc/contributing.texi:703
 msgid "Java programs standing for themselves are named as any other package, using the lowercase upstream name."
 msgstr "Программы Java именуются как любой другой пакет, используя исходное им в нижнем регистре."
 
 #. type: Plain text
-#: doc/contributing.texi:680
+#: doc/contributing.texi:709
 msgid "To avoid confusion and naming clashes with other programming languages, it is desirable that the name of a package for a Java package is prefixed with @code{java-}.  If a project already contains the word @code{java}, we drop this; for instance, the package @code{ngsjava} is packaged under the name @code{java-ngs}."
 msgstr "Чтобы избежать путанницы и конфликтов имён с другими языками программирования, желательно именовать пакет, поставляющий программу Java, с префиксом @code{java-}. Если проект уже содержит слово @code{java}, мы обрезаем его. Например, пакет @code{ngsjava} опакечивается под именем @code{java-ngs}."
 
 #. type: Plain text
-#: doc/contributing.texi:686
+#: doc/contributing.texi:715
 msgid "For Java packages containing a single class or a small class hierarchy, we use the lowercase class name, replace all occurrences of @code{.} by dashes and prepend the prefix @code{java-}.  So the class @code{apache.commons.cli} becomes package @code{java-apache-commons-cli}."
 msgstr "Для пакетов Java, содержащих отдельный класс или небольшую ирархию, мы используем имя в нижнем регистре, заменяя все вхождения @code{.} на дефисы, и указываем префикс @code{java-}. Так класс  @code{apache.commons.cli} становится пакетом @code{java-apache-commons-cli}."
 
 #. type: cindex
-#: doc/contributing.texi:691 doc/guix.texi:1675
+#: doc/contributing.texi:720
+#, no-wrap
+msgid "rust"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:723
+#, fuzzy
+#| msgid "Java programs standing for themselves are named as any other package, using the lowercase upstream name."
+msgid "Rust programs standing for themselves are named as any other package, using the lowercase upstream name."
+msgstr "Программы Java именуются как любой другой пакет, используя исходное им в нижнем регистре."
+
+#. type: Plain text
+#: doc/contributing.texi:727
+msgid "To prevent namespace collisions we prefix all other Rust packages with the @code{rust-} prefix.  The name should be changed to lowercase as appropriate and dashes should remain in place."
+msgstr "Чтобы предотвратить конфликты пространства имен, мы используем префикс @code{rust-} для всех остальных пакетов Rust. Имя должно быть изменено на строчные буквы, если необходимо, и тире должны остаться на месте."
+
+#. type: Plain text
+#: doc/contributing.texi:733
+msgid "In the rust ecosystem it is common for multiple incompatible versions of a package to be used at any given time, so all packages should have a versioned suffix.  If a package has passed version 1.0.0 then just the major version number is sufficient (e.g.@: @code{rust-clap-2}), otherwise the version suffix should contain both the major and minor version (e.g.@: @code{rust-rand-0.6})."
+msgstr "В экосистеме rust использование нескольких несовместимых версий пакета в любой момент времени является нормой, поэтому у всех пакетов должен быть версионный суффикс. Если пакет прошел версию 1.0.0, тогда достаточно только основного номера версии (например, @:@code{rust-clap-2}), в противном случае суффикс версии должен содержать как основную, так и вспомогательную версию (например, @:@code{rust-rand-0,6})."
+
+#. type: Plain text
+#: doc/contributing.texi:743
+msgid "Because of the difficulty in reusing rust packages as pre-compiled inputs for other packages the Cargo build system (@pxref{Build Systems, @code{cargo-build-system}}) presents the @code{#:cargo-inputs} and @code{cargo-development-inputs} keywords as build system arguments.  It would be helpful to think of these as similar to @code{propagated-inputs} and @code{native-inputs}.  Rust @code{dependencies} and @code{build-dependencies} should go in @code{#:cargo-inputs}, and @code{dev-dependencies} should go in @code{#:cargo-development-inputs}.  If a Rust package links to other libraries then the standard placement in @code{inputs} and the like should be used."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:749
+msgid "Care should be taken to ensure the correct version of dependencies are used; to this end we try to refrain from skipping the tests or using @code{#:skip-build?} when possible.  Of course this is not always possible, as the package may be developed for a different Operating System, depend on features from the Nightly Rust compiler, or the test suite may have atrophied since it was released."
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:754 doc/guix.texi:1679
 #, no-wrap
 msgid "fonts"
 msgstr "шрифты"
 
 #. type: Plain text
-#: doc/contributing.texi:697
+#: doc/contributing.texi:760
 msgid "For fonts that are in general not installed by a user for typesetting purposes, or that are distributed as part of a larger software package, we rely on the general packaging rules for software; for instance, this applies to the fonts delivered as part of the X.Org system or fonts that are part of TeX Live."
 msgstr "Для шрифтов, которые не установлены пользователем, исходя из настроек печати, или рааспространяемые как часть большого пакета программного  обеспечения, мы применяем обычные правила опакечивания программного обеспечения. Например, это относится к шрифтам, поставляемым как часть системы X.Org, или шрифтов TeX Live."
 
 #. type: Plain text
-#: doc/contributing.texi:701
+#: doc/contributing.texi:764
 msgid "To make it easier for a user to search for fonts, names for other packages containing only fonts are constructed as follows, independently of the upstream package name."
 msgstr "Чтобы облегчить пользовательский поиск шрифтов, имена пакетов, содержащих только шрифты, создаются следующим образом, независимо от изначального имени пакета."
 
 #. type: Plain text
-#: doc/contributing.texi:709
+#: doc/contributing.texi:772
 msgid "The name of a package containing only one font family starts with @code{font-}; it is followed by the foundry name and a dash @code{-} if the foundry is known, and the font family name, in which spaces are replaced by dashes (and as usual, all upper case letters are transformed to lower case).  For example, the Gentium font family by SIL is packaged under the name @code{font-sil-gentium}."
 msgstr "Имя пакета, содержащего только одно семейство шрифтов, начинается с @code{font-}; далее идёт литейное имя и дефис @code{-}, если литейное имя известно, а затем - имя семейства шрифтов, в котором пробелы заменяются дефисами (и обычно все буквы в верхнем регистре заменяются на нижний регистр). Например, семейство шрифтов Gentium от SIL опакечивается под именем @code{font-sil-gentium}."
 
 #. type: Plain text
-#: doc/contributing.texi:718
+#: doc/contributing.texi:781
 msgid "For a package containing several font families, the name of the collection is used in the place of the font family name.  For instance, the Liberation fonts consist of three families, Liberation Sans, Liberation Serif and Liberation Mono.  These could be packaged separately under the names @code{font-liberation-sans} and so on; but as they are distributed together under a common name, we prefer to package them together as @code{font-liberation}."
 msgstr "Пакет с несколькими семействами шрифтов имеет в названии имя коллекции вместо имени семейства. Например, шрифты Liberation состоят из трёх семейств: Liberation Sans, Liberation Serfif и Liberation Mono. Они могли бы опакечиваться отдельно под именами @code{font-liberation-sans} и так далее, но так как они распространяются вместе под общим именем, мы предпочитаем опакечивать их вместе как @code{font-liberation}."
 
 #. type: Plain text
-#: doc/contributing.texi:724
+#: doc/contributing.texi:787
 msgid "In the case where several formats of the same font family or font collection are packaged separately, a short form of the format, prepended by a dash, is added to the package name.  We use @code{-ttf} for TrueType fonts, @code{-otf} for OpenType fonts and @code{-type1} for PostScript Type 1 fonts."
 msgstr "В случае, когда несколько форматов одного семейства щрифтов или коллекции шрифтов опакечена отдельно, в имени присутствует небольшая отметка о формате с предваряющим дефисом. Мы используем @code{-ttf} для шрифтов TrueType, @code{-otf} - для шрифтов OpenType - и  @code{-type1} - для шрифтов PostScript Type 1."
 
 #. type: Plain text
-#: doc/contributing.texi:732
+#: doc/contributing.texi:795
 msgid "In general our code follows the GNU Coding Standards (@pxref{Top,,, standards, GNU Coding Standards}).  However, they do not say much about Scheme, so here are some additional rules."
 msgstr "В основном наш код следует стандартам кодирования GNU (@pxref{Top,,, standards, GNU Coding Standards}). Но они не имеют исчерпывающих указаний для Scheme, так что есть дополнительные правила."
 
 #. type: subsection
-#: doc/contributing.texi:738 doc/contributing.texi:740
-#: doc/contributing.texi:741
+#: doc/contributing.texi:801 doc/contributing.texi:803
+#: doc/contributing.texi:804
 #, no-wrap
 msgid "Programming Paradigm"
 msgstr "Парадигма программирования"
 
 #. type: menuentry
-#: doc/contributing.texi:738
+#: doc/contributing.texi:801
 msgid "How to compose your elements."
 msgstr "Как компоновать элементы"
 
 #. type: subsection
-#: doc/contributing.texi:738 doc/contributing.texi:747
-#: doc/contributing.texi:748
+#: doc/contributing.texi:801 doc/contributing.texi:810
+#: doc/contributing.texi:811
 #, no-wrap
 msgid "Modules"
 msgstr "Модули"
 
 #. type: menuentry
-#: doc/contributing.texi:738
+#: doc/contributing.texi:801
 msgid "Where to store your code?"
 msgstr "Где разместить код?"
 
 #. type: subsection
-#: doc/contributing.texi:738 doc/contributing.texi:758
-#: doc/contributing.texi:759
+#: doc/contributing.texi:801 doc/contributing.texi:821
+#: doc/contributing.texi:822
 #, no-wrap
 msgid "Data Types and Pattern Matching"
 msgstr "Типы данных и поиск образцов"
 
 #. type: menuentry
-#: doc/contributing.texi:738
+#: doc/contributing.texi:801
 msgid "Implementing data structures."
 msgstr "Использование структур данных."
 
 #. type: subsection
-#: doc/contributing.texi:738 doc/contributing.texi:772
-#: doc/contributing.texi:773
+#: doc/contributing.texi:801 doc/contributing.texi:835
+#: doc/contributing.texi:836
 #, no-wrap
 msgid "Formatting Code"
 msgstr "Форматирование кода"
 
 #. type: menuentry
-#: doc/contributing.texi:738
+#: doc/contributing.texi:801
 msgid "Writing conventions."
 msgstr "Написание соглашений."
 
 #. type: Plain text
-#: doc/contributing.texi:746
+#: doc/contributing.texi:809
 msgid "Scheme code in Guix is written in a purely functional style.  One exception is code that involves input/output, and procedures that implement low-level concepts, such as the @code{memoize} procedure."
 msgstr "Код Scheme в Guix написан в чисто функциональном стиле. Одно исключение - это код, который вызывает ввод/вывод и процедуры, которые реализуют низкоровневые операции, как например, процедура @code{memoize}."
 
 #. type: Plain text
-#: doc/contributing.texi:754
+#: doc/contributing.texi:817
 msgid "Guile modules that are meant to be used on the builder side must live in the @code{(guix build @dots{})} name space.  They must not refer to other Guix or GNU modules.  However, it is OK for a ``host-side'' module to use a build-side module."
 msgstr "Модули Guile, которые вызываются для сборки, должны жить в пространстве имён @code{(guix build @dots{})}. Они не должны ссылаться на другие модули Guix или GNU. Однако это нормально, если модуль типа \"host-side\" использует модуль типа build-side."
 
 #. type: Plain text
-#: doc/contributing.texi:757
+#: doc/contributing.texi:820
 msgid "Modules that deal with the broader GNU system should be in the @code{(gnu @dots{})} name space rather than @code{(guix @dots{})}."
 msgstr "Модули, которые работают во всей системе GNU, должны быть в пространстве имён @code{(gnu @dots{})}, но не @code{(guix @dots{})}."
 
 #. type: Plain text
-#: doc/contributing.texi:766
+#: doc/contributing.texi:829
 msgid "The tendency in classical Lisp is to use lists to represent everything, and then to browse them ``by hand'' using @code{car}, @code{cdr}, @code{cadr}, and co.  There are several problems with that style, notably the fact that it is hard to read, error-prone, and a hindrance to proper type error reports."
 msgstr "Правило классического Lisp - использование списков для представления всего и просмотр списков \"вручную\", используя @code{car}, @code{cdr}, @code{cadr} и тому подобное. Возникают некоторые проблемы этого стиля, например, это тяжело читается, провоцирует ошибки, и создаёт отчёты об ошибках без должной детализации."
 
 #. type: Plain text
-#: doc/contributing.texi:771
+#: doc/contributing.texi:834
 msgid "Guix code should define appropriate data types (for instance, using @code{define-record-type*}) rather than abuse lists.  In addition, it should use pattern matching, via Guile’s @code{(ice-9 match)} module, especially when matching lists."
 msgstr "Код Guix должен определить соответствующие типы данных (то есть пользуясь, например, @code{define-record-type*}) вместо насущных списков. А также он должен использовать поиск по образцам с помощью модуля Guile  @code{(ice-9 match)}, особенно для поиска списков."
 
 #. type: cindex
-#: doc/contributing.texi:775
+#: doc/contributing.texi:838
 #, no-wrap
 msgid "formatting code"
 msgstr "форматирование кода"
 
 #. type: cindex
-#: doc/contributing.texi:776
+#: doc/contributing.texi:839
 #, no-wrap
 msgid "coding style"
 msgstr "стиль кодирования"
 
 #. type: Plain text
-#: doc/contributing.texi:783
-msgid "When writing Scheme code, we follow common wisdom among Scheme programmers.  In general, we follow the @url{http://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp Style Rules}.  This document happens to describe the conventions mostly used in Guile’s code too.  It is very thoughtful and well written, so please do read it."
+#: doc/contributing.texi:846
+#, fuzzy
+#| msgid "When writing Scheme code, we follow common wisdom among Scheme programmers.  In general, we follow the @url{http://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp Style Rules}.  This document happens to describe the conventions mostly used in Guile’s code too.  It is very thoughtful and well written, so please do read it."
+msgid "When writing Scheme code, we follow common wisdom among Scheme programmers.  In general, we follow the @url{https://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp Style Rules}.  This document happens to describe the conventions mostly used in Guile’s code too.  It is very thoughtful and well written, so please do read it."
 msgstr "При написании кода Scheme мы пользуемся мудростью программистов Scheme. В основном мы следуем  @url{http://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp Style Rules}. Этот документ, к счастью, содержит большинство соглашений, которые применимы также для кода Guile. Это очень вдумчиая работа, пожалуйста, прочтите её."
 
 #. type: Plain text
-#: doc/contributing.texi:790
+#: doc/contributing.texi:853
 msgid "Some special forms introduced in Guix, such as the @code{substitute*} macro, have special indentation rules.  These are defined in the @file{.dir-locals.el} file, which Emacs automatically uses.  Also note that Emacs-Guix provides @code{guix-devel-mode} mode that indents and highlights Guix code properly (@pxref{Development,,, emacs-guix, The Emacs-Guix Reference Manual})."
 msgstr "Некоторые специальные формы, вводимые в Guix, как например, макрос @code{substitute*}, имеют специальные правила отступов. Они определены в файле @file{.dir-locals.el}, которые использует Emacs автоматически. Также отметим, что Emacs-Guix предоставляет режим @code{guix-devel-mode}, который вставляет отступы и подсвечивает код Guix должным образом (@pxref{Development,,, emacs-guix, The Emacs-Guix Reference Manual})."
 
 #. type: cindex
-#: doc/contributing.texi:791
+#: doc/contributing.texi:854
 #, no-wrap
 msgid "indentation, of code"
 msgstr "отступы, в коде"
 
 #. type: cindex
-#: doc/contributing.texi:792
+#: doc/contributing.texi:855
 #, no-wrap
 msgid "formatting, of code"
 msgstr "форматировние, кода"
 
 #. type: Plain text
-#: doc/contributing.texi:795
+#: doc/contributing.texi:858
 msgid "If you do not use Emacs, please make sure to let your editor knows these rules.  To automatically indent a package definition, you can also run:"
 msgstr "Если вы не пользуетесь Emacs, пожалуйста убедитесь, что ваш редактор знает эти правила. Для автоматической расстановки отступов можно запустить:"
 
 #. type: example
-#: doc/contributing.texi:798
+#: doc/contributing.texi:861
 #, no-wrap
 msgid "./etc/indent-code.el gnu/packages/@var{file}.scm @var{package}\n"
 msgstr "./etc/indent-code.el gnu/packages/@var{file}.scm @var{package}\n"
 
 #. type: Plain text
-#: doc/contributing.texi:804
+#: doc/contributing.texi:867
 msgid "This automatically indents the definition of @var{package} in @file{gnu/packages/@var{file}.scm} by running Emacs in batch mode.  To indent a whole file, omit the second argument:"
 msgstr "Это автоматически расставит отступы в определении @var{package} в файле @file{gnu/packages/@var{file}.scm}, запустив Emacs в фоновом режиме. Чтобы расставить отступы во всём файле, приведите слеующий аргумент:"
 
 #. type: example
-#: doc/contributing.texi:807
+#: doc/contributing.texi:870
 #, no-wrap
 msgid "./etc/indent-code.el gnu/services/@var{file}.scm\n"
 msgstr "./etc/indent-code.el gnu/services/@var{file}.scm\n"
 
 #. type: cindex
-#: doc/contributing.texi:809
+#: doc/contributing.texi:872
 #, no-wrap
 msgid "Vim, Scheme code editing"
 msgstr "Vim, редактирование кода Scheme"
 
 #. type: Plain text
-#: doc/contributing.texi:815
+#: doc/contributing.texi:878
 msgid "If you are editing code with Vim, we recommend that you run @code{:set autoindent} so that your code is automatically indented as you type.  Additionally, @uref{https://www.vim.org/scripts/script.php?script_id=3998, @code{paredit.vim}} may help you deal with all these parentheses."
 msgstr "Если вы редактируете код в Vim, мы рекомендуем запустить @code{:set autoindent}, так отступы будут автоматически вставляться в ваш код, пока вы печатаете. В дополнение вам может помочь для работы со всеми этими скобками @uref{https://www.vim.org/scripts/script.php?script_id=3998, @code{paredit.vim}}."
 
 #. type: Plain text
-#: doc/contributing.texi:819
+#: doc/contributing.texi:882
 msgid "We require all top-level procedures to carry a docstring.  This requirement can be relaxed for simple private procedures in the @code{(guix build @dots{})} name space, though."
 msgstr "Мы требуем, чтобы все высокоуровневые процедуры содержали строки документации. Хотя это требование может не учитываться для простых приватных процедур в пространстве имён @code{(guix build @dots{})}."
 
 #. type: Plain text
-#: doc/contributing.texi:822
+#: doc/contributing.texi:885
 msgid "Procedures should not have more than four positional parameters.  Use keyword parameters for procedures that take more than four parameters."
 msgstr "Процедуры должны иметь не более четырёх параметров. Передавайте параметры по ключевым словам в процедурах, которые принимают более четырёх параметров."
 
 #. type: Plain text
-#: doc/contributing.texi:833
+#: doc/contributing.texi:896
 msgid "Development is done using the Git distributed version control system.  Thus, access to the repository is not strictly necessary.  We welcome contributions in the form of patches as produced by @code{git format-patch} sent to the @email{guix-patches@@gnu.org} mailing list.  Seasoned Guix developers may also want to look at the section on commit access (@pxref{Commit Access})."
 msgstr "Разработка завершается использованием поставляемой системы контроля версиями Git. Доступ к репозиторию не обязателен. Мы приветствуем вклады в разработку в виде патчей, которые производит @code{git format-patch}, отправленных в рассылку @email{guix-patches@@gnu.org}."
 
 #. type: Plain text
-#: doc/contributing.texi:840
+#: doc/contributing.texi:903
 msgid "This mailing list is backed by a Debbugs instance, which allows us to keep track of submissions (@pxref{Tracking Bugs and Patches}).  Each message sent to that mailing list gets a new tracking number assigned; people can then follow up on the submission by sending email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking number (@pxref{Sending a Patch Series})."
 msgstr "Для данной рассылки создаются резервные копии с помощью Debbugs, что позволяет нам отслеживать присылаемые патчи (@pxref{Tracking Bugs and Patches}). Каждому сообщению, отправленному в эту рассылку, присваивается новый номер трекинга. Затем пользователи могут общаться относительно конкретного патча, отправляя электронные письма на адрес @code{@var{NNN}@@debbugs.gnu.org}, где @var{NNN} — это номер трекинга (@pxref{Sending a Patch Series})."
 
 #. type: Plain text
-#: doc/contributing.texi:844
+#: doc/contributing.texi:907
 msgid "Please write commit logs in the ChangeLog format (@pxref{Change Logs,,, standards, GNU Coding Standards}); you can check the commit history for examples."
 msgstr "Пожалуйста, пишите логи коммита в формате ChangeLog (@pxref{Change Logs,,, standards, GNU Coding Standards}); можно просмотреть историю коммитов, например."
 
 #. type: Plain text
-#: doc/contributing.texi:847
+#: doc/contributing.texi:910
 msgid "Before submitting a patch that adds or modifies a package definition, please run through this check list:"
 msgstr "Перед отправкой патча, который добавляет или изменяет описание пакета, пожалуйста, выполните следующие проверки:"
 
 #. type: enumerate
-#: doc/contributing.texi:854
+#: doc/contributing.texi:917
 msgid "If the authors of the packaged software provide a cryptographic signature for the release tarball, make an effort to verify the authenticity of the archive.  For a detached GPG signature file this would be done with the @code{gpg --verify} command."
 msgstr "Если авторы пакета программного обеспечения преоставляют криптографическую подпись для архива релиза, выполните проверку аутентичности архива. Для отдельного файла GPG-подписи это можно сделать командой @code{gpg --verify}."
 
 #. type: enumerate
-#: doc/contributing.texi:858
+#: doc/contributing.texi:921
 msgid "Take some time to provide an adequate synopsis and description for the package.  @xref{Synopses and Descriptions}, for some guidelines."
 msgstr "Потратьте немного времени, чтобы предоставить адекватное краткое описание и полное описание пакета. Смотрите @xref{Synopses and Descriptions} для подробностей."
 
 #. type: enumerate
-#: doc/contributing.texi:863
+#: doc/contributing.texi:926
 msgid "Run @code{guix lint @var{package}}, where @var{package} is the name of the new or modified package, and fix any errors it reports (@pxref{Invoking guix lint})."
 msgstr "Запустите @code{guix lint @var{package}}, где @var{package} - это имя нового изменённого пакета, и устраните любые ошибки из отчёта (@pxref{Invoking guix lint})."
 
 #. type: enumerate
-#: doc/contributing.texi:867
+#: doc/contributing.texi:930
 msgid "Make sure the package builds on your platform, using @code{guix build @var{package}}."
 msgstr "Убедитесь, что пакет собирается на вашей платформе, используя @code{guix build @var{package}}."
 
 #. type: enumerate
-#: doc/contributing.texi:874
+#: doc/contributing.texi:937
 msgid "We recommend you also try building the package on other supported platforms.  As you may not have access to actual hardware platforms, we recommend using the @code{qemu-binfmt-service-type} to emulate them.  In order to enable it, add the following service to the list of services in your @code{operating-system} configuration:"
 msgstr "Мы рекомендуем вам также попробовать собрать пакет под другими поддерживаемыми платформами. Возможно, вы не имеете доступа к современным аппаратным платформам, тогда мы рекомендуем использовать @code{qemu-binfmt-service-type}, чтобы эмулировать их. Чтобы обеспечить это, добавьте следующий сервис в конфигурацию @code{operating-system}:"
 
 #. type: lisp
-#: doc/contributing.texi:880
+#: doc/contributing.texi:943
 #, no-wrap
 msgid ""
 "(service qemu-binfmt-service-type\n"
@@ -1315,17 +1434,17 @@ msgstr ""
 "   (guix-support? #t)))\n"
 
 #. type: enumerate
-#: doc/contributing.texi:883
+#: doc/contributing.texi:946
 msgid "Then reconfigure your system."
 msgstr "И тогда запустите переконфигурирование системы."
 
 #. type: enumerate
-#: doc/contributing.texi:888
+#: doc/contributing.texi:951
 msgid "You can then build packages for different platforms by specifying the @code{--system} option.  For example, to build the \"hello\" package for the armhf, aarch64, or mips64 architectures, you would run the following commands, respectively:"
 msgstr "Также можно собирать пакеты под различные платформы, обозначив опцию @code{--system}. Например, чтобы собрать пакет \"hello\" для архитектур armhf, aarch64, или mips64 вы должны выполнить соответственно следующее:"
 
 #. type: example
-#: doc/contributing.texi:892
+#: doc/contributing.texi:955
 #, no-wrap
 msgid ""
 "guix build --system=armhf-linux --rounds=2 hello\n"
@@ -1337,363 +1456,360 @@ msgstr ""
 "guix build --system=mips64el-linux --rounds=2 hello\n"
 
 #. type: cindex
-#: doc/contributing.texi:895
+#: doc/contributing.texi:958
 #, no-wrap
 msgid "bundling"
 msgstr "сборка"
 
 #. type: enumerate
-#: doc/contributing.texi:898
+#: doc/contributing.texi:961
 msgid "Make sure the package does not use bundled copies of software already available as separate packages."
 msgstr "Убедитесь, что пакет не использует связанные копии программ, которые уже доступны как отдельные пакеты."
 
 #. type: enumerate
-#: doc/contributing.texi:907
+#: doc/contributing.texi:970
 msgid "Sometimes, packages include copies of the source code of their dependencies as a convenience for users.  However, as a distribution, we want to make sure that such packages end up using the copy we already have in the distribution, if there is one.  This improves resource usage (the dependency is built and stored only once), and allows the distribution to make transverse changes such as applying security updates for a given software package in a single place and have them affect the whole system---something that bundled copies prevent."
 msgstr "Иногда пакеты включают копии исходных кодов своих зависимостей, исходя из удобства для пользователей. Однако как дистрибутив, мы должны убедиться, что подобные пакеты ставятся, используя копию, которую мы уже имеем в дистрибутиве, если таковая имеется. Это улучшает использование ресурсов (зависимость собирается и сохраняется один раз) и позволяет дистрибутиву производить поперечные изменения, как например, применение обновлений безопасности для поставляемого пакета программного обеспечения в одном месте, и эти изменения будут иметь силу во всей системе, устраняя проблему лишних копий."
 
 #. type: enumerate
-#: doc/contributing.texi:916
+#: doc/contributing.texi:979
 msgid "Take a look at the profile reported by @command{guix size} (@pxref{Invoking guix size}).  This will allow you to notice references to other packages unwillingly retained.  It may also help determine whether to split the package (@pxref{Packages with Multiple Outputs}), and which optional dependencies should be used.  In particular, avoid adding @code{texlive} as a dependency: because of its extreme size, use @code{texlive-tiny} or @code{texlive-union} instead."
 msgstr "Просмотрите отчеты  @command{guix size} (@pxref{Invoking guix size}). Это позволит найти связь с другими пакетами, сохранившуюся без необходимости. Это также позволяет решить, как разделить пакет (@pxref{Packages with Multiple Outputs}) и какие должны использоваться опциональные зависимости. В частности, это способ избежать использование большого @code{texlive} как зависимости и использовать @code{texlive-tiny} или @code{texlive-union} вместо него."
 
 #. type: enumerate
-#: doc/contributing.texi:921
+#: doc/contributing.texi:984
 msgid "For important changes, check that dependent package (if applicable) are not affected by the change; @code{guix refresh --list-dependent @var{package}} will help you do that (@pxref{Invoking guix refresh})."
 msgstr "Для важных изменений проверьте, что зависимости пакета (если они есть) не затронуты изменениями. @code{guix refresh --list-dependent @var{package}} поможет вам сделать это (@pxref{Invoking guix refresh})."
 
 #. type: cindex
-#: doc/contributing.texi:923
+#: doc/contributing.texi:986
 #, no-wrap
 msgid "branching strategy"
 msgstr "стратегия бренчей"
 
 #. type: cindex
-#: doc/contributing.texi:924
+#: doc/contributing.texi:987
 #, no-wrap
 msgid "rebuild scheduling strategy"
 msgstr "стратегия планирования пересборки"
 
 #. type: enumerate
-#: doc/contributing.texi:927
+#: doc/contributing.texi:990
 msgid "Depending on the number of dependent packages and thus the amount of rebuilding induced, commits go to different branches, along these lines:"
 msgstr "В зависимости от числа пакетов зависимостей и, как следствие, числа вызываемых пересборок, коммиты отправляются в разные бренчи следующим образом:"
 
 #. type: item
-#: doc/contributing.texi:929
+#: doc/contributing.texi:992
 #, no-wrap
 msgid "300 dependent packages or less"
 msgstr "300 пакетов зависимостей или менее"
 
 #. type: table
-#: doc/contributing.texi:931
+#: doc/contributing.texi:994
 msgid "@code{master} branch (non-disruptive changes)."
 msgstr "бренч @code{master} (не разрушающие изменения)."
 
 #. type: item
-#: doc/contributing.texi:932
+#: doc/contributing.texi:995
 #, no-wrap
 msgid "between 300 and 1,200 dependent packages"
 msgstr "от 300 до 1200 пакетов зависимостей"
 
 #. type: table
-#: doc/contributing.texi:937
+#: doc/contributing.texi:1000
 msgid "@code{staging} branch (non-disruptive changes).  This branch is intended to be merged in @code{master} every 3 weeks or so.  Topical changes (e.g., an update of the GNOME stack) can instead go to a specific branch (say, @code{gnome-updates})."
 msgstr "бренч @code{staging} (не разрушающие изменения). Этот бренч предназначен для включения в @code{master} каждые 3 недели (примерно). Тематические изменения (т.е. обновление стека GNOME) могут отправляться в специальный бренч, скажем, @code{gnome-updates}."
 
 #. type: item
-#: doc/contributing.texi:938
+#: doc/contributing.texi:1001
 #, no-wrap
 msgid "more than 1,200 dependent packages"
 msgstr "более 1200 пакетов зависимостей"
 
 #. type: table
-#: doc/contributing.texi:942
+#: doc/contributing.texi:1005
 msgid "@code{core-updates} branch (may include major and potentially disruptive changes).  This branch is intended to be merged in @code{master} every 2.5 months or so."
 msgstr "бренч @code{core-updates} (может включать главные и потенциально разрушительные изменения). Этот бренч предназначен для включения в  @code{master} каждые 2,5 месяца примерно."
 
 #. type: enumerate
-#: doc/contributing.texi:949
+#: doc/contributing.texi:1012
 #, fuzzy
 #| msgid "All these branches are @uref{https://hydra.gnu.org/project/gnu, tracked by our build farm} and merged into @code{master} once everything has been successfully built.  This allows us to fix issues before they hit users, and to reduce the window during which pre-built binaries are not available."
 msgid "All these branches are @uref{@value{SUBSTITUTE-SERVER}, tracked by our build farm} and merged into @code{master} once everything has been successfully built.  This allows us to fix issues before they hit users, and to reduce the window during which pre-built binaries are not available."
 msgstr "Все эти бренчи @uref{https://hydra.gnu.org/project/gnu, размещаются на ферме сборки} и включаются в @code{master} после первой удачной сборки. Это позволяет нам исправлять проблемы перед тем, как они дойдут до пользователей, и сократить окно, в течение которого собранные бинарники не доступны."
 
 #. type: enumerate
-#: doc/contributing.texi:956
+#: doc/contributing.texi:1019
 msgid "Generally, branches other than @code{master} are considered @emph{frozen} if there has been a recent evaluation, or there is a corresponding @code{-next} branch.  Please ask on the mailing list or IRC if unsure where to place a patch."
 msgstr "Обычно бренчи, отличные от @code{master} считаются @emph{замороженными}, если существует поседнее определение или соответствующий бренч @code{-next}. Пожалуйста, задайте вопрос в рассылках или IRC, если не уверенны куда разместить патч."
 
 #. type: cindex
-#: doc/contributing.texi:958
+#: doc/contributing.texi:1021
 #, no-wrap
 msgid "determinism, of build processes"
 msgstr "детерминизм, процесса сборки"
 
 #. type: cindex
-#: doc/contributing.texi:959
+#: doc/contributing.texi:1022
 #, no-wrap
 msgid "reproducible builds, checking"
 msgstr "воспроизводимые сорки, проверка"
 
 #. type: enumerate
-#: doc/contributing.texi:963
+#: doc/contributing.texi:1026
 msgid "Check whether the package's build process is deterministic.  This typically means checking whether an independent build of the package yields the exact same result that you obtained, bit for bit."
 msgstr "Проверьте, является ли процесс сборки пакета детеминистическим. Это обычно означает необходимость проверки того, что независимая сборка пакета производит точно такой же результат, которым вы располагаете, бит к биту."
 
 #. type: enumerate
-#: doc/contributing.texi:966
+#: doc/contributing.texi:1029
 msgid "A simple way to do that is by building the same package several times in a row on your machine (@pxref{Invoking guix build}):"
 msgstr "Простой способ выполнить это - собрать такой же пакет несколько раз подряд на вашей машине (@pxref{Invoking guix build}):"
 
 #. type: example
-#: doc/contributing.texi:969
+#: doc/contributing.texi:1032
 #, no-wrap
 msgid "guix build --rounds=2 my-package\n"
 msgstr "guix build --rounds=2 my-package\n"
 
 #. type: enumerate
-#: doc/contributing.texi:973
+#: doc/contributing.texi:1036
 msgid "This is enough to catch a class of common non-determinism issues, such as timestamps or randomly-generated output in the build result."
 msgstr "Этого достаточно, чтобы отловить привычный набор проблем, нарушающих детерминизм, как например, отпечаток времени или случайно генерируемый выход на результате сборке."
 
 #. type: enumerate
-#: doc/contributing.texi:983
+#: doc/contributing.texi:1046
 msgid "Another option is to use @command{guix challenge} (@pxref{Invoking guix challenge}).  You may run it once the package has been committed and built by @code{@value{SUBSTITUTE-SERVER}} to check whether it obtains the same result as you did.  Better yet: Find another machine that can build it and run @command{guix publish}.  Since the remote build machine is likely different from yours, this can catch non-determinism issues related to the hardware---e.g., use of different instruction set extensions---or to the operating system kernel---e.g., reliance on @code{uname} or @file{/proc} files."
 msgstr "Другой способ --- использовать @command{guix challenge} (@pxref{Invoking guix challenge}). Можно запустить это один раз, когда коммит пакета был отправлен, и собрать с помощью @code{@value{SUBSTITUTE-SERVER}}, чтобы проверить, что это даёт результат такой же, как у вас.  Ещё лучше найти другую машину, на которой можно собрать это и выполнить @command{guix publish}. Так как другая удалённая машина дл сборки отличается от вашей, это может выявить проблемы, нарушающие детерминизм, связанные с аппаратным обеспечением, то есть вызванные использованием различных расширений ассемблера или другого ядра операционной системы, то есть касательно файлов @code{uname} или @file{/proc}."
 
 #. type: enumerate
-#: doc/contributing.texi:989
+#: doc/contributing.texi:1052
 msgid "When writing documentation, please use gender-neutral wording when referring to people, such as @uref{https://en.wikipedia.org/wiki/Singular_they, singular ``they''@comma{} ``their''@comma{} ``them''}, and so forth."
 msgstr "При написании документации, пожалуйста, используйте нейтральную по гендеру лексику, когда речь идёт о людях, как например, тут @uref{https://en.wikipedia.org/wiki/Singular_they, singular \"they\"@comma{} \"their\"@comma{} \"them\"} и т.д."
 
 #. type: enumerate
-#: doc/contributing.texi:993
+#: doc/contributing.texi:1056
 msgid "Verify that your patch contains only one set of related changes.  Bundling unrelated changes together makes reviewing harder and slower."
 msgstr "Проверьте, что ваш патч содержит изменения, связанные только с одной темой. Связывая вместе изменения, касающиеся различных тем, делает обзор сложным и медленным."
 
 #. type: enumerate
-#: doc/contributing.texi:996
+#: doc/contributing.texi:1059
 msgid "Examples of unrelated changes include the addition of several packages, or a package update along with fixes to that package."
 msgstr "Примеры несвязанных изменений включают, в том числе, добавление некоторых пакетов или обновление пакета вместе с исправлениями в этом пакете."
 
 #. type: enumerate
-#: doc/contributing.texi:1001
+#: doc/contributing.texi:1064
 msgid "Please follow our code formatting rules, possibly running the @command{etc/indent-code.el} script to do that automatically for you (@pxref{Formatting Code})."
 msgstr "Пожалуйста, следуйте нашим правилам форматирования кода, по возможности запуская скрипт @command{etc/indent-code.el}, который сделает это автоматически (@pxref{Formatting Code})."
 
 #. type: enumerate
-#: doc/contributing.texi:1009
+#: doc/contributing.texi:1072
 msgid "When possible, use mirrors in the source URL (@pxref{Invoking guix download}).  Use reliable URLs, not generated ones.  For instance, GitHub archives are not necessarily identical from one generation to the next, so in this case it's often better to clone the repository.  Don't use the @command{name} field in the URL: it is not very useful and if the name changes, the URL will probably be wrong."
 msgstr "Если это возможно, используйте зеркала при указании URL исходников (@pxref{Invoking guix download}). Используйте надёжные URL'ы, а не сгенерированные. Например, архивы GitHub не являются идентичными между поколениями, так что в этом случае часто лучше клонировать репозиторий. Не используйте поле @command{name} в URL, это не очень удобно: если имя изменится, тогда URL будет неправильным."
 
 #. type: enumerate
-#: doc/contributing.texi:1013
+#: doc/contributing.texi:1076
 msgid "Check if Guix builds (@pxref{Building from Git}) and address the warnings, especially those about use of undefined symbols."
 msgstr ""
 
 #. type: enumerate
-#: doc/contributing.texi:1016
+#: doc/contributing.texi:1079
 msgid "Make sure your changes do not break Guix and simulate a @code{guix pull} with:"
 msgstr "Убедитесь, что ваши изменения не ломают Guix и имитируйте @code{guix pull} вместе с:"
 
 #. type: example
-#: doc/contributing.texi:1018
+#: doc/contributing.texi:1081
 #, no-wrap
 msgid "guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master\n"
 msgstr "guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master\n"
 
 #. type: Plain text
-#: doc/contributing.texi:1029
+#: doc/contributing.texi:1092
 msgid "When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as a subject.  You may use your email client or the @command{git send-email} command (@pxref{Sending a Patch Series}).  We prefer to get patches in plain text messages, either inline or as MIME attachments.  You are advised to pay attention if your email client changes anything like line breaks or indentation which could potentially break the patches."
 msgstr "Когда отправляете патч в рассылку, используйте @samp{[PATCH] @dots{}} в теме письма. Можно пользоваться почтовым клиентом или командой @command{git send-email} (@pxref{Sending a Patch Series}). Мы предпочитаем получать патчи в виде простых текстовых сообщений внутри текста или отдельным вложением MIME. Рекомендуется уделять внимание вопросу, не изменяет ли почтовый клиент что-либо как символы новой строки или отступы, так как это потенциально может нарушить код патча."
 
 #. type: Plain text
-#: doc/contributing.texi:1032
+#: doc/contributing.texi:1095
 msgid "When a bug is resolved, please close the thread by sending an email to @email{@var{NNN}-done@@debbugs.gnu.org}."
 msgstr "Когда баг исправлен, пожалуйста, закройте тему, отправив сообщение на @email{@var{NNN}-done@@debbugs.gnu.org}."
 
 #. type: anchor{#1}
-#: doc/contributing.texi:1033 doc/contributing.texi:1035
+#: doc/contributing.texi:1096 doc/contributing.texi:1098
 #, no-wrap
 msgid "Sending a Patch Series"
 msgstr "Отправка пакета исправлений"
 
 #. type: cindex
-#: doc/contributing.texi:1035
+#: doc/contributing.texi:1098
 #, no-wrap
 msgid "patch series"
 msgstr "группы патчей"
 
 #. type: code{#1}
-#: doc/contributing.texi:1036
+#: doc/contributing.texi:1099
 #, no-wrap
 msgid "git send-email"
 msgstr "git send-email"
 
 #. type: code{#1}
-#: doc/contributing.texi:1037
+#: doc/contributing.texi:1100
 #, no-wrap
 msgid "git-send-email"
 msgstr "git-send-email"
 
 #. type: Plain text
-#: doc/contributing.texi:1047
+#: doc/contributing.texi:1110
 msgid "When sending a patch series (e.g., using @code{git send-email}), please first send one message to @email{guix-patches@@gnu.org}, and then send subsequent patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure they are kept together.  See @uref{https://debbugs.gnu.org/Advanced.html, the Debbugs documentation} for more information.  You can install @command{git send-email} with @command{guix install git:send-email}."
 msgstr "При отправке набора патчей (например, используя @code{git send-email}), отправьте сначала одно сообщение в рассылку @email{guix-patches@@gnu.org}, а затем отправьте последующие патчи по адресу @email{@var{NNN}@@debbugs.gnu.org}, чтобы они были объединены. Подробные сведения см. в разделе @uref{https://debbugs.gnu.org/Advanced.html, Документация по Debbugs}. Команду @command{git send-email} можно установить с помощью @command{guix install git:send-email}."
 
 #. type: cindex
-#: doc/contributing.texi:1051
+#: doc/contributing.texi:1114
 #, no-wrap
 msgid "bug reports, tracking"
 msgstr "сообщения об ошибке, отслеживание"
 
 #. type: cindex
-#: doc/contributing.texi:1052
+#: doc/contributing.texi:1115
 #, no-wrap
 msgid "patch submissions, tracking"
 msgstr "отправка патча, отслеживание"
 
 #. type: cindex
-#: doc/contributing.texi:1053
+#: doc/contributing.texi:1116
 #, no-wrap
 msgid "issue tracking"
 msgstr "отслеживание заявок об ошибках"
 
 #. type: cindex
-#: doc/contributing.texi:1054
+#: doc/contributing.texi:1117
 #, no-wrap
 msgid "Debbugs, issue tracking system"
 msgstr "Debbugs, система отслеживания ошибок"
 
 #. type: Plain text
-#: doc/contributing.texi:1061
+#: doc/contributing.texi:1124
 msgid "Bug reports and patch submissions are currently tracked using the Debbugs instance at @uref{https://bugs.gnu.org}.  Bug reports are filed against the @code{guix} ``package'' (in Debbugs parlance), by sending email to @email{bug-guix@@gnu.org}, while patch submissions are filed against the @code{guix-patches} package by sending email to @email{guix-patches@@gnu.org} (@pxref{Submitting Patches})."
 msgstr "Отчёты об ошибках и предложенные исправления сейчас отслеживаются с помощью Debbugs на веб-сайте @uref{https://bugs.gnu.org}. Отчёты об ошибках, относящиеся к пакету @code{guix} (на языке Debbugs), отправляйте по адресу @email{bug-guix@@gnu.org}, а предлагаемые исправления для пакета @code{guix-patches} — по адресу @email{guix-patches@@gnu.org} (@pxref{Submitting Patches})."
 
 #. type: Plain text
-#: doc/contributing.texi:1064
+#: doc/contributing.texi:1127
 msgid "A web interface (actually @emph{two} web interfaces!) are available to browse issues:"
 msgstr "Для просмотра вопросов доступен веб-интерфейс (на самом деле даже @emph{два} веб-интерфейса):"
 
 #. type: itemize
-#: doc/contributing.texi:1068
-#, fuzzy
-#| msgid "@url{http://gnupg.org/, GNU libgcrypt};"
+#: doc/contributing.texi:1131
 msgid "@url{https://bugs.gnu.org/guix} lists bug reports;"
-msgstr "@url{http://gnupg.org/, GNU libgcrypt} списки отчетов об ошибках;"
+msgstr "@url{https://gnupg.org/, GNU libgcrypt} списки отчётов об ошибках;"
 
 #. type: itemize
-#: doc/contributing.texi:1070
+#: doc/contributing.texi:1133
 msgid "@url{https://bugs.gnu.org/guix-patches} lists patch submissions."
 msgstr "@url{https://bugs.gnu.org/guix-patches} списки патчей на рассмотрении."
 
 #. type: Plain text
-#: doc/contributing.texi:1080
+#: doc/contributing.texi:1143
 msgid "You can also access both of these @i{via} the (nicer)  @url{https://issues.guix.gnu.org} interface@footnote{The web interface at @url{https://issues.guix.gnu.org} is powered by Mumi, a nice piece of software written in Guile, and you can help! See @url{https://git.elephly.net/gitweb.cgi?p=software/mumi.git}.}.  To view discussions related to issue number @var{n}, go to @indicateurl{https://issues.guix.gnu.org/issue/@var{n}} or @indicateurl{https://bugs.gnu.org/@var{n}}."
 msgstr "Вы также можете получить доступ к обоим @i{через} (более приятный) @url{https://issues.guix.gnu.org} интерфейс @footnote{Веб-интерфейс @url{https://issues.guix.gnu.org} работает на Mumi, прекрасном программном обеспечении, написанном на Guile, и вы можете помочь! См. @url{https://git.elephly.net/gitweb.cgi?p=software/mumi.git}.}. Чтобы просмотреть обсуждения, связанные с проблемой номер @var{n}, перейдите на страницу @indicateurl{https://issues.guix.gnu.org/issue/@var{n}} or @indicateurl{https://bugs.gnu.org/@var{n}}."
 
 #. type: Plain text
-#: doc/contributing.texi:1083
+#: doc/contributing.texi:1146
 msgid "If you use Emacs, you may find it more convenient to interact with issues using @file{debbugs.el}, which you can install with:"
 msgstr "Если вы используете Emacs, вам может быть удобнее взаимодействовать с проблемами при помощи @file{debbugs.el}, который вы можете установить с помощью:"
 
 #. type: example
-#: doc/contributing.texi:1086
-#, fuzzy, no-wrap
-#| msgid "guix install emacs-guix\n"
+#: doc/contributing.texi:1149
+#, no-wrap
 msgid "guix install emacs-debbugs\n"
-msgstr "guix install emacs-guix\n"
+msgstr "guix install emacs-debbugs\n"
 
 #. type: Plain text
-#: doc/contributing.texi:1089
+#: doc/contributing.texi:1152
 msgid "For example, to list all open issues on @code{guix-patches}, hit:"
 msgstr "Например, чтбы уввидеть все открытые заявки на @code{guix-patches}, введите:"
 
 #. type: example
-#: doc/contributing.texi:1092
+#: doc/contributing.texi:1155
 #, no-wrap
 msgid "@kbd{C-u} @kbd{M-x} debbugs-gnu @kbd{RET} @kbd{RET} guix-patches @kbd{RET} n y\n"
 msgstr "@kbd{C-u} @kbd{M-x} debbugs-gnu @kbd{RET} @kbd{RET} guix-patches @kbd{RET} n y\n"
 
 #. type: Plain text
-#: doc/contributing.texi:1096
+#: doc/contributing.texi:1159
 msgid "@xref{Top,,, debbugs-ug, Debbugs User Guide}, for more information on this nifty tool!"
 msgstr "@xref{Invoking guix pack} для подробной информации об этом полезном инструменте."
 
 #. type: cindex
-#: doc/contributing.texi:1100
+#: doc/contributing.texi:1163
 #, no-wrap
 msgid "commit access, for developers"
 msgstr "доступ для отправки коммитов, для разработчиков"
 
 #. type: Plain text
-#: doc/contributing.texi:1104
+#: doc/contributing.texi:1167
 msgid "For frequent contributors, having write access to the repository is convenient.  When you deem it necessary, consider applying for commit access by following these steps:"
 msgstr "Для постоянных участников удобно иметь доступ для записи в хранилище. Когда вы сочтете это необходимым, рассмотрите возможность подачи заявки на коммит, выполнив следующие действия:"
 
 #. type: enumerate
-#: doc/contributing.texi:1113
+#: doc/contributing.texi:1176
 msgid "Find three committers who would vouch for you.  You can view the list of committers at @url{https://savannah.gnu.org/project/memberlist.php?group=guix}.  Each of them should email a statement to @email{guix-maintainers@@gnu.org} (a private alias for the collective of maintainers), signed with their OpenPGP key."
 msgstr "Найдите трех коммиттеров, которые поручаются за вас. Вы можете просмотреть список коммиттеров по адресу @url{https://savannah.gnu.org/project/memberlist.php?group=guix}. Каждый из них должен отправить заявление по электронной почте на адрес @email{guix-maintainers@@gnu.org} (личный псевдоним коллектива сопровождающих), подписанный ключом OpenPGP."
 
 #. type: enumerate
-#: doc/contributing.texi:1119
+#: doc/contributing.texi:1182
 msgid "Committers are expected to have had some interactions with you as a contributor and to be able to judge whether you are sufficiently familiar with the project's practices.  It is @emph{not} a judgment on the value of your work, so a refusal should rather be interpreted as ``let's try again later''."
 msgstr "Ожидается, что коммиттеры взаимодействовали с вами как c участником и могли судить, достаточно ли вы знакомы с проектом. Это @emph{не} суждение о ценности вашей работы, поэтому отказ следует скорее интерпретировать как «давайте попробуем позже»."
 
 #. type: enumerate
-#: doc/contributing.texi:1126
+#: doc/contributing.texi:1189
 msgid "Send @email{guix-maintainers@@gnu.org} a message stating your intent, listing the three committers who support your application, signed with the OpenPGP key you will use to sign commits, and giving its fingerprint (see below).  See @uref{https://emailselfdefense.fsf.org/en/}, for an introduction to public-key cryptography with GnuPG."
 msgstr "Отправьте @email{guix-keepers@@gnu.org} сообщение с указанием ваших намерений, перечисляя трех коммиттеров, поддерживающих вашу заявку, подписанных ключом OpenPGP, который вы будете использовать для подписания коммитов, и указав свой отпечаток (смотри ниже). Ознакомся с @uref{https://emailselfdefense.fsf.org/ru/}, чтобы познакомиться с криптографией с открытым ключом с помощью GnuPG."
 
 #. type: enumerate
-#: doc/contributing.texi:1130
+#: doc/contributing.texi:1193
 msgid "Maintainers ultimately decide whether to grant you commit access, usually following your referrals' recommendation."
 msgstr "Маинтайнеры решают, предоставлять ли вам доступ к коммитам, обычно следуя рекомендациям ваших рефералов."
 
 #. type: enumerate
-#: doc/contributing.texi:1136
+#: doc/contributing.texi:1199
 msgid "If and once you've been given access, please send a message to @email{guix-devel@@gnu.org} to say so, again signed with the OpenPGP key you will use to sign commits (do that before pushing your first commit).  That way, everyone can notice and ensure you control that OpenPGP key."
 msgstr "Получив доступ, пожалуйста, отправьте сообщение на адрес @email{guix-devel@@gnu.org}, чтобы снова подписать его ключом OpenPGP, который вы будете использовать для подписания коммитов (сделайте это перед отправкой первого коммита). Таким образом, каждый может заметить и убедиться, что это ваш ключ OpenPGP."
 
 #. type: enumerate
-#: doc/contributing.texi:1142
+#: doc/contributing.texi:1205
 msgid "Make sure to read the rest of this section and... profit!"
 msgstr "Обязательно прочтите остальную часть этого раздела."
 
 #. type: quotation
-#: doc/contributing.texi:1148
+#: doc/contributing.texi:1211
 msgid "Maintainers are happy to give commit access to people who have been contributing for some time and have a track record---don't be shy and don't underestimate your work!"
 msgstr "Маинтейнеры с радостью предоставят доступ к коммитам людям, которые внесли свой вклад в течение некоторого времени и имеют послужной список - не стесняйтесь и не недооценивайте свою работу!"
 
 #. type: quotation
-#: doc/contributing.texi:1152
+#: doc/contributing.texi:1215
 msgid "However, note that the project is working towards a more automated patch review and merging system, which, as a consequence, may lead us to have fewer people with commit access to the main repository.  Stay tuned!"
 msgstr "Тем не менее, обратите внимание, что проект работает над созданием более автоматизированной системы проверки и объединения исправлений, что, как следствие, может привести к тому, что у нас будет меньше людей, имеющих доступ к главному репозиторию. Будьте на связи!"
 
 #. type: Plain text
-#: doc/contributing.texi:1157
+#: doc/contributing.texi:1220
 msgid "If you get commit access, please make sure to follow the policy below (discussions of the policy can take place on @email{guix-devel@@gnu.org})."
 msgstr "Если вы получили доступ к коммиту, пожалуйста, следуйте приведенной ниже политике (обсуждение политики может проходить по адресу @email{guix-devel@@gnu.org})."
 
 #. type: Plain text
-#: doc/contributing.texi:1162
+#: doc/contributing.texi:1225
 msgid "Non-trivial patches should always be posted to @email{guix-patches@@gnu.org} (trivial patches include fixing typos, etc.).  This mailing list fills the patch-tracking database (@pxref{Tracking Bugs and Patches})."
 msgstr "Нетривиальные патчи всегда должны публиковаться на @email{guix-patches@@gnu.org} (тривиальные патчи включают исправление опечаток и т.д.). Этот список рассылки заполняет базу данных отслеживания патчей (@pxref{Tracking Bugs and Patches})."
 
 #. type: Plain text
-#: doc/contributing.texi:1171
+#: doc/contributing.texi:1234
 msgid "For patches that just add a new package, and a simple one, it's OK to commit, if you're confident (which means you successfully built it in a chroot setup, and have done a reasonable copyright and license auditing).  Likewise for package upgrades, except upgrades that trigger a lot of rebuilds (for example, upgrading GnuTLS or GLib).  We have a mailing list for commit notifications (@email{guix-commits@@gnu.org}), so people can notice.  Before pushing your changes, make sure to run @code{git pull --rebase}."
 msgstr "Для патчей, которые просто добавляют новый пакет или внсит небольшие изменения считается нормальным отправить коммит, если вы уверены (что означает, что вы успешно встроили его в настройку chroot и провели разумный аудит авторских прав и лицензий). Аналогично для обновлений пакетов, за исключением обновлений, которые вызывают много перестроений (например, обновление GnuTLS или GLib). У нас есть список рассылки для уведомлений о коммитах (@email{guix-commits@@gnu.org}), так что люди могут это заметить. Перед отправкой изменений обязательно запустите @code{git pull --rebase}."
 
 #. type: Plain text
-#: doc/contributing.texi:1177
+#: doc/contributing.texi:1240
 msgid "All commits that are pushed to the central repository on Savannah must be signed with an OpenPGP key, and the public key should be uploaded to your user account on Savannah and to public key servers, such as @code{keys.openpgp.org}.  To configure Git to automatically sign commits, run:"
 msgstr "Все коммиты, которые передаются в центральный репозиторий в Саванне, должны быть подписаны ключом OpenPGP, а открытый ключ должен быть загружен в вашу учетную запись пользователя на Саванне и на серверы открытых ключей, такие как @code{keys.openpgp.org}. Чтобы настроить Git для автоматической подписи коммитов, запустите:"
 
 #. type: example
-#: doc/contributing.texi:1181
+#: doc/contributing.texi:1244
 #, no-wrap
 msgid ""
 "git config commit.gpgsign true\n"
@@ -1703,33 +1819,33 @@ msgstr ""
 "git config user.signingkey CABBA6EA1DC0FF33\n"
 
 #. type: Plain text
-#: doc/contributing.texi:1186
+#: doc/contributing.texi:1249
 msgid "You can prevent yourself from accidentally pushing unsigned commits to Savannah by using the pre-push Git hook called located at @file{etc/git/pre-push}:"
 msgstr "Вы можете предотвратить случайную отправку неподписанных коммитов в Саванну с помощью pre-push Git hook, расположенной в @file{etc/git/pre-push}:"
 
 #. type: example
-#: doc/contributing.texi:1189
+#: doc/contributing.texi:1252
 #, no-wrap
 msgid "cp etc/git/pre-push .git/hooks/pre-push\n"
 msgstr "cp etc/git/pre-push .git/hooks/pre-push\n"
 
 #. type: Plain text
-#: doc/contributing.texi:1195
+#: doc/contributing.texi:1258
 msgid "When pushing a commit on behalf of somebody else, please add a @code{Signed-off-by} line at the end of the commit log message---e.g., with @command{git am --signoff}.  This improves tracking of who did what."
 msgstr "Когда вы отправляете коммит от имени кого-то другого, добавьте строку @code{Signed-off-by} в конце сообщения коммит лога---например, с @command{git am --signoff}. Это улучшает отслеживание того, кто что сделал."
 
 #. type: Plain text
-#: doc/contributing.texi:1200
+#: doc/contributing.texi:1263
 msgid "For anything else, please post to @email{guix-patches@@gnu.org} and leave time for a review, without committing anything (@pxref{Submitting Patches}).  If you didn’t receive any reply after two weeks, and if you're confident, it's OK to commit."
 msgstr "Для чего-либо еще, пожалуйста, отправьте сообщение на @email{guix-patches@@gnu.org} и оставьте время для обзора, ничего не коммитя (@pxref{Submitting Patches}). Если вы не получили никакого ответа через две недели, и если вы уверены, что все в порядке, будь нормальным совершить коммит."
 
 #. type: Plain text
-#: doc/contributing.texi:1203
+#: doc/contributing.texi:1266
 msgid "That last part is subject to being adjusted, allowing individuals to commit directly on non-controversial changes on parts they’re familiar with."
 msgstr "Эта последняя часть подлежит корректировке, что позволяет отдельным лицам вносить непосредственные изменения в не противоречивые изменения в тех частях, с которыми они знакомы."
 
 #. type: Plain text
-#: doc/contributing.texi:1208
+#: doc/contributing.texi:1271
 msgid "One last thing: the project keeps moving forward because committers not only push their own awesome changes, but also offer some of their time @emph{reviewing} and pushing other people's changes.  As a committer, you're welcome to use your expertise and commit rights to help other contributors, too!"
 msgstr "И последнее: проект продолжает двигаться вперед, потому что коммиттеры не только вносят свои собственные потрясающие изменения, но также уделяют свое время на @emph{reviewing} и продвижение изменений других людей. Как коммиттер, вы можете использовать свой опыт и передавать права, чтобы помочь и другим участникам!"
 
@@ -1739,7 +1855,7 @@ msgid "@documentencoding UTF-8"
 msgstr "@documentencoding UTF-8"
 
 #. type: title
-#: doc/guix.texi:7 doc/guix.texi:103
+#: doc/guix.texi:7 doc/guix.texi:107
 #, no-wrap
 msgid "GNU Guix Reference Manual"
 msgstr "Руководство по GNU Guix"
@@ -1751,1835 +1867,1834 @@ msgid "version.texi"
 msgstr "version-ru.texi"
 
 #. type: copying
-#: doc/guix.texi:76
-msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017, 2019 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018, 2019 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018, 2019 Marius Bakke@* Copyright @copyright{} 2017, 2019, 2020 Hartmut Goebel@* Copyright @copyright{} 2017, 2019, 2020 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018, 2019 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@* Copyright @copyright{} 2019 Ivan Petkov@* Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019 Guillaume Le Vaillant@* Copyright @copyright{} 2020 Leo Prikler@* Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Damien Cassou@*"
+#: doc/guix.texi:80
+#, fuzzy
+#| msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017, 2019 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018, 2019 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018, 2019 Marius Bakke@* Copyright @copyright{} 2017, 2019, 2020 Hartmut Goebel@* Copyright @copyright{} 2017, 2019, 2020 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018, 2019 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@* Copyright @copyright{} 2019 Ivan Petkov@* Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019 Guillaume Le Vaillant@* Copyright @copyright{} 2020 Leo Prikler@* Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Damien Cassou@*"
+msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017, 2019, 2020 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018, 2019 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018, 2019, 2020 Marius Bakke@* Copyright @copyright{} 2017, 2019, 2020 Hartmut Goebel@* Copyright @copyright{} 2017, 2019, 2020 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018, 2019 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@* Copyright @copyright{} 2019 Ivan Petkov@* Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019 Guillaume Le Vaillant@* Copyright @copyright{} 2020 Leo Prikler@* Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Damien Cassou@* Copyright @copyright{} 2020 Jakub Kądziołka@* Copyright @copyright{} 2020 Jack Hill@* Copyright @copyright{} 2020 Naga Malleswari@* Copyright @copyright{} 2020 Brice Waegeneire@*"
 msgstr "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017, 2019 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018, 2019 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018, 2019 Marius Bakke@* Copyright @copyright{} 2017, 2019, 2020 Hartmut Goebel@* Copyright @copyright{} 2017, 2019, 2020 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018, 2019 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@* Copyright @copyright{} 2019 Ivan Petkov@* Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019 Guillaume Le Vaillant@* Copyright @copyright{} 2020 Leo Prikler@* Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Damien Cassou@*"
 
 #. type: copying
-#: doc/guix.texi:83
+#: doc/guix.texi:87
 msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license is included in the section entitled ``GNU Free Documentation License''."
 msgstr "Разрешено копирование, распространение и/или модификация этого документа на условиях лицензии свободной документации GNU (GNU FDL) версии 1.3 или любой более поздней версии, опубликованной Фондом свободного программного обеспечения (FSF), исключая неизменяемые секции, исключая тексты, размещенные на переплёте и задней стороне обложки. Копия лицензии включена в документ в разделе под названием \"GNU Free Documentation Licens\"."
 
 #. type: dircategory
-#: doc/guix.texi:85
+#: doc/guix.texi:89
 #, no-wrap
 msgid "System administration"
 msgstr "Администрирование системы"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "Guix: (guix)"
 msgstr "Guix: (guix)"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "Manage installed software and system configuration."
 msgstr "Управление установленным ПО и настройка системы"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "guix package: (guix)Invoking guix package"
 msgstr "guix package: (guix)Запуск guix package"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "Installing, removing, and upgrading packages."
 msgstr "Установка, удаление и обновление пакетов"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "guix gc: (guix)Invoking guix gc"
 msgstr "guix gc: (guix)Запуск guix gc"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "Reclaiming unused disk space."
 msgstr "Освобождение неиспользуемого места на диске"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "guix pull: (guix)Invoking guix pull"
 msgstr "guix pull: (guix)Запуск guix pull"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "Update the list of available packages."
 msgstr "Обновление списка доступных пакетов"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "guix system: (guix)Invoking guix system"
 msgstr "guix system: (guix)Запуск guix system"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "Manage the operating system configuration."
 msgstr "Управление конфигурацией ОС"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "guix deploy: (guix)Invoking guix deploy"
 msgstr "guix deploy: (guix)Запуск guix deploy"
 
 #. type: menuentry
-#: doc/guix.texi:93
+#: doc/guix.texi:97
 msgid "Manage operating system configurations for remote hosts."
 msgstr "Управление конфигурациями ОС на удалённых машинах"
 
 #. type: dircategory
-#: doc/guix.texi:95
+#: doc/guix.texi:99
 #, no-wrap
 msgid "Software development"
 msgstr "Разработка программного обеспечения"
 
 #. type: menuentry
-#: doc/guix.texi:100
+#: doc/guix.texi:104
 msgid "guix environment: (guix)Invoking guix environment"
 msgstr "guix environment: (guix)Запуск guix environment"
 
 #. type: menuentry
-#: doc/guix.texi:100
+#: doc/guix.texi:104
 msgid "Building development environments with Guix."
 msgstr "Сборка среды разработки с помощью Guix"
 
 #. type: menuentry
-#: doc/guix.texi:100
+#: doc/guix.texi:104
 msgid "guix build: (guix)Invoking guix build"
 msgstr "guix build: (guix)Запуск guix build"
 
 #. type: menuentry
-#: doc/guix.texi:100
+#: doc/guix.texi:104
 msgid "Building packages."
 msgstr "Сборка пакетов"
 
 #. type: menuentry
-#: doc/guix.texi:100
+#: doc/guix.texi:104
 msgid "guix pack: (guix)Invoking guix pack"
 msgstr "guix pack: (guix)Запуск guix pack"
 
 #. type: menuentry
-#: doc/guix.texi:100
+#: doc/guix.texi:104
 msgid "Creating binary bundles."
 msgstr "Создание бинарных пакетов"
 
 #. type: subtitle
-#: doc/guix.texi:104
+#: doc/guix.texi:108
 #, no-wrap
 msgid "Using the GNU Guix Functional Package Manager"
 msgstr "Использование функционального пакетного менеджера GNU Guix"
 
 #. type: author
-#: doc/guix.texi:105
+#: doc/guix.texi:109
 #, no-wrap
 msgid "The GNU Guix Developers"
 msgstr "Разработчики GNU Guix"
 
 #. type: titlepage
-#: doc/guix.texi:111
+#: doc/guix.texi:115
 msgid "Edition @value{EDITION} @* @value{UPDATED} @*"
 msgstr "Ревизия @value{EDITION} @* @value{UPDATED} @*"
 
 #. type: node
-#: doc/guix.texi:118
+#: doc/guix.texi:122
 #, no-wrap
 msgid "Top"
 msgstr "Top"
 
 #. type: top
-#: doc/guix.texi:119
+#: doc/guix.texi:123
 #, no-wrap
 msgid "GNU Guix"
 msgstr "GNU Guix"
 
 #. type: Plain text
-#: doc/guix.texi:123
+#: doc/guix.texi:127
 msgid "This document describes GNU Guix version @value{VERSION}, a functional package management tool written for the GNU system."
 msgstr "В этом документе описывается GNU Guix версии @value{VERSION} — менеджер пакетов, написанный для системы GNU."
 
 #. type: Plain text
-#: doc/guix.texi:135
+#: doc/guix.texi:139
 msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}), and Russian (@pxref{Top,,, guix.ru, Руководство GNU Guix}).  If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}."
 msgstr "Это руководство доступно также на (упрощённом) китайском языке (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), на французском (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), немецком (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), испанском (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}) и русском (@pxref{Top,,, guix.ru, Руководство по GNU Guix}) языках. Если вы хотите перевести его на свой язык, присоединяйтесь к Проекту переводов @uref{https://translationproject.org/domain/guix-manual.html, Проект переводов}."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:161 doc/guix.texi:328 doc/guix.texi:329
+#: doc/guix.texi:155 doc/guix.texi:165 doc/guix.texi:332 doc/guix.texi:333
 #, no-wrap
 msgid "Introduction"
 msgstr "Введение"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "What is Guix about?"
 msgstr "Что такое Guix?"
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:166 doc/guix.texi:487 doc/guix.texi:488
+#: doc/guix.texi:155 doc/guix.texi:170 doc/guix.texi:491 doc/guix.texi:492
 #, no-wrap
 msgid "Installation"
 msgstr "Установка"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Installing Guix."
 msgstr "Установка Guix."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:181 doc/guix.texi:1812 doc/guix.texi:1813
+#: doc/guix.texi:155 doc/guix.texi:185 doc/guix.texi:1816 doc/guix.texi:1817
 #, no-wrap
 msgid "System Installation"
 msgstr "Установка системы"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Installing the whole operating system."
 msgstr "Полная установка операционной системы."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:198 doc/guix.texi:2533 doc/guix.texi:2534
+#: doc/guix.texi:155 doc/guix.texi:202 doc/guix.texi:2554 doc/guix.texi:2555
 #, no-wrap
 msgid "Package Management"
 msgstr "Управление пакетами"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Package installation, upgrade, etc."
 msgstr "Установка пакетов, обновление и т.д."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:221 doc/guix.texi:4627 doc/guix.texi:4628
+#: doc/guix.texi:155 doc/guix.texi:225 doc/guix.texi:4648 doc/guix.texi:4649
 #, no-wrap
 msgid "Development"
 msgstr "Разработка"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Guix-aided software development."
 msgstr "Разработка программного обеспечения при поддержке Guix."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:226 doc/guix.texi:5320 doc/guix.texi:5321
+#: doc/guix.texi:155 doc/guix.texi:230 doc/guix.texi:5330 doc/guix.texi:5331
 #, no-wrap
 msgid "Programming Interface"
 msgstr "Программный интерфейс"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Using Guix in Scheme."
 msgstr "Использование Guix в Scheme."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:242 doc/guix.texi:8048 doc/guix.texi:8049
+#: doc/guix.texi:155 doc/guix.texi:246 doc/guix.texi:8142 doc/guix.texi:8143
 #, no-wrap
 msgid "Utilities"
 msgstr "Утилиты"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Package management commands."
 msgstr "Команды управления пакетами."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:267 doc/guix.texi:10835 doc/guix.texi:10836
+#: doc/guix.texi:155 doc/guix.texi:271 doc/guix.texi:10943 doc/guix.texi:10944
 #, no-wrap
 msgid "System Configuration"
 msgstr "Конфигурирование системы"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Configuring the operating system."
 msgstr "Конфигурирование операционной системы."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:27696 doc/guix.texi:27697
+#: doc/guix.texi:155 doc/guix.texi:27979 doc/guix.texi:27980
 #, no-wrap
 msgid "Documentation"
 msgstr "Документация"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Browsing software user manuals."
 msgstr "Программы обзора пользовательских мануалов."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:27760 doc/guix.texi:27761
+#: doc/guix.texi:155 doc/guix.texi:28043 doc/guix.texi:28044
 #, no-wrap
 msgid "Installing Debugging Files"
 msgstr "Установка файлов отладки"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Feeding the debugger."
 msgstr "Запуск отладчика."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:27826 doc/guix.texi:27827
+#: doc/guix.texi:155 doc/guix.texi:28109 doc/guix.texi:28110
 #, no-wrap
 msgid "Security Updates"
 msgstr "Обновления безопасности"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Deploying security fixes quickly."
 msgstr "Быстрое применение исправлений безопасности."
 
 #. type: chapter
-#: doc/guix.texi:151 doc/guix.texi:27941 doc/guix.texi:27942
+#: doc/guix.texi:155 doc/guix.texi:28224 doc/guix.texi:28225
 #, no-wrap
 msgid "Bootstrapping"
 msgstr "Начальная загрузка"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "GNU/Linux built from scratch."
 msgstr "Сборка GNU/Linux с нуля."
 
 #. type: node
-#: doc/guix.texi:151 doc/guix.texi:28219
+#: doc/guix.texi:155 doc/guix.texi:28502
 #, no-wrap
 msgid "Porting"
 msgstr "Портирование"
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Targeting another platform or kernel."
 msgstr "Перевод на другую платформу или ядро."
 
 #. type: menuentry
-#: doc/guix.texi:151
+#: doc/guix.texi:155
 msgid "Your help needed!"
 msgstr "Нужна ваша помощь!"
 
 #. type: chapter
-#: doc/guix.texi:156 doc/guix.texi:28267 doc/guix.texi:28268
+#: doc/guix.texi:160 doc/guix.texi:28550 doc/guix.texi:28551
 #, no-wrap
 msgid "Acknowledgments"
 msgstr "Благодарности"
 
 #. type: menuentry
-#: doc/guix.texi:156
+#: doc/guix.texi:160
 msgid "Thanks!"
 msgstr "Спасибо"
 
 #. type: appendix
-#: doc/guix.texi:156 doc/guix.texi:28289 doc/guix.texi:28290
+#: doc/guix.texi:160 doc/guix.texi:28572 doc/guix.texi:28573
 #, no-wrap
 msgid "GNU Free Documentation License"
 msgstr "Лицензия свободной документации GNU"
 
 #. type: menuentry
-#: doc/guix.texi:156
+#: doc/guix.texi:160
 msgid "The license of this manual."
 msgstr "Лицензия этого руководства."
 
 #. type: unnumbered
-#: doc/guix.texi:156 doc/guix.texi:28295 doc/guix.texi:28296
+#: doc/guix.texi:160 doc/guix.texi:28578 doc/guix.texi:28579
 #, no-wrap
 msgid "Concept Index"
 msgstr "Термины и указатели"
 
 #. type: menuentry
-#: doc/guix.texi:156
+#: doc/guix.texi:160
 msgid "Concepts."
 msgstr "Понятия."
 
 #. type: unnumbered
-#: doc/guix.texi:156 doc/guix.texi:28299 doc/guix.texi:28300
+#: doc/guix.texi:160 doc/guix.texi:28582 doc/guix.texi:28583
 #, no-wrap
 msgid "Programming Index"
 msgstr "Программный индекс"
 
 #. type: menuentry
-#: doc/guix.texi:156
+#: doc/guix.texi:160
 msgid "Data types, functions, and variables."
 msgstr "Структуры данных, функции и переменные."
 
 #. type: menuentry
-#: doc/guix.texi:159
+#: doc/guix.texi:163
 msgid "--- The Detailed Node Listing ---"
 msgstr "--- Детальный список записей ---"
 
 #. type: section
-#: doc/guix.texi:164 doc/guix.texi:355 doc/guix.texi:357 doc/guix.texi:358
+#: doc/guix.texi:168 doc/guix.texi:359 doc/guix.texi:361 doc/guix.texi:362
 #, no-wrap
 msgid "Managing Software the Guix Way"
 msgstr "Управление программным обеспечением Guix Way"
 
 #. type: menuentry
-#: doc/guix.texi:164 doc/guix.texi:355
+#: doc/guix.texi:168 doc/guix.texi:359
 msgid "What's special."
 msgstr "В чём особенности?"
 
 #. type: section
-#: doc/guix.texi:164 doc/guix.texi:355 doc/guix.texi:412 doc/guix.texi:413
+#: doc/guix.texi:168 doc/guix.texi:359 doc/guix.texi:416 doc/guix.texi:417
 #, no-wrap
 msgid "GNU Distribution"
 msgstr "Дистрибутив GNU"
 
 #. type: menuentry
-#: doc/guix.texi:164 doc/guix.texi:355
+#: doc/guix.texi:168 doc/guix.texi:359
 msgid "The packages and tools."
 msgstr "Пакеты и утилиты."
 
 #. type: section
-#: doc/guix.texi:173 doc/guix.texi:527 doc/guix.texi:529 doc/guix.texi:530
+#: doc/guix.texi:177 doc/guix.texi:531 doc/guix.texi:533 doc/guix.texi:534
 #, no-wrap
 msgid "Binary Installation"
 msgstr "Бинарная установка"
 
 #. type: menuentry
-#: doc/guix.texi:173 doc/guix.texi:527
+#: doc/guix.texi:177 doc/guix.texi:531
 msgid "Getting Guix running in no time!"
 msgstr "Запустить Guix в кратчайшие сроки!"
 
 #. type: section
-#: doc/guix.texi:173 doc/guix.texi:527 doc/guix.texi:735 doc/guix.texi:736
+#: doc/guix.texi:177 doc/guix.texi:531 doc/guix.texi:739 doc/guix.texi:740
 #, no-wrap
 msgid "Requirements"
 msgstr "Требования"
 
 #. type: menuentry
-#: doc/guix.texi:173 doc/guix.texi:527
+#: doc/guix.texi:177 doc/guix.texi:531
 msgid "Software needed to build and run Guix."
 msgstr "Программное обеспечение, необходимое для запуска Guix."
 
 #. type: section
-#: doc/guix.texi:173 doc/guix.texi:527 doc/guix.texi:810 doc/guix.texi:811
+#: doc/guix.texi:177 doc/guix.texi:531 doc/guix.texi:814 doc/guix.texi:815
 #, no-wrap
 msgid "Running the Test Suite"
 msgstr "Запуск набора тестов"
 
 #. type: menuentry
-#: doc/guix.texi:173 doc/guix.texi:527
+#: doc/guix.texi:177 doc/guix.texi:531
 msgid "Testing Guix."
 msgstr "Тестирование Guix."
 
 #. type: section
-#: doc/guix.texi:173 doc/guix.texi:175 doc/guix.texi:527 doc/guix.texi:875
-#: doc/guix.texi:876
+#: doc/guix.texi:177 doc/guix.texi:179 doc/guix.texi:531 doc/guix.texi:879
+#: doc/guix.texi:880
 #, no-wrap
 msgid "Setting Up the Daemon"
 msgstr "Настройка демона"
 
 #. type: menuentry
-#: doc/guix.texi:173 doc/guix.texi:527
+#: doc/guix.texi:177 doc/guix.texi:531
 msgid "Preparing the build daemon's environment."
 msgstr "Подготовка окружения демона сборки."
 
 #. type: node
-#: doc/guix.texi:173 doc/guix.texi:527 doc/guix.texi:1306
+#: doc/guix.texi:177 doc/guix.texi:531 doc/guix.texi:1310
 #, no-wrap
 msgid "Invoking guix-daemon"
 msgstr "Вызов guix-daemon"
 
 #. type: menuentry
-#: doc/guix.texi:173 doc/guix.texi:527
+#: doc/guix.texi:177 doc/guix.texi:531
 msgid "Running the build daemon."
 msgstr "Запуск демона сборки."
 
 #. type: section
-#: doc/guix.texi:173 doc/guix.texi:527 doc/guix.texi:1572 doc/guix.texi:1573
+#: doc/guix.texi:177 doc/guix.texi:531 doc/guix.texi:1576 doc/guix.texi:1577
 #, no-wrap
 msgid "Application Setup"
 msgstr "Установка приложения"
 
 #. type: menuentry
-#: doc/guix.texi:173 doc/guix.texi:527
+#: doc/guix.texi:177 doc/guix.texi:531
 msgid "Application-specific setup."
 msgstr "Установка в качестве приожения."
 
 #. type: subsection
-#: doc/guix.texi:179 doc/guix.texi:895 doc/guix.texi:897 doc/guix.texi:898
+#: doc/guix.texi:183 doc/guix.texi:899 doc/guix.texi:901 doc/guix.texi:902
 #, no-wrap
 msgid "Build Environment Setup"
 msgstr "Установка окружения сборки"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:895
+#: doc/guix.texi:183 doc/guix.texi:899
 msgid "Preparing the isolated build environment."
 msgstr "Подготовка отдельного окружения сборки."
 
 #. type: node
-#: doc/guix.texi:179 doc/guix.texi:895 doc/guix.texi:1014
+#: doc/guix.texi:183 doc/guix.texi:899 doc/guix.texi:1018
 #, no-wrap
 msgid "Daemon Offload Setup"
 msgstr "Установка демона разгрузки"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:895
+#: doc/guix.texi:183 doc/guix.texi:899
 msgid "Offloading builds to remote machines."
 msgstr "Разгрузка сборок по удалённым машинам."
 
 #. type: subsection
-#: doc/guix.texi:179 doc/guix.texi:895 doc/guix.texi:1220 doc/guix.texi:1221
+#: doc/guix.texi:183 doc/guix.texi:899 doc/guix.texi:1224 doc/guix.texi:1225
 #, no-wrap
 msgid "SELinux Support"
 msgstr "Поддержка SELinux"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:895
+#: doc/guix.texi:183 doc/guix.texi:899
 msgid "Using an SELinux policy for the daemon."
 msgstr "Использование политики SELinux для демона."
 
 #. type: section
-#: doc/guix.texi:191 doc/guix.texi:1256 doc/guix.texi:1846 doc/guix.texi:1848
-#: doc/guix.texi:1849
+#: doc/guix.texi:195 doc/guix.texi:1260 doc/guix.texi:1850 doc/guix.texi:1852
+#: doc/guix.texi:1853
 #, no-wrap
 msgid "Limitations"
 msgstr "Ограничения"
 
 #. type: menuentry
-#: doc/guix.texi:191 doc/guix.texi:1846
+#: doc/guix.texi:195 doc/guix.texi:1850
 msgid "What you can expect."
 msgstr "Что нужно учитывать."
 
 #. type: section
-#: doc/guix.texi:191 doc/guix.texi:1846 doc/guix.texi:1877 doc/guix.texi:1878
+#: doc/guix.texi:195 doc/guix.texi:1850 doc/guix.texi:1881 doc/guix.texi:1882
 #, no-wrap
 msgid "Hardware Considerations"
 msgstr "По поводу железа"
 
 #. type: menuentry
-#: doc/guix.texi:191 doc/guix.texi:1846
+#: doc/guix.texi:195 doc/guix.texi:1850
 msgid "Supported hardware."
 msgstr "Поддерживаемое аппаратное обеспечение."
 
 #. type: section
-#: doc/guix.texi:191 doc/guix.texi:1846 doc/guix.texi:1912 doc/guix.texi:1913
+#: doc/guix.texi:195 doc/guix.texi:1850 doc/guix.texi:1916 doc/guix.texi:1917
 #, no-wrap
 msgid "USB Stick and DVD Installation"
 msgstr "Установочная флеш и DVD"
 
 #. type: menuentry
-#: doc/guix.texi:191 doc/guix.texi:1846
+#: doc/guix.texi:195 doc/guix.texi:1850
 msgid "Preparing the installation medium."
 msgstr "Подготовка установочного носителя."
 
 #. type: section
-#: doc/guix.texi:191 doc/guix.texi:1846 doc/guix.texi:2017 doc/guix.texi:2018
+#: doc/guix.texi:195 doc/guix.texi:1850 doc/guix.texi:2021 doc/guix.texi:2022
 #, no-wrap
 msgid "Preparing for Installation"
 msgstr "Подготовка к установке"
 
 #. type: menuentry
-#: doc/guix.texi:191 doc/guix.texi:1846
+#: doc/guix.texi:195 doc/guix.texi:1850
 msgid "Networking, partitioning, etc."
 msgstr "Сеть, разметка диска и т.д."
 
 #. type: section
-#: doc/guix.texi:191 doc/guix.texi:1846 doc/guix.texi:2040 doc/guix.texi:2041
+#: doc/guix.texi:195 doc/guix.texi:1850 doc/guix.texi:2044 doc/guix.texi:2045
 #, no-wrap
 msgid "Guided Graphical Installation"
 msgstr "Графическая установка в GUI"
 
 #. type: menuentry
-#: doc/guix.texi:191 doc/guix.texi:1846
+#: doc/guix.texi:195 doc/guix.texi:1850
 msgid "Easy graphical installation."
 msgstr "Простая графическая установка."
 
 #. type: section
-#: doc/guix.texi:191 doc/guix.texi:193 doc/guix.texi:1846 doc/guix.texi:2071
-#: doc/guix.texi:2072
+#: doc/guix.texi:195 doc/guix.texi:197 doc/guix.texi:1850 doc/guix.texi:2075
+#: doc/guix.texi:2076
 #, no-wrap
 msgid "Manual Installation"
 msgstr "Ручная установка"
 
 #. type: menuentry
-#: doc/guix.texi:191 doc/guix.texi:1846
+#: doc/guix.texi:195 doc/guix.texi:1850
 msgid "Manual installation for wizards."
 msgstr "Ручная установка для магов."
 
 #. type: section
-#: doc/guix.texi:191 doc/guix.texi:1846 doc/guix.texi:2421 doc/guix.texi:2422
+#: doc/guix.texi:195 doc/guix.texi:1850 doc/guix.texi:2437 doc/guix.texi:2438
 #, no-wrap
 msgid "After System Installation"
 msgstr "После установки системы"
 
 #. type: menuentry
-#: doc/guix.texi:191 doc/guix.texi:1846
+#: doc/guix.texi:195 doc/guix.texi:1850
 msgid "When installation succeeded."
 msgstr "Когда установка завершилась успешно."
 
 #. type: node
-#: doc/guix.texi:191 doc/guix.texi:1846 doc/guix.texi:2449
+#: doc/guix.texi:195 doc/guix.texi:1850 doc/guix.texi:2470
 #, no-wrap
 msgid "Installing Guix in a VM"
 msgstr "Установка Guix на виртуальную машину"
 
 #. type: menuentry
-#: doc/guix.texi:191 doc/guix.texi:1846
+#: doc/guix.texi:195 doc/guix.texi:1850
 msgid "Guix System playground."
 msgstr "Площадка системы Guix"
 
 #. type: section
-#: doc/guix.texi:191 doc/guix.texi:1846 doc/guix.texi:2500 doc/guix.texi:2501
+#: doc/guix.texi:195 doc/guix.texi:1850 doc/guix.texi:2521 doc/guix.texi:2522
 #, no-wrap
 msgid "Building the Installation Image"
 msgstr "Сборка установочного образа"
 
 #. type: menuentry
-#: doc/guix.texi:191 doc/guix.texi:1846
+#: doc/guix.texi:195 doc/guix.texi:1850
 msgid "How this comes to be."
 msgstr "Как это происходит."
 
 #. type: node
-#: doc/guix.texi:196 doc/guix.texi:2089 doc/guix.texi:2091
+#: doc/guix.texi:200 doc/guix.texi:2093 doc/guix.texi:2095
 #, no-wrap
 msgid "Keyboard Layout and Networking and Partitioning"
 msgstr "Раскладка клавиатуры и работа с сетью и разбиение диска"
 
 #. type: menuentry
-#: doc/guix.texi:196 doc/guix.texi:2089
+#: doc/guix.texi:200 doc/guix.texi:2093
 msgid "Initial setup."
 msgstr "Начальная установка."
 
 #. type: subsection
-#: doc/guix.texi:196 doc/guix.texi:2089 doc/guix.texi:2333 doc/guix.texi:2334
+#: doc/guix.texi:200 doc/guix.texi:2093 doc/guix.texi:2349 doc/guix.texi:2350
 #, no-wrap
 msgid "Proceeding with the Installation"
 msgstr "В продолжении установки"
 
 #. type: menuentry
-#: doc/guix.texi:196 doc/guix.texi:2089
+#: doc/guix.texi:200 doc/guix.texi:2093
 msgid "Installing."
 msgstr "Установка."
 
 #. type: section
-#: doc/guix.texi:210 doc/guix.texi:2566 doc/guix.texi:2568 doc/guix.texi:2569
+#: doc/guix.texi:214 doc/guix.texi:2587 doc/guix.texi:2589 doc/guix.texi:2590
 #, no-wrap
 msgid "Features"
 msgstr "Особенности"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "How Guix will make your life brighter."
 msgstr "Как Guix делает жизнь ярче."
 
 #. type: node
-#: doc/guix.texi:210 doc/guix.texi:2566 doc/guix.texi:2654
+#: doc/guix.texi:214 doc/guix.texi:2587 doc/guix.texi:2675
 #, no-wrap
 msgid "Invoking guix package"
 msgstr "Вызов guix package"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "Package installation, removal, etc."
 msgstr "Установка пакетов, удаление и т.д."
 
 #. type: section
-#: doc/guix.texi:210 doc/guix.texi:212 doc/guix.texi:2566 doc/guix.texi:3190
-#: doc/guix.texi:3191
+#: doc/guix.texi:214 doc/guix.texi:216 doc/guix.texi:2587 doc/guix.texi:3211
+#: doc/guix.texi:3212
 #, no-wrap
 msgid "Substitutes"
 msgstr "Подстановки"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "Downloading pre-built binaries."
 msgstr "Скачивание собранных бинарников."
 
 #. type: section
-#: doc/guix.texi:210 doc/guix.texi:2566 doc/guix.texi:3413 doc/guix.texi:3414
+#: doc/guix.texi:214 doc/guix.texi:2587 doc/guix.texi:3434 doc/guix.texi:3435
 #, no-wrap
 msgid "Packages with Multiple Outputs"
 msgstr "Пакеты со множественным выходом"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "Single source package, multiple outputs."
 msgstr "Один исходный пакет, различные выходы."
 
 #. type: node
-#: doc/guix.texi:210 doc/guix.texi:2566 doc/guix.texi:3467
+#: doc/guix.texi:214 doc/guix.texi:2587 doc/guix.texi:3488
 #, no-wrap
 msgid "Invoking guix gc"
 msgstr "Вызов guix gc"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "Running the garbage collector."
 msgstr "Запуск сборщика мусора."
 
 #. type: node
-#: doc/guix.texi:210 doc/guix.texi:2566 doc/guix.texi:3677
+#: doc/guix.texi:214 doc/guix.texi:2587 doc/guix.texi:3698
 #, no-wrap
 msgid "Invoking guix pull"
 msgstr "Запуск guix pull"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "Fetching the latest Guix and distribution."
 msgstr "Закачка последнего Guix и дистрибуции."
 
 #. type: section
-#: doc/guix.texi:210 doc/guix.texi:2566 doc/guix.texi:3894 doc/guix.texi:3895
+#: doc/guix.texi:214 doc/guix.texi:2587 doc/guix.texi:3915 doc/guix.texi:3916
 #, no-wrap
 msgid "Channels"
 msgstr "Каналы"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "Customizing the package collection."
 msgstr "Настройка коллекции пакетов."
 
 #. type: node
-#: doc/guix.texi:210 doc/guix.texi:2566 doc/guix.texi:4185
-#, fuzzy, no-wrap
-#| msgid "Invoking guix archive"
+#: doc/guix.texi:214 doc/guix.texi:2587 doc/guix.texi:4206
+#, no-wrap
 msgid "Invoking guix time-machine"
-msgstr "Вызов guix archive"
+msgstr "Вызов guix time-machine"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
-#, fuzzy
-#| msgid "Interacting with another revision of Guix."
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "Running an older revision of Guix."
-msgstr "Взаимодействие с другими ревизиями Guix."
+msgstr "Запуск более старых ревизий Guix."
 
 #. type: section
-#: doc/guix.texi:210 doc/guix.texi:2566 doc/guix.texi:4240 doc/guix.texi:4241
+#: doc/guix.texi:214 doc/guix.texi:2587 doc/guix.texi:4261 doc/guix.texi:4262
 #, no-wrap
 msgid "Inferiors"
 msgstr "Младшие версии"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "Interacting with another revision of Guix."
 msgstr "Взаимодействие с другими ревизиями Guix."
 
 #. type: node
-#: doc/guix.texi:210 doc/guix.texi:2566 doc/guix.texi:4368
+#: doc/guix.texi:214 doc/guix.texi:2587 doc/guix.texi:4389
 #, no-wrap
 msgid "Invoking guix describe"
 msgstr "Вызов guix describe"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "Display information about your Guix revision."
 msgstr "Отобразить информацию о ревизии Guix."
 
 #. type: node
-#: doc/guix.texi:210 doc/guix.texi:2566 doc/guix.texi:4449
+#: doc/guix.texi:214 doc/guix.texi:2587 doc/guix.texi:4470
 #, no-wrap
 msgid "Invoking guix archive"
 msgstr "Вызов guix archive"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:2566
+#: doc/guix.texi:214 doc/guix.texi:2587
 msgid "Exporting and importing store files."
 msgstr "Экспорт и импорт файлов склада."
 
 #. type: subsection
-#: doc/guix.texi:219 doc/guix.texi:3213 doc/guix.texi:3215 doc/guix.texi:3216
+#: doc/guix.texi:223 doc/guix.texi:3234 doc/guix.texi:3236 doc/guix.texi:3237
 #, no-wrap
 msgid "Official Substitute Server"
 msgstr "Официальный сервер подстановок"
 
 #. type: menuentry
-#: doc/guix.texi:219 doc/guix.texi:3213
+#: doc/guix.texi:223 doc/guix.texi:3234
 msgid "One particular source of substitutes."
 msgstr "Отдельный источник подстановок."
 
 #. type: subsection
-#: doc/guix.texi:219 doc/guix.texi:3213 doc/guix.texi:3244 doc/guix.texi:3245
+#: doc/guix.texi:223 doc/guix.texi:3234 doc/guix.texi:3265 doc/guix.texi:3266
 #, no-wrap
 msgid "Substitute Server Authorization"
 msgstr "Авторизация сервера подстановок"
 
 #. type: menuentry
-#: doc/guix.texi:219 doc/guix.texi:3213
+#: doc/guix.texi:223 doc/guix.texi:3234
 msgid "How to enable or disable substitutes."
 msgstr "Как включить или отключить подстановки."
 
 #. type: subsection
-#: doc/guix.texi:219 doc/guix.texi:3213 doc/guix.texi:3308 doc/guix.texi:3309
+#: doc/guix.texi:223 doc/guix.texi:3234 doc/guix.texi:3329 doc/guix.texi:3330
 #, no-wrap
 msgid "Substitute Authentication"
 msgstr "Аутентификация подстановок"
 
 #. type: menuentry
-#: doc/guix.texi:219 doc/guix.texi:3213
+#: doc/guix.texi:223 doc/guix.texi:3234
 msgid "How Guix verifies substitutes."
 msgstr "Как Guix проверяет подстановки."
 
 #. type: subsection
-#: doc/guix.texi:219 doc/guix.texi:3213 doc/guix.texi:3343 doc/guix.texi:3344
+#: doc/guix.texi:223 doc/guix.texi:3234 doc/guix.texi:3364 doc/guix.texi:3365
 #, no-wrap
 msgid "Proxy Settings"
 msgstr "Настройки proxy"
 
 #. type: menuentry
-#: doc/guix.texi:219 doc/guix.texi:3213
+#: doc/guix.texi:223 doc/guix.texi:3234
 msgid "How to get substitutes via proxy."
 msgstr "Как получить подстановки через proxy."
 
 #. type: subsection
-#: doc/guix.texi:219 doc/guix.texi:3213 doc/guix.texi:3355 doc/guix.texi:3356
+#: doc/guix.texi:223 doc/guix.texi:3234 doc/guix.texi:3376 doc/guix.texi:3377
 #, no-wrap
 msgid "Substitution Failure"
 msgstr "Ошибки при подстановке"
 
 #. type: menuentry
-#: doc/guix.texi:219 doc/guix.texi:3213
+#: doc/guix.texi:223 doc/guix.texi:3234
 msgid "What happens when substitution fails."
 msgstr "Что происходит, когда подстановка завершается ошибкой."
 
 #. type: subsection
-#: doc/guix.texi:219 doc/guix.texi:3213 doc/guix.texi:3383 doc/guix.texi:3384
+#: doc/guix.texi:223 doc/guix.texi:3234 doc/guix.texi:3404 doc/guix.texi:3405
 #, no-wrap
 msgid "On Trusting Binaries"
 msgstr "Касательно проверенных бинарников"
 
 #. type: menuentry
-#: doc/guix.texi:219 doc/guix.texi:3213
+#: doc/guix.texi:223 doc/guix.texi:3234
 msgid "How can you trust that binary blob?"
 msgstr "Как можно доверять определённому бинарному блоку?"
 
 #. type: node
-#: doc/guix.texi:224 doc/guix.texi:4644 doc/guix.texi:4646
+#: doc/guix.texi:228 doc/guix.texi:4665 doc/guix.texi:4667
 #, no-wrap
 msgid "Invoking guix environment"
 msgstr "Запуск guix environment"
 
 #. type: menuentry
-#: doc/guix.texi:224 doc/guix.texi:4644
+#: doc/guix.texi:228 doc/guix.texi:4665
 msgid "Setting up development environments."
 msgstr "Настройка окружения сборки."
 
 #. type: node
-#: doc/guix.texi:224 doc/guix.texi:4644 doc/guix.texi:4994
+#: doc/guix.texi:228 doc/guix.texi:4665 doc/guix.texi:5004
 #, no-wrap
 msgid "Invoking guix pack"
 msgstr "Запуск guix pack"
 
 #. type: menuentry
-#: doc/guix.texi:224 doc/guix.texi:4644
+#: doc/guix.texi:228 doc/guix.texi:4665
 msgid "Creating software bundles."
 msgstr "Создание наборов программ."
 
 #. type: section
-#: doc/guix.texi:235 doc/guix.texi:5357 doc/guix.texi:5359 doc/guix.texi:5360
+#: doc/guix.texi:239 doc/guix.texi:5367 doc/guix.texi:5369 doc/guix.texi:5370
 #, no-wrap
 msgid "Package Modules"
 msgstr "Пакетные модули"
 
 #. type: menuentry
-#: doc/guix.texi:235 doc/guix.texi:5357
+#: doc/guix.texi:239 doc/guix.texi:5367
 msgid "Packages from the programmer's viewpoint."
 msgstr "Пакеты с точки зрения программиста."
 
 #. type: section
-#: doc/guix.texi:235 doc/guix.texi:237 doc/guix.texi:5357 doc/guix.texi:5421
-#: doc/guix.texi:5422
+#: doc/guix.texi:239 doc/guix.texi:241 doc/guix.texi:5367 doc/guix.texi:5431
+#: doc/guix.texi:5432
 #, no-wrap
 msgid "Defining Packages"
 msgstr "Описание пакетов"
 
 #. type: menuentry
-#: doc/guix.texi:235 doc/guix.texi:5357
+#: doc/guix.texi:239 doc/guix.texi:5367
 msgid "Defining new packages."
 msgstr "Описание новых пакетов."
 
 #. type: section
-#: doc/guix.texi:235 doc/guix.texi:5357 doc/guix.texi:5921 doc/guix.texi:5922
+#: doc/guix.texi:239 doc/guix.texi:5367 doc/guix.texi:5931 doc/guix.texi:5932
 #, no-wrap
 msgid "Build Systems"
 msgstr "Системы сборки"
 
 #. type: menuentry
-#: doc/guix.texi:235 doc/guix.texi:5357
+#: doc/guix.texi:239 doc/guix.texi:5367
 msgid "Specifying how packages are built."
 msgstr "Задание параметров сборки пакетов."
 
 #. type: section
-#: doc/guix.texi:235 doc/guix.texi:5357 doc/guix.texi:6744 doc/guix.texi:6745
+#: doc/guix.texi:239 doc/guix.texi:5367 doc/guix.texi:6817 doc/guix.texi:6818
 #, no-wrap
 msgid "The Store"
 msgstr "Хранилище"
 
 #. type: menuentry
-#: doc/guix.texi:235 doc/guix.texi:5357
+#: doc/guix.texi:239 doc/guix.texi:5367
 msgid "Manipulating the package store."
 msgstr "Работа с хранилищем пакетов."
 
 #. type: section
-#: doc/guix.texi:235 doc/guix.texi:5357 doc/guix.texi:6895 doc/guix.texi:6896
+#: doc/guix.texi:239 doc/guix.texi:5367 doc/guix.texi:6970 doc/guix.texi:6971
 #, no-wrap
 msgid "Derivations"
 msgstr "Деривации"
 
 #. type: menuentry
-#: doc/guix.texi:235 doc/guix.texi:5357
+#: doc/guix.texi:239 doc/guix.texi:5367
 msgid "Low-level interface to package derivations."
 msgstr "Низкоуровневый интерфейс дериваций пакетов."
 
 #. type: section
-#: doc/guix.texi:235 doc/guix.texi:5357 doc/guix.texi:7089 doc/guix.texi:7090
+#: doc/guix.texi:239 doc/guix.texi:5367 doc/guix.texi:7164 doc/guix.texi:7165
 #, no-wrap
 msgid "The Store Monad"
 msgstr "Устройство склада"
 
 #. type: menuentry
-#: doc/guix.texi:235 doc/guix.texi:5357
+#: doc/guix.texi:239 doc/guix.texi:5367
 msgid "Purely functional interface to the store."
 msgstr "Чисто функциональный интерфейс доступа к складу."
 
 #. type: section
-#: doc/guix.texi:235 doc/guix.texi:5357 doc/guix.texi:7404 doc/guix.texi:7405
+#: doc/guix.texi:239 doc/guix.texi:5367 doc/guix.texi:7479 doc/guix.texi:7480
 #, no-wrap
 msgid "G-Expressions"
 msgstr "G-Expressions"
 
 #. type: menuentry
-#: doc/guix.texi:235 doc/guix.texi:5357
+#: doc/guix.texi:239 doc/guix.texi:5367
 msgid "Manipulating build expressions."
 msgstr "Управление механизмом сборки."
 
 #. type: node
-#: doc/guix.texi:235 doc/guix.texi:5357 doc/guix.texi:7983
+#: doc/guix.texi:239 doc/guix.texi:5367 doc/guix.texi:8077
 #, no-wrap
 msgid "Invoking guix repl"
 msgstr "Запуск guix repl"
 
 #. type: menuentry
-#: doc/guix.texi:235 doc/guix.texi:5357
+#: doc/guix.texi:239 doc/guix.texi:5367
 msgid "Fiddling with Guix interactively."
 msgstr "Интерактивное общение с Guix"
 
 #. type: node
-#: doc/guix.texi:240 doc/guix.texi:5689 doc/guix.texi:5692
+#: doc/guix.texi:244 doc/guix.texi:5699 doc/guix.texi:5702
 #, no-wrap
 msgid "package Reference"
 msgstr "Интерфейс package"
 
 #. type: menuentry
-#: doc/guix.texi:240 doc/guix.texi:5689
+#: doc/guix.texi:244 doc/guix.texi:5699
 msgid "The package data type."
 msgstr "Тип данных package"
 
 #. type: node
-#: doc/guix.texi:240 doc/guix.texi:5689 doc/guix.texi:5833
+#: doc/guix.texi:244 doc/guix.texi:5699 doc/guix.texi:5843
 #, no-wrap
 msgid "origin Reference"
 msgstr "Интерфейс origin"
 
 #. type: menuentry
-#: doc/guix.texi:240 doc/guix.texi:5689
+#: doc/guix.texi:244 doc/guix.texi:5699
 msgid "The origin data type."
 msgstr "Тип данных origin"
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:8074
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:8168
 #, no-wrap
 msgid "Invoking guix build"
 msgstr "Запуск guix build"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Building packages from the command line."
 msgstr "Сборка пакетов в командной строке."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:8730
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:8829
 #, no-wrap
 msgid "Invoking guix edit"
 msgstr "Запуск guix edit"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Editing package definitions."
 msgstr "Редактирование описания пакета."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:8760
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:8859
 #, no-wrap
 msgid "Invoking guix download"
 msgstr "Запуск guix download"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Downloading a file and printing its hash."
 msgstr "Загрузка файла и вывод его хэша."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:8813
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:8912
 #, no-wrap
 msgid "Invoking guix hash"
 msgstr "Запуск guix hash"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Computing the cryptographic hash of a file."
 msgstr "Вычисление криптографического хеша файла."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:8875
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:8974
 #, no-wrap
 msgid "Invoking guix import"
 msgstr "Запуск guix import"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Importing package definitions."
 msgstr "Импорт описаниий пакетов."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:9306
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:9405
 #, no-wrap
 msgid "Invoking guix refresh"
 msgstr "Запуск guix refresh"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Updating package definitions."
 msgstr "Обновление описаний пакетов."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:9627
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:9726
 #, no-wrap
 msgid "Invoking guix lint"
 msgstr "Запуск guix lint"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Finding errors in package definitions."
 msgstr "Поиск ошибок в описаниях пакетов."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:9776
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:9875
 #, no-wrap
 msgid "Invoking guix size"
 msgstr "Запуск guix size"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Profiling disk usage."
 msgstr "Обзор использования диска."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:9907
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:10006
 #, no-wrap
 msgid "Invoking guix graph"
 msgstr "Запуск guix graph"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Visualizing the graph of packages."
 msgstr "Визуализация графа пакета."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:10129
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:10228
 #, no-wrap
 msgid "Invoking guix publish"
 msgstr "Запуск guix publish"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Sharing substitutes."
 msgstr "Совместное использование подстановок."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:10359
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:10458
 #, no-wrap
 msgid "Invoking guix challenge"
 msgstr "Запуск guix challenge"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Challenging substitute servers."
 msgstr "Соперничающие серверы подстановок."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:10542
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:10641
 #, no-wrap
 msgid "Invoking guix copy"
 msgstr "Запуск guix copy"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Copying to and from a remote store."
 msgstr "Копирование из и в удалённый склад."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:10605
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:10704
 #, no-wrap
 msgid "Invoking guix container"
 msgstr "Запуск guix container"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Process isolation."
 msgstr "Изоляция процесса."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:10659
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:10758
 #, no-wrap
 msgid "Invoking guix weather"
 msgstr "Запуск guix weather"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Assessing substitute availability."
 msgstr "Оценка доступности подстановок."
 
 #. type: node
-#: doc/guix.texi:258 doc/guix.texi:8072 doc/guix.texi:10779
+#: doc/guix.texi:262 doc/guix.texi:8166 doc/guix.texi:10887
 #, no-wrap
 msgid "Invoking guix processes"
 msgstr "Запуск guix processes"
 
 #. type: menuentry
-#: doc/guix.texi:258 doc/guix.texi:8072
+#: doc/guix.texi:262 doc/guix.texi:8166
 msgid "Listing client processes."
 msgstr "Чтение клиентских процессов."
 
 #. type: section
-#: doc/guix.texi:260 doc/guix.texi:8075
+#: doc/guix.texi:264 doc/guix.texi:8169
 #, no-wrap
 msgid "Invoking @command{guix build}"
 msgstr "Запуск @command{guix build}"
 
 #. type: subsection
-#: doc/guix.texi:265 doc/guix.texi:8126 doc/guix.texi:8128 doc/guix.texi:8129
+#: doc/guix.texi:269 doc/guix.texi:8220 doc/guix.texi:8222 doc/guix.texi:8223
 #, no-wrap
 msgid "Common Build Options"
 msgstr "Стандартные параметры сборки"
 
 #. type: menuentry
-#: doc/guix.texi:265 doc/guix.texi:8126
+#: doc/guix.texi:269 doc/guix.texi:8220
 msgid "Build options for most commands."
 msgstr "Параметры сборки для большинства команд."
 
 #. type: subsection
-#: doc/guix.texi:265 doc/guix.texi:8126 doc/guix.texi:8284 doc/guix.texi:8285
+#: doc/guix.texi:269 doc/guix.texi:8220 doc/guix.texi:8378 doc/guix.texi:8379
 #, no-wrap
 msgid "Package Transformation Options"
 msgstr "Параметры преобразования пакета"
 
 #. type: menuentry
-#: doc/guix.texi:265 doc/guix.texi:8126
+#: doc/guix.texi:269 doc/guix.texi:8220
 msgid "Creating variants of packages."
 msgstr "Создание вариантов пакетов."
 
 #. type: subsection
-#: doc/guix.texi:265 doc/guix.texi:8126 doc/guix.texi:8433 doc/guix.texi:8434
+#: doc/guix.texi:269 doc/guix.texi:8220 doc/guix.texi:8527 doc/guix.texi:8528
 #, no-wrap
 msgid "Additional Build Options"
 msgstr "Дополнительные параметры сборки"
 
 #. type: menuentry
-#: doc/guix.texi:265 doc/guix.texi:8126
+#: doc/guix.texi:269 doc/guix.texi:8220
 msgid "Options specific to 'guix build'."
 msgstr "Особые параметры для 'guix build'."
 
 #. type: subsection
-#: doc/guix.texi:265 doc/guix.texi:8126 doc/guix.texi:8650 doc/guix.texi:8651
+#: doc/guix.texi:269 doc/guix.texi:8220 doc/guix.texi:8749 doc/guix.texi:8750
 #, no-wrap
 msgid "Debugging Build Failures"
 msgstr "Отладка ошибок сборки"
 
 #. type: menuentry
-#: doc/guix.texi:265 doc/guix.texi:8126
+#: doc/guix.texi:269 doc/guix.texi:8220
 msgid "Real life packaging experience."
 msgstr "Жизненный опыт в сборке пакетов."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:10880
-#: doc/guix.texi:10881
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:10988
+#: doc/guix.texi:10989
 #, no-wrap
 msgid "Using the Configuration System"
 msgstr "Использование системы конфигурации"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Customizing your GNU system."
 msgstr "Настройка вашей системы GNU."
 
 #. type: node
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:11116
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:11224
 #, no-wrap
 msgid "operating-system Reference"
 msgstr "Интерфейс operating-system"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Detail of operating-system declarations."
 msgstr "Подробные сведения об объявлениях opertaing-system"
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:11320
-#: doc/guix.texi:11321
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:11432
+#: doc/guix.texi:11433
 #, no-wrap
 msgid "File Systems"
 msgstr "Файловые системы"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Configuring file system mounts."
 msgstr "Настройка точек подключения файловой системы"
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:11493
-#: doc/guix.texi:11494
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:11605
+#: doc/guix.texi:11606
 #, no-wrap
 msgid "Mapped Devices"
 msgstr "Размеченные устройства"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Block device extra processing."
 msgstr "Дополнительные проверки блочных устройств."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:11614
-#: doc/guix.texi:11615
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:11726
+#: doc/guix.texi:11727
 #, no-wrap
 msgid "User Accounts"
 msgstr "Учётные записи пользователей"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Specifying user accounts."
 msgstr "Задание пользовательских учётных записей."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:2098 doc/guix.texi:10878
-#: doc/guix.texi:11767 doc/guix.texi:11768
+#: doc/guix.texi:289 doc/guix.texi:2102 doc/guix.texi:10986
+#: doc/guix.texi:11879 doc/guix.texi:11880
 #, no-wrap
 msgid "Keyboard Layout"
 msgstr "Раскладка клавиатуры"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "How the system interprets key strokes."
 msgstr "Интерпретация нажатия клавиш системой."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:1580 doc/guix.texi:10878
-#: doc/guix.texi:11899 doc/guix.texi:11900
+#: doc/guix.texi:289 doc/guix.texi:1584 doc/guix.texi:10986
+#: doc/guix.texi:12014 doc/guix.texi:12015
 #, no-wrap
 msgid "Locales"
 msgstr "Региональные настройки"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Language and cultural convention settings."
 msgstr "Настройка языка и культурных особенностей."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:287 doc/guix.texi:10878 doc/guix.texi:12039
-#: doc/guix.texi:12040
+#: doc/guix.texi:289 doc/guix.texi:291 doc/guix.texi:10986 doc/guix.texi:12154
+#: doc/guix.texi:12155
 #, no-wrap
 msgid "Services"
 msgstr "Службы"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Specifying system services."
 msgstr "Настройка системных служб."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:25596
-#: doc/guix.texi:25597
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:25859
+#: doc/guix.texi:25860
 #, no-wrap
 msgid "Setuid Programs"
 msgstr "Программы setuid"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Programs running with root privileges."
 msgstr "Программы, выполняемые с правами root."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:1725 doc/guix.texi:10878
-#: doc/guix.texi:25642 doc/guix.texi:25643
+#: doc/guix.texi:289 doc/guix.texi:1733 doc/guix.texi:10986
+#: doc/guix.texi:25905 doc/guix.texi:25906
 #, no-wrap
 msgid "X.509 Certificates"
 msgstr "Сертификаты X.509"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Authenticating HTTPS servers."
 msgstr "Аутентификация серверов HTTPS."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:1623 doc/guix.texi:10878
-#: doc/guix.texi:25705 doc/guix.texi:25706
+#: doc/guix.texi:289 doc/guix.texi:1627 doc/guix.texi:10986
+#: doc/guix.texi:25968 doc/guix.texi:25969
 #, no-wrap
 msgid "Name Service Switch"
 msgstr "Служба выбора имён"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Configuring libc's name service switch."
 msgstr "Настройка службы имён libc."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:25843
-#: doc/guix.texi:25844
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:26106
+#: doc/guix.texi:26107
 #, no-wrap
 msgid "Initial RAM Disk"
 msgstr "Начальный RAM-диск"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Linux-Libre bootstrapping."
 msgstr "Начальная загрузка Linux-Libre."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:26017
-#: doc/guix.texi:26018
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:26280
+#: doc/guix.texi:26281
 #, no-wrap
 msgid "Bootloader Configuration"
 msgstr "Настройка загрузчика"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Configuring the boot loader."
 msgstr "Конфигурирование загрузчика диска."
 
 #. type: node
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:26238
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:26501
 #, no-wrap
 msgid "Invoking guix system"
 msgstr "Вызов guix system"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Instantiating a system configuration."
 msgstr "Проверка конфигурации операционной системы."
 
 #. type: node
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:26759
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:27022
 #, no-wrap
 msgid "Invoking guix deploy"
 msgstr "Запуск guix deploy"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Deploying a system configuration to a remote host."
 msgstr "Развёртывание конфигурации системы на удалённой машине."
 
 #. type: node
-#: doc/guix.texi:285 doc/guix.texi:10878 doc/guix.texi:26934
+#: doc/guix.texi:289 doc/guix.texi:10986 doc/guix.texi:27217
 #, no-wrap
 msgid "Running Guix in a VM"
 msgstr "Запуск Guix на виртуальной машине"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "How to run Guix System in a virtual machine."
 msgstr "Как запускать систему Guix на виртуальной машине."
 
 #. type: section
-#: doc/guix.texi:285 doc/guix.texi:318 doc/guix.texi:10878 doc/guix.texi:27062
-#: doc/guix.texi:27063
+#: doc/guix.texi:289 doc/guix.texi:322 doc/guix.texi:10986 doc/guix.texi:27345
+#: doc/guix.texi:27346
 #, no-wrap
 msgid "Defining Services"
 msgstr "Создание служб"
 
 #. type: menuentry
-#: doc/guix.texi:285 doc/guix.texi:10878
+#: doc/guix.texi:289 doc/guix.texi:10986
 msgid "Adding new service definitions."
 msgstr "Добавление новых определений служб."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:12121
-#: doc/guix.texi:12122
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:12236
+#: doc/guix.texi:12237
 #, no-wrap
 msgid "Base Services"
 msgstr "Базовые службы"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Essential system services."
 msgstr "Ключевые службы системы."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:12922
-#: doc/guix.texi:12923
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:13069
+#: doc/guix.texi:13070
 #, no-wrap
 msgid "Scheduled Job Execution"
 msgstr "Запланированное исполнения задач"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "The mcron service."
 msgstr "Служба mcron."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:13057
-#: doc/guix.texi:13058
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:13204
+#: doc/guix.texi:13205
 #, no-wrap
 msgid "Log Rotation"
 msgstr "Ротация логов"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "The rottlog service."
 msgstr "Сервис rottlog."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:13160
-#: doc/guix.texi:13161
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:13317
+#: doc/guix.texi:13318
 #, no-wrap
 msgid "Networking Services"
 msgstr "Сервисы сети"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Network setup, SSH daemon, etc."
 msgstr "Установка сети, демон SSH и т.д."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:14275
-#: doc/guix.texi:14276
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:14432
+#: doc/guix.texi:14433
 #, no-wrap
 msgid "X Window"
 msgstr "Оконная система X"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Graphical display."
 msgstr "Графический дисплей."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:14652
-#: doc/guix.texi:14653
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:14809
+#: doc/guix.texi:14810
 #, no-wrap
 msgid "Printing Services"
 msgstr "Сервисы печати"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Local and remote printer support."
 msgstr "Поддержка локальных и удалённых принтеров."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:15504
-#: doc/guix.texi:15505
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:15661
+#: doc/guix.texi:15662
 #, no-wrap
 msgid "Desktop Services"
 msgstr "Сервисы рабочего стола"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "D-Bus and desktop services."
 msgstr "D-Bus и сервисы рабочего стола."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:15956
-#: doc/guix.texi:15957
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:16113
+#: doc/guix.texi:16114
 #, no-wrap
 msgid "Sound Services"
 msgstr "Звуковые сервисы"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "ALSA and Pulseaudio services."
 msgstr "Сервисы ALSA и Pulseaudio."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:16089
-#: doc/guix.texi:16090
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:16246
+#: doc/guix.texi:16247
 #, no-wrap
 msgid "Database Services"
 msgstr "Сервисы баз данных"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "SQL databases, key-value stores, etc."
 msgstr "Базы данных SQL, базы ключ-значение и т. д."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:16249
-#: doc/guix.texi:16250
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:16406
+#: doc/guix.texi:16407
 #, no-wrap
 msgid "Mail Services"
 msgstr "Почтовые сервисы"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "IMAP, POP3, SMTP, and all that."
 msgstr "IMAP, POP3, SMTP и прочее."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:18041
-#: doc/guix.texi:18042
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:18198
+#: doc/guix.texi:18199
 #, no-wrap
 msgid "Messaging Services"
 msgstr "Сервисы сообщений"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Messaging services."
 msgstr "Сервисы сообщений."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:18543
-#: doc/guix.texi:18544
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:18700
+#: doc/guix.texi:18701
 #, no-wrap
 msgid "Telephony Services"
 msgstr "Сервисы телефонии"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Telephony services."
 msgstr "Сервисы телефонии."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:18748
-#: doc/guix.texi:18749
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:18905
+#: doc/guix.texi:18906
 #, no-wrap
 msgid "Monitoring Services"
 msgstr "Сервисы мониторинга"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Monitoring services."
 msgstr "Сервисы мониторинга."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:19253
-#: doc/guix.texi:19254
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:19410
+#: doc/guix.texi:19411
 #, no-wrap
 msgid "Kerberos Services"
 msgstr "Сервисы Kerberos"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Kerberos services."
 msgstr "Сервисы Kerberos."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:19857
-#: doc/guix.texi:19858
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:20014
+#: doc/guix.texi:20015
 #, no-wrap
 msgid "Web Services"
 msgstr "Веб-сервисы"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Web servers."
 msgstr "Веб-серверы."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:20855
-#: doc/guix.texi:20856
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:21047
+#: doc/guix.texi:21048
 #, no-wrap
 msgid "Certificate Services"
 msgstr "Сервисы сертификатов"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "TLS certificates via Let's Encrypt."
 msgstr "Сертификаты TLS через Let's Encrypt."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:21023
-#: doc/guix.texi:21024
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:21219
+#: doc/guix.texi:21220
 #, no-wrap
 msgid "DNS Services"
 msgstr "Сервисы DNS"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "DNS daemons."
 msgstr "DNS-демоны."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:21697
-#: doc/guix.texi:21698
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:21893
+#: doc/guix.texi:21894
 #, no-wrap
 msgid "VPN Services"
 msgstr "VPN-сервисы"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "VPN daemons."
 msgstr "VPN-демоны."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:22055
-#: doc/guix.texi:22056
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:22273
+#: doc/guix.texi:22274
 #, no-wrap
 msgid "Network File System"
 msgstr "Сетевые файловые системы"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "NFS related services."
 msgstr "Сервисы, работающие с сетевыми файловыми системами"
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:22245
-#: doc/guix.texi:22246
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:22463
+#: doc/guix.texi:22464
 #, no-wrap
 msgid "Continuous Integration"
 msgstr "Длительная интеграция"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "The Cuirass service."
 msgstr "Сервис Cuirass"
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:22365
-#: doc/guix.texi:22366
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:22586
+#: doc/guix.texi:22587
 #, no-wrap
 msgid "Power Management Services"
 msgstr "Сервисы управления питанием"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Extending battery life."
 msgstr "Продление жизни батареи."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:22899
-#: doc/guix.texi:22900
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:23120
+#: doc/guix.texi:23121
 #, no-wrap
 msgid "Audio Services"
 msgstr "Сервисы аудио"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "The MPD."
 msgstr "MPD."
 
 #. type: node
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:23018
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:23239
 #, no-wrap
 msgid "Virtualization Services"
 msgstr "Сервисы виртуализации"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Virtualization services."
 msgstr "Сервисы виртуализации."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:23811
-#: doc/guix.texi:23812
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:24032
+#: doc/guix.texi:24033
 #, no-wrap
 msgid "Version Control Services"
 msgstr "Сервисы упраления версиями"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Providing remote access to Git repositories."
 msgstr "Доступ к удалённым репозиториям Git."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:24999
-#: doc/guix.texi:25000
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:25220
+#: doc/guix.texi:25221
 #, no-wrap
 msgid "Game Services"
 msgstr "Игровые службы"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Game servers."
 msgstr "Игровые службы."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:25031
-#: doc/guix.texi:25032
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:25252
+#: doc/guix.texi:25253
 #, no-wrap
 msgid "PAM Mount Service"
 msgstr "Службы подключения PAM"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Service to mount volumes when logging in."
 msgstr "Служба подключения томов при входе в систему."
 
 #. type: subsubheading
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:25163
-#: doc/guix.texi:25164
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:25390
+#: doc/guix.texi:25391
 #, no-wrap
 msgid "Linux Services"
 msgstr "Службы Linux"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Services tied to the Linux kernel."
 msgstr "Службы, привязанные к ядру Linux."
 
 #. type: subsection
-#: doc/guix.texi:316 doc/guix.texi:12119 doc/guix.texi:25229
-#: doc/guix.texi:25230
+#: doc/guix.texi:320 doc/guix.texi:12234 doc/guix.texi:25492
+#: doc/guix.texi:25493
 #, no-wrap
 msgid "Miscellaneous Services"
 msgstr "Разнообразные службы"
 
 #. type: menuentry
-#: doc/guix.texi:316 doc/guix.texi:12119
+#: doc/guix.texi:320 doc/guix.texi:12234
 msgid "Other services."
 msgstr "Другие службы."
 
 #. type: subsection
-#: doc/guix.texi:323 doc/guix.texi:27074 doc/guix.texi:27076
-#: doc/guix.texi:27077
+#: doc/guix.texi:327 doc/guix.texi:27357 doc/guix.texi:27359
+#: doc/guix.texi:27360
 #, no-wrap
 msgid "Service Composition"
 msgstr "Производство сервисов."
 
 #. type: menuentry
-#: doc/guix.texi:323 doc/guix.texi:27074
+#: doc/guix.texi:327 doc/guix.texi:27357
 msgid "The model for composing services."
 msgstr "Модель построения сервисов."
 
 #. type: subsection
-#: doc/guix.texi:323 doc/guix.texi:27074 doc/guix.texi:27132
-#: doc/guix.texi:27133
+#: doc/guix.texi:327 doc/guix.texi:27357 doc/guix.texi:27415
+#: doc/guix.texi:27416
 #, no-wrap
 msgid "Service Types and Services"
 msgstr "Типы сервисов и сервисы"
 
 #. type: menuentry
-#: doc/guix.texi:323 doc/guix.texi:27074
+#: doc/guix.texi:327 doc/guix.texi:27357
 msgid "Types and services."
 msgstr "Типы и сервисы."
 
 #. type: subsection
-#: doc/guix.texi:323 doc/guix.texi:27074 doc/guix.texi:27269
-#: doc/guix.texi:27270
+#: doc/guix.texi:327 doc/guix.texi:27357 doc/guix.texi:27552
+#: doc/guix.texi:27553
 #, no-wrap
 msgid "Service Reference"
 msgstr "Интерфейс сервиса"
 
 #. type: menuentry
-#: doc/guix.texi:323 doc/guix.texi:27074
+#: doc/guix.texi:327 doc/guix.texi:27357
 msgid "API reference."
 msgstr "Доступ через API."
 
 #. type: subsection
-#: doc/guix.texi:323 doc/guix.texi:27074 doc/guix.texi:27542
-#: doc/guix.texi:27543
+#: doc/guix.texi:327 doc/guix.texi:27357 doc/guix.texi:27825
+#: doc/guix.texi:27826
 #, no-wrap
 msgid "Shepherd Services"
 msgstr "Сервисы Shepherd"
 
 #. type: menuentry
-#: doc/guix.texi:323 doc/guix.texi:27074
+#: doc/guix.texi:327 doc/guix.texi:27357
 msgid "A particular type of service."
 msgstr "Особенный тип сервисов."
 
 #. type: cindex
-#: doc/guix.texi:331
+#: doc/guix.texi:335
 #, no-wrap
 msgid "purpose"
 msgstr "цель"
 
 #. type: Plain text
-#: doc/guix.texi:339
+#: doc/guix.texi:343
 msgid "GNU Guix@footnote{``Guix'' is pronounced like ``geeks'', or ``ɡiːks'' using the international phonetic alphabet (IPA).} is a package management tool for and distribution of the GNU system.  Guix makes it easy for unprivileged users to install, upgrade, or remove software packages, to roll back to a previous package set, to build packages from source, and generally assists with the creation and maintenance of software environments."
 msgstr "GNU Guix@footnote{\"Guix\" произносится \"гикс\".} --- это уитилита для управления пакетами и дистрибутив системы GNU. Guix позволяет непривилегированным пользователям устанавливать, обновлять и удалять программные пакеты, откатываться до предыдущих наборов пакетов, собирать пакеты из исходников и обеспечивает создание и поддержку программного окружения в целом."
 
 #. type: cindex
-#: doc/guix.texi:340 doc/guix.texi:415
+#: doc/guix.texi:344 doc/guix.texi:419
 #, no-wrap
 msgid "Guix System"
 msgstr "Система Guix"
 
 #. type: cindex
-#: doc/guix.texi:341
+#: doc/guix.texi:345
 #, no-wrap
 msgid "GuixSD, now Guix System"
 msgstr "GuixSD, теперь система Guix"
 
 #. type: cindex
-#: doc/guix.texi:342
+#: doc/guix.texi:346
 #, no-wrap
 msgid "Guix System Distribution, now Guix System"
 msgstr "Guix System Distribution, теперь система Guix"
 
 #. type: Plain text
-#: doc/guix.texi:351
+#: doc/guix.texi:355
 msgid "You can install GNU@tie{}Guix on top of an existing GNU/Linux system where it complements the available tools without interference (@pxref{Installation}), or you can use it as a standalone operating system distribution, @dfn{Guix@tie{}System}@footnote{We used to refer to Guix System as ``Guix System Distribution'' or ``GuixSD''.  We now consider it makes more sense to group everything under the ``Guix'' banner since, after all, Guix System is readily available through the @command{guix system} command, even if you're using a different distro underneath!}.  @xref{GNU Distribution}."
 msgstr "Вы можете установить GNU@tie{}Guix поверх существующей системы GNU/Linux, и она дополнит функции системы новой утилитой, не внося помехи (@pxref{Installation}). Или можно использовать отдельную операционную систему --- @dfn{систему@tie{}Guix}@footnote{Мы называли систему Guix \"Guix System Distribution\" или \"GuixSD\". Теперь мы считаем, удобнее объединить всё под названием \"Guix\", так что теперь командой @command{guix system} устанавливается система Guix, даже если вы используете другой дистирбутив для её запуска}.  @xref{GNU Distribution}."
 
 #. type: cindex
-#: doc/guix.texi:360
+#: doc/guix.texi:364
 #, no-wrap
 msgid "user interfaces"
 msgstr "пользовательские интерфейсы"
 
 #. type: Plain text
-#: doc/guix.texi:366
+#: doc/guix.texi:370
 msgid "Guix provides a command-line package management interface (@pxref{Package Management}), tools to help with software development (@pxref{Development}), command-line utilities for more advanced usage, (@pxref{Utilities}), as well as Scheme programming interfaces (@pxref{Programming Interface})."
 msgstr "Guix предоставляет интерфейс командной строки для управления пакетами (@pxref{Package Management}), инструменты, которые помогают в разработке программного обеспечения (@pxref{Development}), более сложные утилиты командной строки (@pxref{Utilities}), а также программный интерфейс Scheme (@pxref{Programming Interface})."
 
 #. type: cindex
-#: doc/guix.texi:366
+#: doc/guix.texi:370
 #, no-wrap
 msgid "build daemon"
 msgstr "демон сборки"
 
 #. type: Plain text
-#: doc/guix.texi:370
+#: doc/guix.texi:374
 msgid "Its @dfn{build daemon} is responsible for building packages on behalf of users (@pxref{Setting Up the Daemon}) and for downloading pre-built binaries from authorized sources (@pxref{Substitutes})."
 msgstr "Его @dfn{демон сборки} отвечает за сборку пакетов по запросам пользователей (@pxref{Setting Up the Daemon}) и за скачивание компилированных бинарников из авторизованных ресурсов (@pxref{Substitutes})."
 
 #. type: cindex
-#: doc/guix.texi:371
+#: doc/guix.texi:375
 #, no-wrap
 msgid "extensibility of the distribution"
 msgstr "расширяемость дистрибутива"
 
 #. type: cindex
-#: doc/guix.texi:372 doc/guix.texi:5381
+#: doc/guix.texi:376 doc/guix.texi:5391
 #, no-wrap
 msgid "customization, of packages"
 msgstr "настройка, пакетов"
 
 #. type: Plain text
-#: doc/guix.texi:381
+#: doc/guix.texi:385
 msgid "Guix includes package definitions for many GNU and non-GNU packages, all of which @uref{https://www.gnu.org/philosophy/free-sw.html, respect the user's computing freedom}.  It is @emph{extensible}: users can write their own package definitions (@pxref{Defining Packages}) and make them available as independent package modules (@pxref{Package Modules}).  It is also @emph{customizable}: users can @emph{derive} specialized package definitions from existing ones, including from the command line (@pxref{Package Transformation Options})."
 msgstr "Guix включает определения пакетов для множества проектов GNU и не-GNU, каждый из которых @uref{https://www.gnu.org/philosophy/free-sw.html, уважает свободу пользователя в работе за компьютером}. Он @emph{расширяемый}: пользователи могут писать свои собственные определения пакетов (@pxref{Defining Packages}) и делать их доступными как независимые пакетные модули (@pxref{Package Modules}). Он также @emph{настраиваемый}: пользователи могут @emph{получать} специальные определения пакетов из существующих, в том числе через командную строку (@pxref{Package Transformation Options})."
 
 #. type: cindex
-#: doc/guix.texi:382
+#: doc/guix.texi:386
 #, no-wrap
 msgid "functional package management"
 msgstr "функциональное управление пакетами"
 
 #. type: cindex
-#: doc/guix.texi:383
+#: doc/guix.texi:387
 #, no-wrap
 msgid "isolation"
 msgstr "изоляция"
 
 #. type: Plain text
-#: doc/guix.texi:398
+#: doc/guix.texi:402
 msgid "Under the hood, Guix implements the @dfn{functional package management} discipline pioneered by Nix (@pxref{Acknowledgments}).  In Guix, the package build and installation process is seen as a @emph{function}, in the mathematical sense.  That function takes inputs, such as build scripts, a compiler, and libraries, and returns an installed package.  As a pure function, its result depends solely on its inputs---for instance, it cannot refer to software or scripts that were not explicitly passed as inputs.  A build function always produces the same result when passed a given set of inputs.  It cannot alter the environment of the running system in any way; for instance, it cannot create, modify, or delete files outside of its build and installation directories.  This is achieved by running build processes in isolated environments (or @dfn{containers}), where only their explicit inputs are visible."
 msgstr "Под капотом Guix работает как @dfn{функциональный пакетный менеджер} --- принцип, впервые введённый Nix (@pxref{Acknowledgments}). В Guix процесс сборки и установки пакета рассматривается как @emph{функция} в математическом смысле. Эта функция принимает входные данные, как например, скрипты сборки, компилятор, её результат зависит только от входных данных, и он не может зависеть от программ или скриптов, которые не подаются на вход явным образом. Функция сборки всегда производит один результат, когда получает один и тот же набор входных данных. Она не может как-либо изменять окружение запущенной системы; например, она не может создавать, изменять или удалять файлы за пределами её директорий сборки и установки. Это достигается так: процесс сборки запускается в изолированном окружении (или @dfn{контейнере}), в котором видны только входные данные, заданные явно."
 
 #. type: cindex
-#: doc/guix.texi:399 doc/guix.texi:6747
+#: doc/guix.texi:403 doc/guix.texi:6820
 #, no-wrap
 msgid "store"
 msgstr "склад"
 
 #. type: Plain text
-#: doc/guix.texi:406
+#: doc/guix.texi:410
 msgid "The result of package build functions is @dfn{cached} in the file system, in a special directory called @dfn{the store} (@pxref{The Store}).  Each package is installed in a directory of its own in the store---by default under @file{/gnu/store}.  The directory name contains a hash of all the inputs used to build that package; thus, changing an input yields a different directory name."
 msgstr "Результат работы функций сборки пакетов кешируется в файловой системе в специальной директории, называемой @dfn{склад} (@pxref{The Store}).Каждый пакет устанавливается в собственную директорию склада, по умолчанию --- под @file{/gnu/store}. Имя директории содержит хеш всех входных данных, используемых для сборки этого пакета, так что изменение входных данных порождает различные имена директорий."
 
 #. type: Plain text
-#: doc/guix.texi:410
+#: doc/guix.texi:414
 msgid "This approach is the foundation for the salient features of Guix: support for transactional package upgrade and rollback, per-user installation, and garbage collection of packages (@pxref{Features})."
 msgstr "Этот подход является принципиальным, на нём основаны ключевые особенностей Guix: поддержка транзакционного обновления пакета и откаты, установка для отдельного пользователя, сборка мусора от пакетов (@pxref{Features})."
 
 #. type: Plain text
-#: doc/guix.texi:425
+#: doc/guix.texi:429
 #, fuzzy
 #| msgid "Guix comes with a distribution of the GNU system consisting entirely of free software@footnote{The term ``free'' here refers to the @url{http://www.gnu.org/philosophy/free-sw.html,freedom provided to users of that software}.}.  The distribution can be installed on its own (@pxref{System Installation}), but it is also possible to install Guix as a package manager on top of an installed GNU/Linux system (@pxref{Installation}).  When we need to distinguish between the two, we refer to the standalone distribution as Guix@tie{}System."
 msgid "Guix comes with a distribution of the GNU system consisting entirely of free software@footnote{The term ``free'' here refers to the @url{https://www.gnu.org/philosophy/free-sw.html,freedom provided to users of that software}.}.  The distribution can be installed on its own (@pxref{System Installation}), but it is also possible to install Guix as a package manager on top of an installed GNU/Linux system (@pxref{Installation}).  When we need to distinguish between the two, we refer to the standalone distribution as Guix@tie{}System."
 msgstr "Guix идёт с дистрибутивом системы GNU, которая состоит из полностью свободного программного обеспечения{Понятие свободы ПО раскрыто на странице @url{https://www.gnu.org/philosophy/free-sw.ru.html,Что такое свободная программа?}.}. Дистрибутив может устанавливаться как отдельная система (@pxref{System Installation}), а также возможно установить Guix как пакетный менеджер поверх имеющейся системы GNU/Linux (@pxref{Installation}). Чтобы различать эти понятия, мы обозначаем отдельный дистрибутив словом Система@tie{}Guix."
 
 #. type: Plain text
-#: doc/guix.texi:431
+#: doc/guix.texi:435
 #, fuzzy
 #| msgid "The distribution provides core GNU packages such as GNU libc, GCC, and Binutils, as well as many GNU and non-GNU applications.  The complete list of available packages can be browsed @url{http://www.gnu.org/software/guix/packages,on-line} or by running @command{guix package} (@pxref{Invoking guix package}):"
 msgid "The distribution provides core GNU packages such as GNU libc, GCC, and Binutils, as well as many GNU and non-GNU applications.  The complete list of available packages can be browsed @url{https://www.gnu.org/software/guix/packages,on-line} or by running @command{guix package} (@pxref{Invoking guix package}):"
@@ -3588,190 +3703,190 @@ msgstr ""
 "\"packages,онлайн} или запуском команды @command{guix package} (@pxref{Invoking guix package}):"
 
 #. type: example
-#: doc/guix.texi:434
+#: doc/guix.texi:438
 #, no-wrap
 msgid "guix package --list-available\n"
 msgstr "guix package --list-available\n"
 
 #. type: Plain text
-#: doc/guix.texi:440
+#: doc/guix.texi:444
 msgid "Our goal is to provide a practical 100% free software distribution of Linux-based and other variants of GNU, with a focus on the promotion and tight integration of GNU components, and an emphasis on programs and tools that help users exert that freedom."
 msgstr "Наша цель --- предоставить состоящий на 100% из свободного программного обеспечения рабочий дистрибуив Linux или другие варианты GNU. Мы ориентируемся на продвижении и полноценной интеграции компонентов GNU и поддержке программ и утилит, которые помогают пользователям реализовать их свободы."
 
 #. type: Plain text
-#: doc/guix.texi:442
+#: doc/guix.texi:446
 msgid "Packages are currently available on the following platforms:"
 msgstr "Пакеты в данные момент доступны для следующих платформ:"
 
 #. type: item
-#: doc/guix.texi:445 doc/guix.texi:1921
+#: doc/guix.texi:449 doc/guix.texi:1925
 #, no-wrap
 msgid "x86_64-linux"
 msgstr "x86_64-linux"
 
 #. type: table
-#: doc/guix.texi:447
+#: doc/guix.texi:451
 msgid "Intel/AMD @code{x86_64} architecture, Linux-Libre kernel;"
 msgstr "архитектура Intel/AMD @code{x86_64} с ядром Linux-Libre;"
 
 #. type: item
-#: doc/guix.texi:448 doc/guix.texi:1924
+#: doc/guix.texi:452 doc/guix.texi:1928
 #, no-wrap
 msgid "i686-linux"
 msgstr "i686-linux"
 
 #. type: table
-#: doc/guix.texi:450
+#: doc/guix.texi:454
 msgid "Intel 32-bit architecture (IA32), Linux-Libre kernel;"
 msgstr "архитектура Intel 32-bit (IA32) с ядром Linux-Libre;"
 
 #. type: item
-#: doc/guix.texi:451
+#: doc/guix.texi:455
 #, no-wrap
 msgid "armhf-linux"
 msgstr "armhf-linux"
 
 #. type: table
-#: doc/guix.texi:455
+#: doc/guix.texi:459
 msgid "ARMv7-A architecture with hard float, Thumb-2 and NEON, using the EABI hard-float application binary interface (ABI), and Linux-Libre kernel."
 msgstr "Архитектура ARMv7-A с hard float, Thumb-2 и NEON, используя двочиный интерфейс приложений EABI hard-float (ABI), с ядром Linux-Libre."
 
 #. type: item
-#: doc/guix.texi:456
+#: doc/guix.texi:460
 #, no-wrap
 msgid "aarch64-linux"
 msgstr "aarch64-linux"
 
 #. type: table
-#: doc/guix.texi:458
+#: doc/guix.texi:462
 msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel."
 msgstr "процессоры little-endian 64-bit ARMv8-A с ядром Linux-Libre."
 
 #. type: item
-#: doc/guix.texi:459
+#: doc/guix.texi:463
 #, no-wrap
 msgid "mips64el-linux"
 msgstr "mips64el-linux"
 
 #. type: table
-#: doc/guix.texi:464
+#: doc/guix.texi:468
 msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel.  This configuration is no longer fully supported; in particular, the project's build farms no longer provide substitutes for this architecture."
 msgstr "64-разрядные little-endian процессоры MIPS порядком байтов, в частности серии Loongson, n32 ABI и ядро Linux-Libre. Эта конфигурация больше не поддерживается полностью; в частности, фермы сборки проекта больше не предоставляют замены этой архитектуре."
 
 #. type: Plain text
-#: doc/guix.texi:474
+#: doc/guix.texi:478
 msgid "With Guix@tie{}System, you @emph{declare} all aspects of the operating system configuration and Guix takes care of instantiating the configuration in a transactional, reproducible, and stateless fashion (@pxref{System Configuration}).  Guix System uses the Linux-libre kernel, the Shepherd initialization system (@pxref{Introduction,,, shepherd, The GNU Shepherd Manual}), the well-known GNU utilities and tool chain, as well as the graphical environment or system services of your choice."
 msgstr "Пользуясь системой@tie{}Guix, вы @emph{объявляете} все аспекты конфигурации системы, и Guix выполняет установку инстранции ОС транзакционным, повторяемым способом, не имеющей состояния (stateless) (@pxref{System Configuration}). Система Guix использует ядро Linux-libre, систему инициализации Shepherd (@pxref{Introduction,,, shepherd, The GNU Shepherd Manual}), хорошо известные утилиты и тулчейны GNU, а также графическое окружение на выбор."
 
 #. type: Plain text
-#: doc/guix.texi:477
+#: doc/guix.texi:481
 msgid "Guix System is available on all the above platforms except @code{mips64el-linux}."
 msgstr "Система Guix доступна для платформ, приведённых выше, кроме @code{mips64el-linux}."
 
 #. type: Plain text
-#: doc/guix.texi:481
+#: doc/guix.texi:485
 msgid "For information on porting to other architectures or kernels, @pxref{Porting}."
 msgstr "Информация о портировании на другие архитектуры и ядра доступна в @pxref{Porting}."
 
 #. type: Plain text
-#: doc/guix.texi:484
+#: doc/guix.texi:488
 msgid "Building this distribution is a cooperative effort, and you are invited to join! @xref{Contributing}, for information about how you can help."
 msgstr "Дистрибутив созаётся совместными усилиями, приглашаем вас! См. @xref{Contributing}, чтобы узнать о том, как вы можете помочь."
 
 #. type: cindex
-#: doc/guix.texi:490
+#: doc/guix.texi:494
 #, no-wrap
 msgid "installing Guix"
 msgstr "Установка Guix"
 
 #. type: quotation
-#: doc/guix.texi:502
+#: doc/guix.texi:506
 msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script} to install Guix on top of a running GNU/Linux system, thereafter called a @dfn{foreign distro}.@footnote{This section is concerned with the installation of the package manager, which can be done on top of a running GNU/Linux system.  If, instead, you want to install the complete GNU operating system, @pxref{System Installation}.} The script automates the download, installation, and initial configuration of Guix.  It should be run as the root user."
 msgstr "Мы рекомендуем использовать этот @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, скрипт установки} для установки Guix на существующую систему GNU/Linux, называемый далее @dfn{чужой дистрибутив}.@footnote{Этот раздел описывает установку пакетного менеджера поверх существующей системы GNU/Linux. Если вместо этого вы хотите установить отдельную операционную систему GNU, смотрите @pxref{System Installation}.} Скрипт автоматизирует скачивание, установку и начальную конфигурацию Guix. Он должен запускаться от пользователя root."
 
 #. type: cindex
-#: doc/guix.texi:504 doc/guix.texi:1575
+#: doc/guix.texi:508 doc/guix.texi:1579
 #, no-wrap
 msgid "foreign distro"
 msgstr "чужой дистрибутив"
 
 #. type: cindex
-#: doc/guix.texi:505
+#: doc/guix.texi:509
 #, no-wrap
 msgid "directories related to foreign distro"
 msgstr "директории относящиеся к чужому дистрибутиву"
 
 #. type: Plain text
-#: doc/guix.texi:510
+#: doc/guix.texi:514
 msgid "When installed on a foreign distro, GNU@tie{}Guix complements the available tools without interference.  Its data lives exclusively in two directories, usually @file{/gnu/store} and @file{/var/guix}; other files on your system, such as @file{/etc}, are left untouched."
 msgstr "При установке на чужой дистрибутив GNU@tie{}Guix дополняет доступные утилиты без внесения помех. Его данные живут только в двух директориях --- обычно @file{/gnu/store} и @file{/var/guix}; другие файлы вашей системы, как @file{/etc}, остаются нетронутыми."
 
 #. type: Plain text
-#: doc/guix.texi:513
+#: doc/guix.texi:517
 msgid "Once installed, Guix can be updated by running @command{guix pull} (@pxref{Invoking guix pull})."
 msgstr "Установленный Guix можно обновлять командой @command{guix pull} (@pxref{Invoking guix pull})."
 
 #. type: Plain text
-#: doc/guix.texi:518
+#: doc/guix.texi:522
 msgid "If you prefer to perform the installation steps manually or want to tweak them, you may find the following subsections useful.  They describe the software requirements of Guix, as well as how to install it manually and get ready to use it."
 msgstr "Если вы предпочитаете выполнять шаги установки вручную или хотита подправить их, следующие параграфы будут полезны. В них описаны требования Guix к программному обеспечению, а также процесс ручной установки до запуска в работу."
 
 #. type: section
-#: doc/guix.texi:527 doc/guix.texi:1775 doc/guix.texi:1776
+#: doc/guix.texi:531 doc/guix.texi:1779 doc/guix.texi:1780
 #, no-wrap
 msgid "Upgrading Guix"
 msgstr "Обновление Guix"
 
 #. type: menuentry
-#: doc/guix.texi:527
+#: doc/guix.texi:531
 msgid "Upgrading Guix and its build daemon."
 msgstr "Обновление Guix и этого службы сборки."
 
 #. type: cindex
-#: doc/guix.texi:532
+#: doc/guix.texi:536
 #, no-wrap
 msgid "installing Guix from binaries"
 msgstr "установка Guix из бинарных файлов"
 
 #. type: cindex
-#: doc/guix.texi:533
+#: doc/guix.texi:537
 #, no-wrap
 msgid "installer script"
 msgstr "скрипт установки"
 
 #. type: Plain text
-#: doc/guix.texi:539
+#: doc/guix.texi:543
 msgid "This section describes how to install Guix on an arbitrary system from a self-contained tarball providing binaries for Guix and for all its dependencies.  This is often quicker than installing from source, which is described in the next sections.  The only requirement is to have GNU@tie{}tar and Xz."
 msgstr "Этот раздел описывает, как установить Guix на обычную систему из отдельного архива, который содержит бинарники Guix и все его зависимости. Это обычно быстрее установки из исходных кодов, которая описана в следующем разделе. Единственное требование - иметь GNU@tie{}tar и Xz."
 
 #. type: quotation
-#: doc/guix.texi:547
+#: doc/guix.texi:551
 msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script}.  The script automates the download, installation, and initial configuration steps described below.  It should be run as the root user."
 msgstr "Мы рекомендуем использовать этот @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, установочный скрипт}. Скрипт автоматизирует скачивание, установку и начальные шаги конфигурации, описанные ниже. Он должен запускаться от пользователя root."
 
 #. type: Plain text
-#: doc/guix.texi:550
+#: doc/guix.texi:554
 msgid "Installing goes along these lines:"
 msgstr "Установка производится следующими образом:"
 
 #. type: cindex
-#: doc/guix.texi:553
+#: doc/guix.texi:557
 #, no-wrap
 msgid "downloading Guix binary"
 msgstr "скачивание бинарника Guix"
 
 #. type: enumerate
-#: doc/guix.texi:558
+#: doc/guix.texi:562
 msgid "Download the binary tarball from @indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz}, where @var{system} is @code{x86_64-linux} for an @code{x86_64} machine already running the kernel Linux, and so on."
 msgstr "Скачайте архив с бинарником из @indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz}, где @var{system} --- это @code{x86_64-linux} для машины @code{x86_64}, на которой уже запущено ядро Linux, и так далее."
 
 #. type: enumerate
-#: doc/guix.texi:562
+#: doc/guix.texi:566
 msgid "Make sure to download the associated @file{.sig} file and to verify the authenticity of the tarball against it, along these lines:"
 msgstr "Убедитесь в аутентичности архива, скачав файл @file{.sig} и запустив:"
 
 #. type: example
-#: doc/guix.texi:566
+#: doc/guix.texi:570
 #, no-wrap
 msgid ""
 "$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n"
@@ -3781,12 +3896,12 @@ msgstr ""
 "$ gpg --verify guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n"
 
 #. type: Plain text
-#: doc/guix.texi:570 doc/guix.texi:1939
+#: doc/guix.texi:574 doc/guix.texi:1943
 msgid "If that command fails because you do not have the required public key, then run this command to import it:"
 msgstr "Если это завершается ошибкой, значит у вас нет необходимого публичного ключа, тогда запустите команду для импорта ключа:"
 
 #. type: example
-#: doc/guix.texi:574 doc/guix.texi:1943
+#: doc/guix.texi:578 doc/guix.texi:1947
 #, no-wrap
 msgid ""
 "$ wget @value{OPENPGP-SIGNING-KEY-URL} \\\n"
@@ -3796,22 +3911,22 @@ msgstr ""
 "      -qO - | gpg --import -\n"
 
 #. type: Plain text
-#: doc/guix.texi:578 doc/guix.texi:1947
+#: doc/guix.texi:582 doc/guix.texi:1951
 msgid "and rerun the @code{gpg --verify} command."
 msgstr "и запустите команду @code{gpg --verify}."
 
 #. type: Plain text
-#: doc/guix.texi:581 doc/guix.texi:1950
+#: doc/guix.texi:585 doc/guix.texi:1954
 msgid "Take note that a warning like ``This key is not certified with a trusted signature!'' is normal."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:587
+#: doc/guix.texi:591
 msgid "Now, you need to become the @code{root} user.  Depending on your distribution, you may have to run @code{su -} or @code{sudo -i}.  As @code{root}, run:"
 msgstr "Теперь вам необходимы привилегии пользователя @code{root}. В зависимости от вашего дистрибутива, можно запустить @code{su -} или @code{sudo -i}.  Под @code{root} запустите:"
 
 #. type: example
-#: doc/guix.texi:593
+#: doc/guix.texi:597
 #, no-wrap
 msgid ""
 "# cd /tmp\n"
@@ -3825,27 +3940,27 @@ msgstr ""
 "# mv var/guix /var/ && mv gnu /\n"
 
 #. type: enumerate
-#: doc/guix.texi:598
+#: doc/guix.texi:602
 msgid "This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}.  The latter contains a ready-to-use profile for @code{root} (see next step.)"
 msgstr "Это создаёт @file{/gnu/store} (@pxref{The Store}) и @file{/var/guix}. Последнее содержит готовый к использованию профиль для @code{root} (подробнее в следующем шаге)."
 
 #. type: enumerate
-#: doc/guix.texi:601
+#: doc/guix.texi:605
 msgid "Do @emph{not} unpack the tarball on a working Guix system since that would overwrite its own essential files."
 msgstr "@emph{Не} распаковывайте архив в работающую систему Guix, так как это перезапишет её основные файлы."
 
 #. type: enumerate
-#: doc/guix.texi:611
+#: doc/guix.texi:615
 msgid "The @code{--warning=no-timestamp} option makes sure GNU@tie{}tar does not emit warnings about ``implausibly old time stamps'' (such warnings were triggered by GNU@tie{}tar 1.26 and older; recent versions are fine.)  They stem from the fact that all the files in the archive have their modification time set to zero (which means January 1st, 1970.)  This is done on purpose to make sure the archive content is independent of its creation time, thus making it reproducible."
 msgstr "Опция  @code{--warning=no-timestamp} необходима, чтобы удостовериться, что GNU@tie{}tar не вызывает ошибок об \"устаревшей дате\", подобные ошибки появлялись в GNU@tie{}tar 1.26 и старше, в последних версиях всё в порядке). Они возникают из-за того, что архив имеет нулевую дату модификации (что соответствует 1 января 1970). Это сделано с той целью, чтобы удостовериться, что содержимое архива не засисит от даты его создания, что делает его воспроизводимым (повторяемым)."
 
 #. type: enumerate
-#: doc/guix.texi:615
+#: doc/guix.texi:619
 msgid "Make the profile available under @file{~root/.config/guix/current}, which is where @command{guix pull} will install updates (@pxref{Invoking guix pull}):"
 msgstr "Сделайте профиль доступным по пути @file{~root/.config/guix/current}, куда @command{guix pull} будет устанавливать обновления (@pxref{Invoking guix pull}):"
 
 #. type: example
-#: doc/guix.texi:620
+#: doc/guix.texi:624
 #, no-wrap
 msgid ""
 "# mkdir -p ~root/.config/guix\n"
@@ -3857,12 +3972,12 @@ msgstr ""
 "         ~root/.config/guix/current\n"
 
 #. type: enumerate
-#: doc/guix.texi:624
+#: doc/guix.texi:628
 msgid "Source @file{etc/profile} to augment @code{PATH} and other relevant environment variables:"
 msgstr "Добавьте @file{etc/profile} в @code{PATH} и другие соответствующие переменные окружения:"
 
 #. type: example
-#: doc/guix.texi:628
+#: doc/guix.texi:632
 #, no-wrap
 msgid ""
 "# GUIX_PROFILE=\"`echo ~root`/.config/guix/current\" ; \\\n"
@@ -3872,22 +3987,22 @@ msgstr ""
 "  source $GUIX_PROFILE/etc/profile\n"
 
 #. type: enumerate
-#: doc/guix.texi:633
+#: doc/guix.texi:637
 msgid "Create the group and user accounts for build users as explained below (@pxref{Build Environment Setup})."
 msgstr "Создайте группу и пользовательские учётные записи, как это обозначено в (@pxref{Build Environment Setup})."
 
 #. type: enumerate
-#: doc/guix.texi:636
+#: doc/guix.texi:640
 msgid "Run the daemon, and set it to automatically start on boot."
 msgstr "Запустите демон и сделайте добавьте его в автоззагрузку после старта."
 
 #. type: enumerate
-#: doc/guix.texi:639
+#: doc/guix.texi:643
 msgid "If your host distro uses the systemd init system, this can be achieved with these commands:"
 msgstr "Если ваш дистрибутив использует систему инициализации systemd, этого можно добиться следующими командами:"
 
 #. type: example
-#: doc/guix.texi:651
+#: doc/guix.texi:655
 #, no-wrap
 msgid ""
 "# cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \\\n"
@@ -3899,12 +4014,12 @@ msgstr ""
 "# systemctl start guix-daemon && systemctl enable guix-daemon\n"
 
 #. type: itemize
-#: doc/guix.texi:654 doc/guix.texi:10349
+#: doc/guix.texi:658 doc/guix.texi:10448
 msgid "If your host distro uses the Upstart init system:"
 msgstr "Если ваш дистрибутив использует систему инициализации Upstart:"
 
 #. type: example
-#: doc/guix.texi:660
+#: doc/guix.texi:664
 #, no-wrap
 msgid ""
 "# initctl reload-configuration\n"
@@ -3918,12 +4033,12 @@ msgstr ""
 "# start guix-daemon\n"
 
 #. type: enumerate
-#: doc/guix.texi:663
+#: doc/guix.texi:667
 msgid "Otherwise, you can still start the daemon manually with:"
 msgstr "Или можно запускать демон вручную так:"
 
 #. type: example
-#: doc/guix.texi:667
+#: doc/guix.texi:671
 #, no-wrap
 msgid ""
 "# ~root/.config/guix/current/bin/guix-daemon \\\n"
@@ -3933,12 +4048,12 @@ msgstr ""
 "       --build-users-group=guixbuild\n"
 
 #. type: enumerate
-#: doc/guix.texi:672
+#: doc/guix.texi:676
 msgid "Make the @command{guix} command available to other users on the machine, for instance with:"
 msgstr "Сделайте команду @command{guix} доступной для других пользователей машины, например, так:"
 
 #. type: example
-#: doc/guix.texi:677
+#: doc/guix.texi:681
 #, no-wrap
 msgid ""
 "# mkdir -p /usr/local/bin\n"
@@ -3950,12 +4065,12 @@ msgstr ""
 "# ln -s /var/guix/profiles/per-user/root/current-guix/bin/guix\n"
 
 #. type: enumerate
-#: doc/guix.texi:681
+#: doc/guix.texi:685
 msgid "It is also a good idea to make the Info version of this manual available there:"
 msgstr "Хорошо также предоставить доступ к Info-версии руководства так:"
 
 #. type: example
-#: doc/guix.texi:687
+#: doc/guix.texi:691
 #, no-wrap
 msgid ""
 "# mkdir -p /usr/local/share/info\n"
@@ -3969,23 +4084,23 @@ msgstr ""
 "  do ln -s $i ; done\n"
 
 #. type: enumerate
-#: doc/guix.texi:693
+#: doc/guix.texi:697
 msgid "That way, assuming @file{/usr/local/share/info} is in the search path, running @command{info guix} will open this manual (@pxref{Other Info Directories,,, texinfo, GNU Texinfo}, for more details on changing the Info search path.)"
 msgstr "Это добавляет @file{/usr/local/share/info} в поиск, запуск @command{info guix} откроет это руководство, см. (@pxref{Other Info Directories,,, texinfo, GNU Texinfo} для подробной информации об изменении путей поиска Info). "
 
 #. type: cindex
-#: doc/guix.texi:695 doc/guix.texi:3248 doc/guix.texi:12628
+#: doc/guix.texi:699 doc/guix.texi:3269 doc/guix.texi:12760
 #, no-wrap
 msgid "substitutes, authorization thereof"
 msgstr "авторизация, подстановок"
 
 #. type: enumerate
-#: doc/guix.texi:698
+#: doc/guix.texi:702
 msgid "To use substitutes from @code{@value{SUBSTITUTE-SERVER}} or one of its mirrors (@pxref{Substitutes}), authorize them:"
 msgstr "Чтобы использовать подстановки из @code{@value{SUBSTITUTE-SERVER}} или из одного из зеркал (@pxref{Substitutes}), авторизуйте их:"
 
 #. type: example
-#: doc/guix.texi:702
+#: doc/guix.texi:706
 #, no-wrap
 msgid ""
 "# guix archive --authorize < \\\n"
@@ -3995,44 +4110,44 @@ msgstr ""
 "     ~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER}.pub\n"
 
 #. type: enumerate
-#: doc/guix.texi:707
+#: doc/guix.texi:711
 msgid "Each user may need to perform a few additional steps to make their Guix environment ready for use, @pxref{Application Setup}."
 msgstr "Каждый пользователь, возможно, должен выполнить дополнительные шаги, чтобы сделать их окружение Guix готовым к использованию @pxref{Application Setup}."
 
 #. type: Plain text
-#: doc/guix.texi:710
+#: doc/guix.texi:714
 msgid "Voilà, the installation is complete!"
 msgstr "Вуаля! Установка завершена!"
 
 #. type: Plain text
-#: doc/guix.texi:713
+#: doc/guix.texi:717
 msgid "You can confirm that Guix is working by installing a sample package into the root profile:"
 msgstr "Вы можете проверить, что Guix работает, установив тестовый пакет для профиля root:"
 
 #. type: example
-#: doc/guix.texi:716
+#: doc/guix.texi:720
 #, no-wrap
 msgid "# guix install hello\n"
 msgstr "# guix install hello\n"
 
 #. type: Plain text
-#: doc/guix.texi:720
+#: doc/guix.texi:724
 msgid "The binary installation tarball can be (re)produced and verified simply by running the following command in the Guix source tree:"
 msgstr "Архив для бинарной установки может быть воспроизведён (повторён) и проверен простым запуском следующей команды в дереве исходников Guix:"
 
 #. type: example
-#: doc/guix.texi:723
+#: doc/guix.texi:727
 #, no-wrap
 msgid "make guix-binary.@var{system}.tar.xz\n"
 msgstr "make guix-binary.@var{system}.tar.xz\n"
 
 #. type: Plain text
-#: doc/guix.texi:727
+#: doc/guix.texi:731
 msgid "...@: which, in turn, runs:"
 msgstr "...@, что в свою очередь, выполнит:"
 
 #. type: example
-#: doc/guix.texi:731
+#: doc/guix.texi:735
 #, no-wrap
 msgid ""
 "guix pack -s @var{system} --localstatedir \\\n"
@@ -4042,271 +4157,273 @@ msgstr ""
 "  --profile-name=current-guix guix\n"
 
 #. type: Plain text
-#: doc/guix.texi:734
+#: doc/guix.texi:738
 msgid "@xref{Invoking guix pack}, for more info on this handy tool."
 msgstr "@xref{Invoking guix pack} для подробной информации об этом полезном инструменте."
 
 #. type: Plain text
-#: doc/guix.texi:742
+#: doc/guix.texi:746
 msgid "This section lists requirements when building Guix from source.  The build procedure for Guix is the same as for other GNU software, and is not covered here.  Please see the files @file{README} and @file{INSTALL} in the Guix source tree for additional details."
 msgstr "Этот раздел содержит требования для сборки Guix из исходников. Пожалуйста, смотрите файлы @file{README} и @file{INSTALL} в дереве исходников Guix для подробной информации."
 
 #. type: cindex
-#: doc/guix.texi:743
+#: doc/guix.texi:747
 #, no-wrap
 msgid "official website"
 msgstr "официальный веб-сайт"
 
 #. type: Plain text
-#: doc/guix.texi:746
+#: doc/guix.texi:750
 msgid "GNU Guix is available for download from its website at @url{https://www.gnu.org/software/guix/}."
 msgstr "GNU Guix доступен для скачивания на сайте @url{https://www.gnu.org/software/guix/}."
 
 #. type: Plain text
-#: doc/guix.texi:748
+#: doc/guix.texi:752
 msgid "GNU Guix depends on the following packages:"
 msgstr "GNU Guix зависит от следующих пакетов:"
 
 #. type: item
-#: doc/guix.texi:750
+#: doc/guix.texi:754
 #, no-wrap
 msgid "@url{https://gnu.org/software/guile/, GNU Guile}, version 3.0.x or"
 msgstr "@url{https://gnu.org/software/guile/, GNU Guile} версии 3.0.x или"
 
 #. type: itemize
-#: doc/guix.texi:752
+#: doc/guix.texi:756
 msgid "2.2.x;"
 msgstr "2.2.x;"
 
 #. type: item
-#: doc/guix.texi:752
+#: doc/guix.texi:756
 #, no-wrap
 msgid "@url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, version"
 msgstr "@url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt} версии"
 
 #. type: itemize
-#: doc/guix.texi:754
+#: doc/guix.texi:758
 msgid "0.1.0 or later;"
 msgstr "0.1.0 или более поздней;"
 
 #. type: itemize
-#: doc/guix.texi:758
+#: doc/guix.texi:762
 msgid "@uref{https://gnutls.org/, GnuTLS}, specifically its Guile bindings (@pxref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile});"
 msgstr "@uref{https://gnutls.org/, GnuTLS} применимо к привязкам Guile (@pxref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile});"
 
 #. type: itemize
-#: doc/guix.texi:761
+#: doc/guix.texi:765
 msgid "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0 or later;"
 msgstr "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3} версии 0.1.0 или новее;"
 
 #. type: itemize
-#: doc/guix.texi:765
+#: doc/guix.texi:769
 msgid "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August 2017 or later;"
 msgstr "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git} от августа 2017 или более поздней;"
 
 #. type: item
-#: doc/guix.texi:765
+#: doc/guix.texi:769
 #, no-wrap
 msgid "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON} 3.x;"
 msgstr "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON} 3.x;"
 
 #. type: item
-#: doc/guix.texi:766
+#: doc/guix.texi:770
 #, no-wrap
 msgid "@url{https://zlib.net, zlib};"
 msgstr "@url{https://zlib.net, zlib};"
 
 #. type: item
-#: doc/guix.texi:767
+#: doc/guix.texi:771
 #, no-wrap
 msgid "@url{https://www.gnu.org/software/make/, GNU Make}."
 msgstr "@url{https://www.gnu.org/software/make/, GNU Make}."
 
 #. type: Plain text
-#: doc/guix.texi:771
+#: doc/guix.texi:775
 msgid "The following dependencies are optional:"
 msgstr "Следующие зависимости необязательны:"
 
 #. type: itemize
-#: doc/guix.texi:779
-msgid "Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.10.2 or later."
+#: doc/guix.texi:783
+#, fuzzy
+#| msgid "Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.10.2 or later."
+msgid "Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.12.0 or later."
 msgstr "Поддержка разгрузки сборки (@pxref{Daemon Offload Setup}) и @command{guix copy} (@pxref{Invoking guix copy}) зависят от @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} версии 0.10.2 или новее."
 
 #. type: itemize
-#: doc/guix.texi:784
+#: doc/guix.texi:788
 msgid "When @url{https://www.nongnu.org/lzip/lzlib.html, lzlib} is available, lzlib substitutes can be used and @command{guix publish} can compress substitutes with lzlib."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:788
+#: doc/guix.texi:792
 msgid "When @url{http://www.bzip.org, libbz2} is available, @command{guix-daemon} can use it to compress build logs."
 msgstr "Если доступна @url{http://www.bzip.org, libbz2}, @command{guix-daemon} может использовать её для сжатия логов сборки."
 
 #. type: Plain text
-#: doc/guix.texi:792
+#: doc/guix.texi:796
 msgid "Unless @code{--disable-daemon} was passed to @command{configure}, the following packages are also needed:"
 msgstr "Если строка @code{--disable-daemon} не использовалась в @command{configure}, тогда необходимы также следующие пакеты:"
 
 #. type: item
-#: doc/guix.texi:794
+#: doc/guix.texi:798
 #, no-wrap
 msgid "@url{https://gnupg.org/, GNU libgcrypt};"
 msgstr "@url{https://gnupg.org/, GNU libgcrypt};"
 
 #. type: item
-#: doc/guix.texi:795
+#: doc/guix.texi:799
 #, no-wrap
 msgid "@url{https://sqlite.org, SQLite 3};"
 msgstr "@url{https://sqlite.org, SQLite 3};"
 
 #. type: item
-#: doc/guix.texi:796
+#: doc/guix.texi:800
 #, no-wrap
 msgid "@url{https://gcc.gnu.org, GCC's g++}, with support for the"
 msgstr "@url{https://gcc.gnu.org, GCC's g++} с поддержкой"
 
 #. type: itemize
-#: doc/guix.texi:798
+#: doc/guix.texi:802
 msgid "C++11 standard."
 msgstr "стандарта C++11."
 
 #. type: cindex
-#: doc/guix.texi:800
+#: doc/guix.texi:804
 #, no-wrap
 msgid "state directory"
 msgstr "главный каталог"
 
 #. type: Plain text
-#: doc/guix.texi:809
+#: doc/guix.texi:813
 msgid "When configuring Guix on a system that already has a Guix installation, be sure to specify the same state directory as the existing installation using the @code{--localstatedir} option of the @command{configure} script (@pxref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}).  Usually, this @var{localstatedir} option is set to the value @file{/var}.  The @command{configure} script protects against unintended misconfiguration of @var{localstatedir} so you do not inadvertently corrupt your store (@pxref{The Store})."
 msgstr "Если Guix развёртывается в системе, где уже был установлен Guix, необходимо указать главный каталог предыдущей инсталляции, используя параметр @code{--localstatedir} в скрипте @command{configure} (@pxref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}). Скрипт @command{configure} защищает от ошибок в конфигурации @var{localstatedir}, предотвращая непреднамеренное повреждение хранилища (@pxref{The Store})."
 
 #. type: cindex
-#: doc/guix.texi:813
+#: doc/guix.texi:817
 #, no-wrap
 msgid "test suite"
 msgstr "набор тестов"
 
 #. type: Plain text
-#: doc/guix.texi:819
+#: doc/guix.texi:823
 msgid "After a successful @command{configure} and @code{make} run, it is a good idea to run the test suite.  It can help catch issues with the setup or environment, or bugs in Guix itself---and really, reporting test failures is a good way to help improve the software.  To run the test suite, type:"
 msgstr "После успешного завершения @command{configure} и @code{make} хорошо бы выполнить набор тестов. Это поможет выявить проблемы установки или в окружении, как и баги самого Guix (на самом деле, отчёты об ошибках тестов помогают улучшить ПО). Чтобы запустить тесты, напечатайте:"
 
 #. type: example
-#: doc/guix.texi:822
+#: doc/guix.texi:826
 #, no-wrap
 msgid "make check\n"
 msgstr "make check\n"
 
 #. type: Plain text
-#: doc/guix.texi:829
+#: doc/guix.texi:833
 msgid "Test cases can run in parallel: you can use the @code{-j} option of GNU@tie{}make to speed things up.  The first run may take a few minutes on a recent machine; subsequent runs will be faster because the store that is created for test purposes will already have various things in cache."
 msgstr "Тесты можно выполнять параллельно при включении опции @code{-j} в GNU@tie{}make, так быстрее. Первый запуск может длиться несколько минут на топовой машине, последующие запуски будут быстрее, так как склад, который создаётся для тестов, уже закеширует различные вещи."
 
 #. type: Plain text
-#: doc/guix.texi:832
+#: doc/guix.texi:836
 msgid "It is also possible to run a subset of the tests by defining the @code{TESTS} makefile variable as in this example:"
 msgstr "Также можно запустить отдельные наборы тестов, используя переменную @code{TESTS}, как в примере:"
 
 #. type: example
-#: doc/guix.texi:835
+#: doc/guix.texi:839
 #, no-wrap
 msgid "make check TESTS=\"tests/store.scm tests/cpio.scm\"\n"
 msgstr "make check TESTS=\"tests/store.scm tests/cpio.scm\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:840
+#: doc/guix.texi:844
 msgid "By default, tests results are displayed at a file level.  In order to see the details of every individual test cases, it is possible to define the @code{SCM_LOG_DRIVER_FLAGS} makefile variable as in this example:"
 msgstr "По умолчанию результаты тестов выводятся в файл. Чтобы просмотреть результаты каждого отдельного теста, нужно задать переменную makifile @code{SCM_LOG_DRIVER_FLAGS}, как в примере:"
 
 #. type: example
-#: doc/guix.texi:843
+#: doc/guix.texi:847
 #, no-wrap
 msgid "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n"
 msgstr "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:849
+#: doc/guix.texi:853
 msgid "Upon failure, please email @email{bug-guix@@gnu.org} and attach the @file{test-suite.log} file.  Please specify the Guix version being used as well as version numbers of the dependencies (@pxref{Requirements}) in your message."
 msgstr "В случае ошибки, пожалуйста, отправьте сообщение на  @email{bug-guix@@gnu.org} и присоедините файл @file{test-suite.log}.  Пожалуйста, обозначьте в сообщении используемую версию Guix, а также номера версий зависимостей (@pxref{Requirements})."
 
 #. type: Plain text
-#: doc/guix.texi:853
+#: doc/guix.texi:857
 msgid "Guix also comes with a whole-system test suite that tests complete Guix System instances.  It can only run on systems where Guix is already installed, using:"
 msgstr "Guix также идёт с набором тестов для всей системы, который проверяет нстранцию системы Guix. Их можно запустить только в системах, где Guix уже установлен, так:"
 
 #. type: example
-#: doc/guix.texi:856
+#: doc/guix.texi:860
 #, no-wrap
 msgid "make check-system\n"
 msgstr "make check-system\n"
 
 #. type: Plain text
-#: doc/guix.texi:860
+#: doc/guix.texi:864
 msgid "or, again, by defining @code{TESTS} to select a subset of tests to run:"
 msgstr "или, опять же, задав @code{TESTS}, чтобы выбрать список тестов для запуска:"
 
 #. type: example
-#: doc/guix.texi:863
+#: doc/guix.texi:867
 #, no-wrap
 msgid "make check-system TESTS=\"basic mcron\"\n"
 msgstr "make check-system TESTS=\"basic mcron\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:871
+#: doc/guix.texi:875
 msgid "These system tests are defined in the @code{(gnu tests @dots{})} modules.  They work by running the operating systems under test with lightweight instrumentation in a virtual machine (VM).  They can be computationally intensive or rather cheap, depending on whether substitutes are available for their dependencies (@pxref{Substitutes}).  Some of them require a lot of storage space to hold VM images."
 msgstr "Тесты системы определены в модулях @code{(gnu tests @dots{})}. При работе они запускают операционную систему под легковесным инструментарием в виртуальной машине. Они могут выполнять тяжёлые вычисления или довольно простые в зависимости от наличия подстановок их зависимостей (@pxref{Substitutes}). Некоторые из них требуют много места для работы с образами виртуальной машины."
 
 #. type: Plain text
-#: doc/guix.texi:874
+#: doc/guix.texi:878
 msgid "Again in case of test failures, please send @email{bug-guix@@gnu.org} all the details."
 msgstr "Конечно, в случае неудачных тестов, пожалуйста, направьте детали на @email{bug-guix@@gnu.org}."
 
 #. type: cindex
-#: doc/guix.texi:878
+#: doc/guix.texi:882
 #, no-wrap
 msgid "daemon"
 msgstr "демон"
 
 #. type: Plain text
-#: doc/guix.texi:886
+#: doc/guix.texi:890
 msgid "Operations such as building a package or running the garbage collector are all performed by a specialized process, the @dfn{build daemon}, on behalf of clients.  Only the daemon may access the store and its associated database.  Thus, any operation that manipulates the store goes through the daemon.  For instance, command-line tools such as @command{guix package} and @command{guix build} communicate with the daemon (@i{via} remote procedure calls) to instruct it what to do."
 msgstr "Такие операции, как сборка пакета или запуск сборщика мусора, выполняются запуском специальных процесса --- @dfn{демона сборки} --- по запросам клиентов. Только демон имеет доступ к складу и его базе данных. Так что операции управления складом выполняются с помощью демона. Например, инструменты командной строки, как @command{guix package} и @command{guix build}, обычно взаимодействуют с демоном @i{через} удалённый вызов процедур (RPC) и сообщают, что необходимо сделать."
 
 #. type: Plain text
-#: doc/guix.texi:890
+#: doc/guix.texi:894
 msgid "The following sections explain how to prepare the build daemon's environment.  See also @ref{Substitutes}, for information on how to allow the daemon to download pre-built binaries."
 msgstr "Следующие разделы поясняют как настроить окружение демона сборки. Смотрите также @ref{Substitutes} для подробной инсорации о том, как разрешить демону скачивать собранные бинарники."
 
 #. type: cindex
-#: doc/guix.texi:900 doc/guix.texi:1323
+#: doc/guix.texi:904 doc/guix.texi:1327
 #, no-wrap
 msgid "build environment"
 msgstr "окружение сборки"
 
 #. type: Plain text
-#: doc/guix.texi:908
+#: doc/guix.texi:912
 msgid "In a standard multi-user setup, Guix and its daemon---the @command{guix-daemon} program---are installed by the system administrator; @file{/gnu/store} is owned by @code{root} and @command{guix-daemon} runs as @code{root}.  Unprivileged users may use Guix tools to build packages or otherwise access the store, and the daemon will do it on their behalf, ensuring that the store is kept in a consistent state, and allowing built packages to be shared among users."
 msgstr "В случае стандартной многопользовательской установки Guix и его демон (программа @command{guix-daemon}) установливаются системным администратором; @file{/gnu/store} принадлежит @code{root}, и @command{guix-daemon} запущен от @code{root}. Непривилегированные пользователи могут пользоваться инструментами Guix, чтобы собирать пакеты или получить доступ к складу с какой-либо целью, и демон выполнит это по их запросу, убедившись, что склад находится в должном состоянии, и разрешив сборку пакетов и разделение их между пользователями."
 
 #. type: cindex
-#: doc/guix.texi:909
+#: doc/guix.texi:913
 #, no-wrap
 msgid "build users"
 msgstr "пользователи сборки"
 
 #. type: Plain text
-#: doc/guix.texi:920
+#: doc/guix.texi:924
 msgid "When @command{guix-daemon} runs as @code{root}, you may not want package build processes themselves to run as @code{root} too, for obvious security reasons.  To avoid that, a special pool of @dfn{build users} should be created for use by build processes started by the daemon.  These build users need not have a shell and a home directory: they will just be used when the daemon drops @code{root} privileges in build processes.  Having several such users allows the daemon to launch distinct build processes under separate UIDs, which guarantees that they do not interfere with each other---an essential feature since builds are regarded as pure functions (@pxref{Introduction})."
 msgstr "Когда @command{guix-daemon} запущен от @code{root}, возможно, из соображений безопасности вы не примете того, что процессы сборки пакетов тоже выполняются от @code{root}. Чтобы избежать этого, необходимо создать специальных @dfn{пользователей для сборки}. Ими будет пользоваться процесс сборки, запускаемый демоном. Эти пользователи сборки не должны иметь оболочки и домашней директории --- они просто будут использоваться, когда демон сбрасывает привилегии @code{root} в процессе сборки. Наличие нескольких таких пользователей позволит демону запускать отдельные процессы сборки  под отдельными UID, что гарантирует, что они не будут помехой друг другу --- важная особенность, учитывая, что сборка рассматривается как чистая функция (@pxref{Introduction})."
 
 #. type: Plain text
-#: doc/guix.texi:923
+#: doc/guix.texi:927
 msgid "On a GNU/Linux system, a build user pool may be created like this (using Bash syntax and the @code{shadow} commands):"
 msgstr "В системе GNU/Linux набор пользователей для сборки может быть создан так (используя синтаксис команды Bash @code{shadow}):"
 
 #. type: example
-#: doc/guix.texi:935
+#: doc/guix.texi:939
 #, no-wrap
 msgid ""
 "# groupadd --system guixbuild\n"
@@ -4328,113 +4445,113 @@ msgstr ""
 "  done\n"
 
 #. type: Plain text
-#: doc/guix.texi:945
+#: doc/guix.texi:949
 msgid "The number of build users determines how many build jobs may run in parallel, as specified by the @option{--max-jobs} option (@pxref{Invoking guix-daemon, @option{--max-jobs}}).  To use @command{guix system vm} and related commands, you may need to add the build users to the @code{kvm} group so they can access @file{/dev/kvm}, using @code{-G guixbuild,kvm} instead of @code{-G guixbuild} (@pxref{Invoking guix system})."
 msgstr "Число пользователей для сборки определяет, сколько задач сборки может быть запущено параллельно. Это задаётся опцией @option{--max-jobs} (@pxref{Invoking guix-daemon, @option{--max-jobs}}). Чтобы использовать @command{guix system vm} и подобные, вам потребуется добавить пользователей для сборки в группу @code{kvm}, так чтобы они имели доступ к @file{/dev/kvm}, используя @code{-G guixbuild,kvm} вместо @code{-G guixbuild} (@pxref{Invoking guix system})."
 
 #. type: Plain text
-#: doc/guix.texi:954
+#: doc/guix.texi:958
 msgid "The @code{guix-daemon} program may then be run as @code{root} with the following command@footnote{If your machine uses the systemd init system, dropping the @file{@var{prefix}/lib/systemd/system/guix-daemon.service} file in @file{/etc/systemd/system} will ensure that @command{guix-daemon} is automatically started.  Similarly, if your machine uses the Upstart init system, drop the @file{@var{prefix}/lib/upstart/system/guix-daemon.conf} file in @file{/etc/init}.}:"
 msgstr "Программа @code{guix-daemon} тогда может запускаться от @code{root} следующим образом@footnote{Если ваша машина использует систему инициализации systemd, сбрасывание файла @file{@var{prefix}/lib/systemd/system/guix-daemon.service} в @file{/etc/systemd/system} должно гарантировать, что @command{guix-daemon} запущен автоматически. Также, если ваша машина использует систему инициализации Upstart, нужно сбрасить файл @file{@var{prefix}/lib/upstart/system/guix-daemon.conf} в @file{/etc/init}.}:"
 
 #. type: example
-#: doc/guix.texi:957 doc/guix.texi:1316
+#: doc/guix.texi:961 doc/guix.texi:1320
 #, no-wrap
 msgid "# guix-daemon --build-users-group=guixbuild\n"
 msgstr "# guix-daemon --build-users-group=guixbuild\n"
 
 #. type: cindex
-#: doc/guix.texi:959 doc/guix.texi:1321
+#: doc/guix.texi:963 doc/guix.texi:1325
 #, no-wrap
 msgid "chroot"
 msgstr "chroot"
 
 #. type: Plain text
-#: doc/guix.texi:964
+#: doc/guix.texi:968
 msgid "This way, the daemon starts build processes in a chroot, under one of the @code{guixbuilder} users.  On GNU/Linux, by default, the chroot environment contains nothing but:"
 msgstr "Так демон стартует процессы сборки в chroot под одним из пользователей группы @code{guixbuilder}. В GNU/Linux по умолчанию окружение chroot содержит только следующее:"
 
 #. type: itemize
-#: doc/guix.texi:972
+#: doc/guix.texi:976
 msgid "a minimal @code{/dev} directory, created mostly independently from the host @code{/dev}@footnote{``Mostly'', because while the set of files that appear in the chroot's @code{/dev} is fixed, most of these files can only be created if the host has them.};"
 msgstr "минимальный состав директории @code{/dev}, созданной максимально независимо от исходной @code{/dev}@footnote{\"Максимально\", потому что файлы, доступные в chroot под @code{/dev}, могут быть созданы только, если машина их имеет};"
 
 #. type: itemize
-#: doc/guix.texi:976
+#: doc/guix.texi:980
 msgid "the @code{/proc} directory; it only shows the processes of the container since a separate PID name space is used;"
 msgstr "директория @code{/proc}; она показывает только процессы контейнера, так как используется отдельное пространство имён процессов PID;"
 
 #. type: itemize
-#: doc/guix.texi:980
+#: doc/guix.texi:984
 msgid "@file{/etc/passwd} with an entry for the current user and an entry for user @file{nobody};"
 msgstr "@file{/etc/passwd} с записью о текущем пользователе и пользователе @file{nobody};"
 
 #. type: itemize
-#: doc/guix.texi:983
+#: doc/guix.texi:987
 msgid "@file{/etc/group} with an entry for the user's group;"
 msgstr "@file{/etc/group} с записью о группе пользователя;"
 
 #. type: itemize
-#: doc/guix.texi:987
+#: doc/guix.texi:991
 msgid "@file{/etc/hosts} with an entry that maps @code{localhost} to @code{127.0.0.1};"
 msgstr "@file{/etc/hosts} с записью, которая адресует @code{localhost} на @code{127.0.0.1};"
 
 #. type: itemize
-#: doc/guix.texi:990
+#: doc/guix.texi:994
 msgid "a writable @file{/tmp} directory."
 msgstr "директория @file{/tmp}, доступная для записи."
 
 #. type: Plain text
-#: doc/guix.texi:999
+#: doc/guix.texi:1003
 msgid "You can influence the directory where the daemon stores build trees @i{via} the @code{TMPDIR} environment variable.  However, the build tree within the chroot is always called @file{/tmp/guix-build-@var{name}.drv-0}, where @var{name} is the derivation name---e.g., @code{coreutils-8.24}.  This way, the value of @code{TMPDIR} does not leak inside build environments, which avoids discrepancies in cases where build processes capture the name of their build tree."
 msgstr "Можно указать директорию, в которую демон сохраняет деревья сборки @i{через} переменную окружения @code{TMPDIR}. Однако дерево сборки внутри chroot всегда называется @file{/tmp/guix-build-@var{name}.drv-0}, где @var{name} - это имя деривации, то есть, например, @code{coreutils-8.24}. Так значение @code{TMPDIR} не проникает внутрь окружения сборки, что предотвращает расхождения и случаях, когда процессы сборки имеют иные имена их деревьев сборки."
 
 #. type: vindex
-#: doc/guix.texi:1000 doc/guix.texi:3346
+#: doc/guix.texi:1004 doc/guix.texi:3367
 #, no-wrap
 msgid "http_proxy"
 msgstr "http_proxy"
 
 #. type: Plain text
-#: doc/guix.texi:1004
+#: doc/guix.texi:1008
 msgid "The daemon also honors the @code{http_proxy} environment variable for HTTP downloads it performs, be it for fixed-output derivations (@pxref{Derivations}) or for substitutes (@pxref{Substitutes})."
 msgstr "Демон также уважаем переменную окружения @code{http_proxy}, когда выполняет скачивание по HTTP как для дериваций с фиксированным результатом (@pxref{Derivations}), так и для подстановок (@pxref{Substitutes})."
 
 #. type: Plain text
-#: doc/guix.texi:1012
+#: doc/guix.texi:1016
 msgid "If you are installing Guix as an unprivileged user, it is still possible to run @command{guix-daemon} provided you pass @code{--disable-chroot}.  However, build processes will not be isolated from one another, and not from the rest of the system.  Thus, build processes may interfere with each other, and may access programs, libraries, and other files available on the system---making it much harder to view them as @emph{pure} functions."
 msgstr "Если вы устанавливаете Guix как непривилегированный пользователь, всё ещё возможно запустить @command{guix-daemon} с указанием @code{--disable-chroot}. Однако процессы сборки не будут изолированы один от другого, а также от остальной системы. Так процессы сборки смогут внести помехи в работу друг друга, смогут получить доступ к программам, библиотекам и другим файлам, доступным в системе, что конечно, делает затруднительным рассмотрение сборки как @emph{чистой} функции."
 
 #. type: subsection
-#: doc/guix.texi:1015
+#: doc/guix.texi:1019
 #, no-wrap
 msgid "Using the Offload Facility"
 msgstr "Использование функционала разгрузки"
 
 #. type: cindex
-#: doc/guix.texi:1017 doc/guix.texi:1379
+#: doc/guix.texi:1021 doc/guix.texi:1383
 #, no-wrap
 msgid "offloading"
 msgstr "разгрузка"
 
 #. type: cindex
-#: doc/guix.texi:1018
+#: doc/guix.texi:1022
 #, no-wrap
 msgid "build hook"
 msgstr "хук сборки"
 
 #. type: Plain text
-#: doc/guix.texi:1032
+#: doc/guix.texi:1036
 msgid "When desired, the build daemon can @dfn{offload} derivation builds to other machines running Guix, using the @code{offload} @dfn{build hook}@footnote{This feature is available only when @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} is present.}.  When that feature is enabled, a list of user-specified build machines is read from @file{/etc/guix/machines.scm}; every time a build is requested, for instance via @code{guix build}, the daemon attempts to offload it to one of the machines that satisfy the constraints of the derivation, in particular its system type---e.g., @file{x86_64-linux}.  Missing prerequisites for the build are copied over SSH to the target machine, which then proceeds with the build; upon success the output(s) of the build are copied back to the initial machine."
 msgstr "При необходимости, демон сборки может @dfn{разгружать} сборку деривации на другие машины, работающие с Guix, используя @code{разгрузочный} @dfn{хук сборки}@footnote{Эта функция доступна только при наличии @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}.}. Когда эта функция включена, тогда считывается список машин для сборки, заданный пользователем в файле @file{/etc/guix/machines.scm}; при каждом запросе сборки командой @code{guix build} демон предпринимает попытку разгрузить сборку на одну из машин, удовлетворяющих требованиям деривации, в частноси, требованиям к типу системы, т.е. @file{x86_64-linux}. Отсутствующий набор данных и пакетов, необходимы для сборки, копируется через SSH на целевую машину, на которой затем выполняется процесс сборки. После успешного завершения результат(ы) сборки копируются обратно на машину, инициировавшую сборку."
 
 #. type: Plain text
-#: doc/guix.texi:1034
+#: doc/guix.texi:1038
 msgid "The @file{/etc/guix/machines.scm} file typically looks like this:"
 msgstr "Файл @file{/etc/guix/machines.scm} обычно выглядит так:"
 
 #. type: lisp
-#: doc/guix.texi:1042
+#: doc/guix.texi:1046
 #, no-wrap
 msgid ""
 "(list (build-machine\n"
@@ -4454,7 +4571,7 @@ msgstr ""
 "\n"
 
 #. type: lisp
-#: doc/guix.texi:1051
+#: doc/guix.texi:1055
 #, no-wrap
 msgid ""
 "      (build-machine\n"
@@ -4476,93 +4593,93 @@ msgstr ""
 "                        \"/.ssh/identity-for-guix\"))))\n"
 
 #. type: Plain text
-#: doc/guix.texi:1057
+#: doc/guix.texi:1061
 msgid "In the example above we specify a list of two build machines, one for the @code{x86_64} architecture and one for the @code{mips64el} architecture."
 msgstr "В примере выше мы обозначили список, состоящий из двух машин: одна --- для архитектуры @code{x86_64}, а другая --- для архитектуры @code{mips64el}."
 
 #. type: Plain text
-#: doc/guix.texi:1066
+#: doc/guix.texi:1070
 msgid "In fact, this file is---not surprisingly!---a Scheme file that is evaluated when the @code{offload} hook is started.  Its return value must be a list of @code{build-machine} objects.  While this example shows a fixed list of build machines, one could imagine, say, using DNS-SD to return a list of potential build machines discovered in the local network (@pxref{Introduction, Guile-Avahi,, guile-avahi, Using Avahi in Guile Scheme Programs}).  The @code{build-machine} data type is detailed below."
 msgstr "По факту, этот файл, что не удивительно, является файлом Scheme, и он имеет значение, когда запускается @code{хук разгрузки}. Он возвращает объекты класса @code{build-machine}. Приведённый пример показывает фиксированный список машин для сборки, но можно представить, скажем, используя DNS-SD, он может возвращать список потенциальных машин, обнаруженных в локальной сети (@pxref{Introduction, Guile-Avahi,, guile-avahi, Using Avahi in Guile Scheme Programs}). Тип данных @code{build-machine} описан ниже."
 
 #. type: deftp
-#: doc/guix.texi:1067
+#: doc/guix.texi:1071
 #, no-wrap
 msgid "{Data Type} build-machine"
 msgstr "{Тип данных} build-machine"
 
 #. type: deftp
-#: doc/guix.texi:1070
+#: doc/guix.texi:1074
 msgid "This data type represents build machines to which the daemon may offload builds.  The important fields are:"
 msgstr "Этот тип данных представляет машины для сборки, на которые демон может разгружать сборки. Важные поля:"
 
 #. type: item
-#: doc/guix.texi:1073 doc/guix.texi:5702 doc/guix.texi:11649
-#: doc/guix.texi:11731 doc/guix.texi:11958 doc/guix.texi:13711
-#: doc/guix.texi:18729 doc/guix.texi:19314 doc/guix.texi:19925
-#: doc/guix.texi:20244 doc/guix.texi:20285 doc/guix.texi:25411
-#: doc/guix.texi:25428 doc/guix.texi:25822 doc/guix.texi:27382
-#: doc/guix.texi:27640
+#: doc/guix.texi:1077 doc/guix.texi:5712 doc/guix.texi:11761
+#: doc/guix.texi:11843 doc/guix.texi:12073 doc/guix.texi:13868
+#: doc/guix.texi:18886 doc/guix.texi:19471 doc/guix.texi:20082
+#: doc/guix.texi:20412 doc/guix.texi:20453 doc/guix.texi:25674
+#: doc/guix.texi:25691 doc/guix.texi:26085 doc/guix.texi:27665
+#: doc/guix.texi:27923
 #, no-wrap
 msgid "name"
 msgstr "name"
 
 #. type: table
-#: doc/guix.texi:1075
+#: doc/guix.texi:1079
 msgid "The host name of the remote machine."
 msgstr "Имя хоста удалённой машины"
 
 #. type: code{#1}
-#: doc/guix.texi:1076 doc/guix.texi:26888
+#: doc/guix.texi:1080 doc/guix.texi:27171
 #, no-wrap
 msgid "system"
 msgstr "system"
 
 #. type: table
-#: doc/guix.texi:1078
+#: doc/guix.texi:1082
 msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}."
 msgstr "Тип системы удалённой машины, то есть @code{x86_64-linux}."
 
 #. type: code{#1}
-#: doc/guix.texi:1079 doc/guix.texi:13721
+#: doc/guix.texi:1083 doc/guix.texi:13878
 #, no-wrap
 msgid "user"
 msgstr "user"
 
 #. type: table
-#: doc/guix.texi:1083
+#: doc/guix.texi:1087
 msgid "The user account to use when connecting to the remote machine over SSH.  Note that the SSH key pair must @emph{not} be passphrase-protected, to allow non-interactive logins."
 msgstr "Аккаунт пользователя, используемый для соединения с удалённой машиной через SSH. Отметим, что ключ-пара SSH @emph{не} должна быть защищена парольной фразой, чтобы разрешить не интерактивные авторизации."
 
 #. type: item
-#: doc/guix.texi:1084
+#: doc/guix.texi:1088
 #, no-wrap
 msgid "host-key"
 msgstr "host-key"
 
 #. type: table
-#: doc/guix.texi:1088
+#: doc/guix.texi:1092
 msgid "This must be the machine's SSH @dfn{public host key} in OpenSSH format.  This is used to authenticate the machine when we connect to it.  It is a long string that looks like this:"
 msgstr "Это @dfn{публичный ключ хоста} в формает OpenSSH. Он используется при аутентификации машины, когда мы подсоединяемс к ней. Это длинная строка, которая выглядит примерно так:"
 
 #. type: example
-#: doc/guix.texi:1091
+#: doc/guix.texi:1095
 #, no-wrap
 msgid "ssh-ed25519 AAAAC3NzaC@dots{}mde+UhL hint@@example.org\n"
 msgstr "ssh-ed25519 AAAAC3NzaC@dots{}mde+UhL hint@@example.org\n"
 
 #. type: table
-#: doc/guix.texi:1096
+#: doc/guix.texi:1100
 msgid "If the machine is running the OpenSSH daemon, @command{sshd}, the host key can be found in a file such as @file{/etc/ssh/ssh_host_ed25519_key.pub}."
 msgstr "Если на машине запущен демон OpenSSH @command{sshd}, ключ хоста может быть найден в файле под директорией /etc/ssh, например, @file{/etc/ssh/ssh_host_ed25519_key.pub}."
 
 #. type: table
-#: doc/guix.texi:1101
+#: doc/guix.texi:1105
 msgid "If the machine is running the SSH daemon of GNU@tie{}lsh, @command{lshd}, the host key is in @file{/etc/lsh/host-key.pub} or a similar file.  It can be converted to the OpenSSH format using @command{lsh-export-key} (@pxref{Converting keys,,, lsh, LSH Manual}):"
 msgstr "Если на машине запущен демон SSH GNU@tie{}lsh, @command{lshd}, тогда ключ хоста расположен в @file{/etc/lsh/host-key.pub} или подобном файле. Его можно конвертировать в формат OpenSSH, используя @command{lsh-export-key} (@pxref{Converting keys,,, lsh, LSH Manual}):"
 
 #. type: example
-#: doc/guix.texi:1105
+#: doc/guix.texi:1109
 #, no-wrap
 msgid ""
 "$ lsh-export-key --openssh < /etc/lsh/host-key.pub\n"
@@ -4572,838 +4689,838 @@ msgstr ""
 "ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV@dots{}\n"
 
 #. type: deftp
-#: doc/guix.texi:1110
+#: doc/guix.texi:1114
 msgid "A number of optional fields may be specified:"
 msgstr "Список необязательных полей:"
 
 #. type: item
-#: doc/guix.texi:1113 doc/guix.texi:26894
+#: doc/guix.texi:1117 doc/guix.texi:27177
 #, no-wrap
 msgid "@code{port} (default: @code{22})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:1115
+#: doc/guix.texi:1119
 msgid "Port number of SSH server on the machine."
 msgstr "Номер порта сервера SSH на машине."
 
 #. type: item
-#: doc/guix.texi:1116
+#: doc/guix.texi:1120
 #, no-wrap
 msgid "@code{private-key} (default: @file{~root/.ssh/id_rsa})"
 msgstr "@code{private-key} (default: @file{~root/.ssh/id_rsa})"
 
 #. type: table
-#: doc/guix.texi:1119
+#: doc/guix.texi:1123
 msgid "The SSH private key file to use when connecting to the machine, in OpenSSH format.  This key must not be protected with a passphrase."
 msgstr "Файл приватного ключа в формате OpenSSH, используемого в соединении с машиной. Этот ключ не должен быть защищён парольной фразой."
 
 #. type: table
-#: doc/guix.texi:1122
+#: doc/guix.texi:1126
 msgid "Note that the default value is the private key @emph{of the root account}.  Make sure it exists if you use the default."
 msgstr "Отметим, что значение по умолчанию --- приватный ключ @emph{аккаунта root}. Убедитесь, что он существует, если вы используете настройки по умолчанию."
 
 #. type: item
-#: doc/guix.texi:1123
+#: doc/guix.texi:1127
 #, no-wrap
 msgid "@code{compression} (default: @code{\"zlib@@openssh.com,zlib\"})"
 msgstr "@code{compression} (default: @code{\"zlib@@openssh.com,zlib\"})"
 
 #. type: itemx
-#: doc/guix.texi:1124
+#: doc/guix.texi:1128
 #, no-wrap
 msgid "@code{compression-level} (default: @code{3})"
 msgstr "@code{compression-level} (default: @code{3})"
 
 #. type: table
-#: doc/guix.texi:1126
+#: doc/guix.texi:1130
 msgid "The SSH-level compression methods and compression level requested."
 msgstr "Методы компрессии уровня SSH и уровень компрессии."
 
 #. type: table
-#: doc/guix.texi:1129
+#: doc/guix.texi:1133
 msgid "Note that offloading relies on SSH compression to reduce bandwidth usage when transferring files to and from build machines."
 msgstr "Отметим, что разгрузка зависит от компрессии SSH, что уменьшает использование траффика при передаче файлов на и с машин для сборки."
 
 #. type: item
-#: doc/guix.texi:1130
+#: doc/guix.texi:1134
 #, no-wrap
 msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
 msgstr "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
 
 #. type: table
-#: doc/guix.texi:1133
+#: doc/guix.texi:1137
 msgid "File name of the Unix-domain socket @command{guix-daemon} is listening to on that machine."
 msgstr "Имя файла сокета Unix-домена, который слушает @command{guix-daemon} на удалённой машине."
 
 #. type: item
-#: doc/guix.texi:1134
+#: doc/guix.texi:1138
 #, no-wrap
 msgid "@code{parallel-builds} (default: @code{1})"
 msgstr "@code{parallel-builds} (default: @code{1})"
 
 #. type: table
-#: doc/guix.texi:1136
+#: doc/guix.texi:1140
 msgid "The number of builds that may run in parallel on the machine."
 msgstr "Число сборок, которые могут быть запущены на машине."
 
 #. type: item
-#: doc/guix.texi:1137
+#: doc/guix.texi:1141
 #, no-wrap
 msgid "@code{speed} (default: @code{1.0})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:1140
+#: doc/guix.texi:1144
 msgid "A ``relative speed factor''.  The offload scheduler will tend to prefer machines with a higher speed factor."
 msgstr "Показатель скорости. Планировщик разгрузки предпримет попытку выбрать машину с наибольшим показателем скорости."
 
 #. type: item
-#: doc/guix.texi:1141
+#: doc/guix.texi:1145
 #, no-wrap
 msgid "@code{features} (default: @code{'()})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:1146
+#: doc/guix.texi:1150
 msgid "A list of strings denoting specific features supported by the machine.  An example is @code{\"kvm\"} for machines that have the KVM Linux modules and corresponding hardware support.  Derivations can request features by name, and they will be scheduled on matching build machines."
 msgstr "Набор строк, описывающий специфические функции, которые поддерживаются на машине. Например, @code{\"kvm\"} для машин, которые имеют модули Linux KVM и соответствующую поддерку аппаратного обеспечения. Деривации могут запрашивать функции по имени, и тогда они будут запранированы на соответствующих машинах для сборки."
 
 #. type: Plain text
-#: doc/guix.texi:1152
+#: doc/guix.texi:1156
 msgid "The @command{guix} command must be in the search path on the build machines.  You can check whether this is the case by running:"
 msgstr "Команда @command{guix} должна быть в путях для поиска на машинах лоя сборки. Можно проверить это, выполнив:"
 
 #. type: example
-#: doc/guix.texi:1155
+#: doc/guix.texi:1159
 #, no-wrap
 msgid "ssh build-machine guix repl --version\n"
 msgstr "ssh build-machine guix repl --version\n"
 
 #. type: Plain text
-#: doc/guix.texi:1162
+#: doc/guix.texi:1166
 msgid "There is one last thing to do once @file{machines.scm} is in place.  As explained above, when offloading, files are transferred back and forth between the machine stores.  For this to work, you first need to generate a key pair on each machine to allow the daemon to export signed archives of files from the store (@pxref{Invoking guix archive}):"
 msgstr "Есть ещё одна вещь, которую нужно выполнить после размещения @file{machines.scm}. Выше описано, что при разгрузке файлы передаются вперёд и назад между складами на машинах. Для этого необходимо сгенерировать ключ-пару на кадой машине, чтобы позволить демону экспортировать подписанные архивы файлов из склада (@pxref{Invoking guix archive}):"
 
 #. type: example
-#: doc/guix.texi:1165 doc/guix.texi:26842
+#: doc/guix.texi:1169 doc/guix.texi:27105
 #, no-wrap
 msgid "# guix archive --generate-key\n"
 msgstr "# guix archive --generate-key\n"
 
 #. type: Plain text
-#: doc/guix.texi:1170
+#: doc/guix.texi:1174
 msgid "Each build machine must authorize the key of the master machine so that it accepts store items it receives from the master:"
 msgstr "Каждая машина для сорки должна авторизовать ключ машины-инициатора, чтобы принимать элементы из склада, которые присылает инициатор:"
 
 #. type: example
-#: doc/guix.texi:1173
+#: doc/guix.texi:1177
 #, no-wrap
 msgid "# guix archive --authorize < master-public-key.txt\n"
 msgstr "# guix archive --authorize < master-public-key.txt\n"
 
 #. type: Plain text
-#: doc/guix.texi:1177
+#: doc/guix.texi:1181
 msgid "Likewise, the master machine must authorize the key of each build machine."
 msgstr "Точно так же машина-инициатор должна авторизовать ключ каждой машины для сборки."
 
 #. type: Plain text
-#: doc/guix.texi:1183
+#: doc/guix.texi:1187
 msgid "All the fuss with keys is here to express pairwise mutual trust relations between the master and the build machines.  Concretely, when the master receives files from a build machine (and @i{vice versa}), its build daemon can make sure they are genuine, have not been tampered with, and that they are signed by an authorized key."
 msgstr "Всё движение с ключами, описанное здесь, создаёт надёжную двустороннюю свзь между инициатором и машинами для сборки. А именно, когда машина-инициатор принимает файлы из машины для сборки (или @i{наборот}), её демон может удостоверить их подлинность и невмешательство других, а также то, что они подписаны авторизованным ключом."
 
 #. type: cindex
-#: doc/guix.texi:1184
+#: doc/guix.texi:1188
 #, no-wrap
 msgid "offload test"
 msgstr "тест разгрузки"
 
 #. type: Plain text
-#: doc/guix.texi:1187
+#: doc/guix.texi:1191
 msgid "To test whether your setup is operational, run this command on the master node:"
 msgstr "Чтобы проверить работоспособность настроек, запустите следующую команду на инициирующем узле:"
 
 #. type: example
-#: doc/guix.texi:1190
+#: doc/guix.texi:1194
 #, no-wrap
 msgid "# guix offload test\n"
 msgstr "# guix offload test\n"
 
 #. type: Plain text
-#: doc/guix.texi:1196
+#: doc/guix.texi:1200
 msgid "This will attempt to connect to each of the build machines specified in @file{/etc/guix/machines.scm}, make sure Guile and the Guix modules are available on each machine, attempt to export to the machine and import from it, and report any error in the process."
 msgstr "Это выполнит попытку соединиться с каждой из машин для сборки, обозначенных в @file{/etc/guix/machines.scm}, проверит наличие модулей Guile и Guix на каждой машине, а также сделает попытку экспортировать и импортировать, а затем выведет отчёт об этом процессе."
 
 #. type: Plain text
-#: doc/guix.texi:1199
+#: doc/guix.texi:1203
 msgid "If you want to test a different machine file, just specify it on the command line:"
 msgstr "Если нужно тестировать другой файл с описанием машин, просто приведите его в командной строке:"
 
 #. type: example
-#: doc/guix.texi:1202
+#: doc/guix.texi:1206
 #, no-wrap
 msgid "# guix offload test machines-qualif.scm\n"
 msgstr "# guix offload test machines-qualif.scm\n"
 
 #. type: Plain text
-#: doc/guix.texi:1206
+#: doc/guix.texi:1210
 msgid "Last, you can test the subset of the machines whose name matches a regular expression like this:"
 msgstr "И последнее, можно тестировать набор машин, чьи имена соответствуют регулярному выражению, например:"
 
 #. type: example
-#: doc/guix.texi:1209
+#: doc/guix.texi:1213
 #, no-wrap
 msgid "# guix offload test machines.scm '\\.gnu\\.org$'\n"
 msgstr "# guix offload test machines.scm '\\.gnu\\.org$'\n"
 
 #. type: cindex
-#: doc/guix.texi:1211
+#: doc/guix.texi:1215
 #, no-wrap
 msgid "offload status"
 msgstr "статус разгрузки"
 
 #. type: Plain text
-#: doc/guix.texi:1214
+#: doc/guix.texi:1218
 msgid "To display the current load of all build hosts, run this command on the main node:"
 msgstr "Чтобы отобразить текущую загрузку всех машин для сборки, запустите команду на инициирущем узле:"
 
 #. type: example
-#: doc/guix.texi:1217
+#: doc/guix.texi:1221
 #, no-wrap
 msgid "# guix offload status\n"
 msgstr "# guix offload status\n"
 
 #. type: cindex
-#: doc/guix.texi:1223
+#: doc/guix.texi:1227
 #, no-wrap
 msgid "SELinux, daemon policy"
 msgstr "SELinux, политика демона"
 
 #. type: cindex
-#: doc/guix.texi:1224
+#: doc/guix.texi:1228
 #, no-wrap
 msgid "mandatory access control, SELinux"
 msgstr "мандатный контроль доступа, SELinux"
 
 #. type: cindex
-#: doc/guix.texi:1225
+#: doc/guix.texi:1229
 #, no-wrap
 msgid "security, guix-daemon"
 msgstr "безопасность, guix-daemon"
 
 #. type: Plain text
-#: doc/guix.texi:1231
+#: doc/guix.texi:1235
 msgid "Guix includes an SELinux policy file at @file{etc/guix-daemon.cil} that can be installed on a system where SELinux is enabled, in order to label Guix files and to specify the expected behavior of the daemon.  Since Guix System does not provide an SELinux base policy, the daemon policy cannot be used on Guix System."
 msgstr "Guix включает файл политик SELinnux @file{etc/guix-daemon.cil}, который может устанавливаться в систему, в которой включен SELinux, тогда файлы Guix будут помечены и настроены для соответствующего поведения демона. Так как система Guix не предоставляет политику SELinux, политика демона не может использоваться в системе Guix."
 
 #. type: subsubsection
-#: doc/guix.texi:1232
+#: doc/guix.texi:1236
 #, no-wrap
 msgid "Installing the SELinux policy"
 msgstr "Установка политики SELinux"
 
 #. type: cindex
-#: doc/guix.texi:1233
+#: doc/guix.texi:1237
 #, no-wrap
 msgid "SELinux, policy installation"
 msgstr "SELinux, установка политики"
 
 #. type: Plain text
-#: doc/guix.texi:1235
+#: doc/guix.texi:1239
 msgid "To install the policy run this command as root:"
 msgstr "Чтобы установить политику, запустите следующую команду от root:"
 
 #. type: example
-#: doc/guix.texi:1238
+#: doc/guix.texi:1242
 #, no-wrap
 msgid "semodule -i etc/guix-daemon.cil\n"
 msgstr "semodule -i etc/guix-daemon.cil\n"
 
 #. type: Plain text
-#: doc/guix.texi:1242
+#: doc/guix.texi:1246
 msgid "Then relabel the file system with @code{restorecon} or by a different mechanism provided by your system."
 msgstr "Затем измените метку файловой системы с @code{restorecon} или другим механизмом, поставляемым вашей системой."
 
 #. type: Plain text
-#: doc/guix.texi:1247
+#: doc/guix.texi:1251
 msgid "Once the policy is installed, the file system has been relabeled, and the daemon has been restarted, it should be running in the @code{guix_daemon_t} context.  You can confirm this with the following command:"
 msgstr "Когда политика установлена, изменена метка файловой системы и демон перезапущен, она должна работать в контексте @code{guix_daemon_t}. Можно проверить это следующей командой:"
 
 #. type: example
-#: doc/guix.texi:1250
+#: doc/guix.texi:1254
 #, no-wrap
 msgid "ps -Zax | grep guix-daemon\n"
 msgstr "ps -Zax | grep guix-daemon\n"
 
 #. type: Plain text
-#: doc/guix.texi:1255
+#: doc/guix.texi:1259
 msgid "Monitor the SELinux log files as you run a command like @code{guix build hello} to convince yourself that SELinux permits all necessary operations."
 msgstr "Наблюдайте файлы логов SELinux во время работы команды @code{guix build hello}, чтобы удостовериться, что SELinux позволяет выполнение необходимых операций."
 
 #. type: cindex
-#: doc/guix.texi:1257
+#: doc/guix.texi:1261
 #, no-wrap
 msgid "SELinux, limitations"
 msgstr "SELinux, ограничения"
 
 #. type: Plain text
-#: doc/guix.texi:1262
+#: doc/guix.texi:1266
 msgid "This policy is not perfect.  Here is a list of limitations or quirks that should be considered when deploying the provided SELinux policy for the Guix daemon."
 msgstr "Эта политика не совершенна. Тут есть ряд ограничений или причуд, который нужно учитывать при разворачивании политики SELinux для демона Guix."
 
 #. type: enumerate
-#: doc/guix.texi:1269
+#: doc/guix.texi:1273
 msgid "@code{guix_daemon_socket_t} isn’t actually used.  None of the socket operations involve contexts that have anything to do with @code{guix_daemon_socket_t}.  It doesn’t hurt to have this unused label, but it would be preferrable to define socket rules for only this label."
 msgstr "@code{guix_daemon_socket_t} на самом деле не используется. Никакие операции с сокетом не выполняются. Ничего плохого в том, чтобы иметь эту неиспользуемую метку, но желательно определить правила сокета для этой метки."
 
 #. type: enumerate
-#: doc/guix.texi:1280
+#: doc/guix.texi:1284
 msgid "@code{guix gc} cannot access arbitrary links to profiles.  By design, the file label of the destination of a symlink is independent of the file label of the link itself.  Although all profiles under $localstatedir are labelled, the links to these profiles inherit the label of the directory they are in.  For links in the user’s home directory this will be @code{user_home_t}.  But for links from the root user’s home directory, or @file{/tmp}, or the HTTP server’s working directory, etc, this won’t work.  @code{guix gc} would be prevented from reading and following these links."
 msgstr "@code{guix gc} не может получить доступ к обычным ссылкам профилей. По задумке метка файла назначения символической ссылки не зависит от метки файла самой ссылки. Хотя все профили под $localstatedir помечены, ссылки на эти профили не наследуют метку директории, в которой они находятся. Для ссылок на домашние директории пользователей это будет @code{user_home_t}. Но для ссылок из домашней директории root, а также @file{/tmp} или рабочей директории HTTP-сервера и т.п., это не работает.  @code{guix gc} не будет допускаться к чтению и следованию по этим ссылкам."
 
 #. type: enumerate
-#: doc/guix.texi:1285
+#: doc/guix.texi:1289
 msgid "The daemon’s feature to listen for TCP connections might no longer work.  This might require extra rules, because SELinux treats network sockets differently from files."
 msgstr "Функция демона прослушивать соединения TCP может более не работать. Это может потребовать дополнительных правил, потому что SELinux относится к сетевым сокетам иначе, чем к файлам."
 
 #. type: enumerate
-#: doc/guix.texi:1296
+#: doc/guix.texi:1300
 msgid "Currently all files with a name matching the regular expression @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} are assigned the label @code{guix_daemon_exec_t}; this means that @emph{any} file with that name in any profile would be permitted to run in the @code{guix_daemon_t} domain.  This is not ideal.  An attacker could build a package that provides this executable and convince a user to install and run it, which lifts it into the @code{guix_daemon_t} domain.  At that point SELinux could not prevent it from accessing files that are allowed for processes in that domain."
 msgstr "В настоящее время всем файлам с именами, соответствующими регулярному выражению @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon}, присвоена метка @code{guix_daemon_exec_t}; это означает, что @emph{любому} файлу с таким именем в любом профиле разрешён запуск в домене @code{guix_daemon_t}. Это не идеально. Атакующий может собрать пакет, который содержит исполняемый файл и убеить пользователя установить и запустить его, и таким образом он получит доступ к домену @code{guix_daemon_t}. В этой связи SELinux мог бы не давать ему доступ к файлам, которые разрешены для процессов в этом домене."
 
 #. type: enumerate
-#: doc/guix.texi:1304
+#: doc/guix.texi:1308
 msgid "We could generate a much more restrictive policy at installation time, so that only the @emph{exact} file name of the currently installed @code{guix-daemon} executable would be labelled with @code{guix_daemon_exec_t}, instead of using a broad regular expression.  The downside is that root would have to install or upgrade the policy at installation time whenever the Guix package that provides the effectively running @code{guix-daemon} executable is upgraded."
 msgstr "Мы можем создать политику с большими ограничениями во время установки, так чтобы только @emph{точное} имя исполняемого файла установленного в данный момент @code{guix-daemon} было помечено меткой @code{guix_daemon_exec_t} вместо того, чтобы использовать регулярное выражение, выбирающее большой ряд файлов. Проблемой в данном случае будет то, что root потребуется устанавливать или обновлять политику во время любой установки в случае, если обновлён исполняемый файл @code{guix-daemon}."
 
 #. type: section
-#: doc/guix.texi:1307
+#: doc/guix.texi:1311
 #, no-wrap
 msgid "Invoking @command{guix-daemon}"
 msgstr "Вызов @command{guix-daemon}"
 
 #. type: Plain text
-#: doc/guix.texi:1313
+#: doc/guix.texi:1317
 msgid "The @command{guix-daemon} program implements all the functionality to access the store.  This includes launching build processes, running the garbage collector, querying the availability of a build result, etc.  It is normally run as @code{root} like this:"
 msgstr "Программа @command{guix-daemon} реализует весь функционал доступа к складу. Это включает запуск процессов сборки, запуск сборщика мусора, проверка доступности результата сборки и т.д. Он должен быть запущен от @code{root} так:"
 
 #. type: Plain text
-#: doc/guix.texi:1320
+#: doc/guix.texi:1324
 msgid "For details on how to set it up, @pxref{Setting Up the Daemon}."
 msgstr "Для подробностей о том, как настроить его, смотрите @pxref{Setting Up the Daemon}."
 
 #. type: cindex
-#: doc/guix.texi:1322
+#: doc/guix.texi:1326
 #, no-wrap
 msgid "container, build environment"
 msgstr "контейнер, окружение сборки"
 
 #. type: cindex
-#: doc/guix.texi:1324 doc/guix.texi:2616 doc/guix.texi:3327
-#: doc/guix.texi:10362
+#: doc/guix.texi:1328 doc/guix.texi:2637 doc/guix.texi:3348
+#: doc/guix.texi:10461
 #, no-wrap
 msgid "reproducible builds"
 msgstr "воспроизводимые сборки"
 
 #. type: Plain text
-#: doc/guix.texi:1336
+#: doc/guix.texi:1340
 msgid "By default, @command{guix-daemon} launches build processes under different UIDs, taken from the build group specified with @code{--build-users-group}.  In addition, each build process is run in a chroot environment that only contains the subset of the store that the build process depends on, as specified by its derivation (@pxref{Programming Interface, derivation}), plus a set of specific system directories.  By default, the latter contains @file{/dev} and @file{/dev/pts}.  Furthermore, on GNU/Linux, the build environment is a @dfn{container}: in addition to having its own file system tree, it has a separate mount name space, its own PID name space, network name space, etc.  This helps achieve reproducible builds (@pxref{Features})."
 msgstr "По умолчанию @command{guix-daemon} запускает процессы сборки под различными UID, от пользователей из группы, обозначенной в @code{--build-users-group}. В дополнение каждый процесс сборки запускается в окружении chroot, которое содержит только набор элементов склада, от которых зависит процесс сборки, как это обозначено в деривации (@pxref{Programming Interface, derivation}), а также набор специфичных системных директорий. По умолчанию последнее включает @file{/dev} и @file{/dev/pts}. Более того, под GNU/Linux окружение сборки --- это @dfn{контейнер}: в дополнение к тому, что он имеет собственное дерево файловой системы, он также имеет отдельное пространство имён монтирования, своё собственное пространство имён процессов PID, пространство сетевых имён и т.д. Это позволяет получить воспроизводимые сборки (@pxref{Features})."
 
 #. type: Plain text
-#: doc/guix.texi:1342
+#: doc/guix.texi:1346
 msgid "When the daemon performs a build on behalf of the user, it creates a build directory under @file{/tmp} or under the directory specified by its @code{TMPDIR} environment variable.  This directory is shared with the container for the duration of the build, though within the container, the build tree is always called @file{/tmp/guix-build-@var{name}.drv-0}."
 msgstr "Когда демон выполняет сборку по запросу пользователя, он создаёт директорию под @file{/tmp} или под директорией, заданной его переменной окружения @code{TMPDIR}. Эта директория разделяется с контейнером на время сборки, хотя внутри контейнера дерево сборки всегда называется @file{/tmp/guix-build-@var{name}.drv-0}."
 
 #. type: Plain text
-#: doc/guix.texi:1346
+#: doc/guix.texi:1350
 msgid "The build directory is automatically deleted upon completion, unless the build failed and the client specified @option{--keep-failed} (@pxref{Invoking guix build, @option{--keep-failed}})."
 msgstr "Директория сборки автоматически удаляется по завершении, если конечно, сборка не завершилась с ошибкой, и клиент не обозначил @option{--keep-failed} (@pxref{Invoking guix build, @option{--keep-failed}})."
 
 #. type: Plain text
-#: doc/guix.texi:1352
+#: doc/guix.texi:1356
 msgid "The daemon listens for connections and spawns one sub-process for each session started by a client (one of the @command{guix} sub-commands.)  The @command{guix processes} command allows you to get an overview of the activity on your system by viewing each of the active sessions and clients.  @xref{Invoking guix processes}, for more information."
 msgstr "Демон слушает соединения и порождает один под-процесс для каждой сессии, запускаемой клиентом (одну из подкоманд @command{guix}). Команда @command{guix processes} позволяет мониторить активность вашей системы, предоставляя обзор каждой активной сессии и клиентов. Смотрите @xref{Invoking guix processes} для подробной информации."
 
 #. type: Plain text
-#: doc/guix.texi:1354
+#: doc/guix.texi:1358
 msgid "The following command-line options are supported:"
 msgstr "Поддерживаются следующие опции командной строки:"
 
 #. type: item
-#: doc/guix.texi:1356
+#: doc/guix.texi:1360
 #, no-wrap
 msgid "--build-users-group=@var{group}"
 msgstr "--build-users-group=@var{group}"
 
 #. type: table
-#: doc/guix.texi:1359
+#: doc/guix.texi:1363
 msgid "Take users from @var{group} to run build processes (@pxref{Setting Up the Daemon, build users})."
 msgstr "Использовать пользователей из группы @var{group} для запуска процессов сборки (@pxref{Setting Up the Daemon, build users})."
 
 #. type: item
-#: doc/guix.texi:1360 doc/guix.texi:8188
+#: doc/guix.texi:1364 doc/guix.texi:8282
 #, no-wrap
 msgid "--no-substitutes"
 msgstr "--no-substitutes"
 
 #. type: cindex
-#: doc/guix.texi:1361 doc/guix.texi:2628 doc/guix.texi:3193
+#: doc/guix.texi:1365 doc/guix.texi:2649 doc/guix.texi:3214
 #, no-wrap
 msgid "substitutes"
 msgstr "подстановки"
 
 #. type: table
-#: doc/guix.texi:1365 doc/guix.texi:8192
+#: doc/guix.texi:1369 doc/guix.texi:8286
 msgid "Do not use substitutes for build products.  That is, always build things locally instead of allowing downloads of pre-built binaries (@pxref{Substitutes})."
 msgstr "Не использовать подстановки для сборок. Это означает --- собирать элементы локально вместо того, чтобы скачивать собранные бинарники (@pxref{Substitutes})."
 
 #. type: table
-#: doc/guix.texi:1369
+#: doc/guix.texi:1373
 msgid "When the daemon runs with @code{--no-substitutes}, clients can still explicitly enable substitution @i{via} the @code{set-build-options} remote procedure call (@pxref{The Store})."
 msgstr "Когда демон работает с @code{--no-substitutes}, клиенты всё ещё могут явно включить подстановку @i{с помощью} удалённого вызова процедур @code{set-build-options} (@pxref{The Store})."
 
 #. type: item
-#: doc/guix.texi:1370 doc/guix.texi:8175 doc/guix.texi:9867
-#: doc/guix.texi:10508 doc/guix.texi:10730
+#: doc/guix.texi:1374 doc/guix.texi:8269 doc/guix.texi:9966
+#: doc/guix.texi:10607 doc/guix.texi:10832
 #, no-wrap
 msgid "--substitute-urls=@var{urls}"
 msgstr "--substitute-urls=@var{urls}"
 
 #. type: anchor{#1}
-#: doc/guix.texi:1375
+#: doc/guix.texi:1379
 msgid "daemon-substitute-urls"
 msgstr "daemon-substitute-urls"
 
 #. type: table
-#: doc/guix.texi:1375
+#: doc/guix.texi:1379
 msgid "Consider @var{urls} the default whitespace-separated list of substitute source URLs.  When this option is omitted, @indicateurl{https://@value{SUBSTITUTE-SERVER}} is used."
 msgstr "Использовать адреса @var{urls}, разделённые пробелом по умолчанию, как список источников подстановок. Если эта опция пропущена, используется @indicateurl{https://@value{SUBSTITUTE-SERVER}}"
 
 #. type: table
-#: doc/guix.texi:1378
+#: doc/guix.texi:1382
 msgid "This means that substitutes may be downloaded from @var{urls}, as long as they are signed by a trusted signature (@pxref{Substitutes})."
 msgstr "Это означает, что подстановки могут скачиваться из адресов @var{urls}, если конечно они подписаны доверенной подписью (@pxref{Substitutes})."
 
 #. type: item
-#: doc/guix.texi:1380 doc/guix.texi:8213
+#: doc/guix.texi:1384 doc/guix.texi:8307
 #, no-wrap
 msgid "--no-offload"
 msgstr "--no-offload"
 
 #. type: table
-#: doc/guix.texi:1384 doc/guix.texi:8217
+#: doc/guix.texi:1388 doc/guix.texi:8311
 #, fuzzy
 #| msgid "Do not use substitutes for build products.  That is, always build things locally instead of allowing downloads of pre-built binaries (@pxref{Substitutes})."
 msgid "Do not use offload builds to other machines (@pxref{Daemon Offload Setup}).  That is, always build things locally instead of offloading builds to remote machines."
 msgstr "Не использовать подстановки для сборок. Это означает --- собирать элементы локально вместо того, чтобы скачивать собранные бинарники (@pxref{Substitutes})."
 
 #. type: item
-#: doc/guix.texi:1385
+#: doc/guix.texi:1389
 #, no-wrap
 msgid "--cache-failures"
 msgstr "--cache-failures"
 
 #. type: table
-#: doc/guix.texi:1387
+#: doc/guix.texi:1391
 msgid "Cache build failures.  By default, only successful builds are cached."
 msgstr "Кешировать ошибки сборки. По умолчанию кешируются только успешные сборки."
 
 #. type: table
-#: doc/guix.texi:1392
+#: doc/guix.texi:1396
 msgid "When this option is used, @command{guix gc --list-failures} can be used to query the set of store items marked as failed; @command{guix gc --clear-failures} removes store items from the set of cached failures.  @xref{Invoking guix gc}."
 msgstr "При установке этой опции можно использовать @command{guix gc --list-failures}, чтобы просматривать элементы склада, помеченные как ошибочные; @command{guix gc --clear-failures} удаляет элементы склада из кеша ошибок.  @xref{Invoking guix gc}."
 
 #. type: item
-#: doc/guix.texi:1393 doc/guix.texi:8242
+#: doc/guix.texi:1397 doc/guix.texi:8336
 #, no-wrap
 msgid "--cores=@var{n}"
 msgstr "--cores=@var{n}"
 
 #. type: itemx
-#: doc/guix.texi:1394 doc/guix.texi:8243
+#: doc/guix.texi:1398 doc/guix.texi:8337
 #, no-wrap
 msgid "-c @var{n}"
 msgstr "-c @var{n}"
 
 #. type: table
-#: doc/guix.texi:1397
+#: doc/guix.texi:1401
 msgid "Use @var{n} CPU cores to build each derivation; @code{0} means as many as available."
 msgstr "Использовать @var{n} ядер процессора для сборки каждой деривации; @code{0} означает использовать все доступные."
 
 #. type: table
-#: doc/guix.texi:1401
+#: doc/guix.texi:1405
 msgid "The default value is @code{0}, but it may be overridden by clients, such as the @code{--cores} option of @command{guix build} (@pxref{Invoking guix build})."
 msgstr "Значение по умолчанию - @code{0}, но оно может быть изменено клиентами, в частности, опцией @code{--cores} команды @command{guix build} (@pxref{Invoking guix build})."
 
 #. type: table
-#: doc/guix.texi:1405
+#: doc/guix.texi:1409
 msgid "The effect is to define the @code{NIX_BUILD_CORES} environment variable in the build process, which can then use it to exploit internal parallelism---for instance, by running @code{make -j$NIX_BUILD_CORES}."
 msgstr "В результате устанавливается переменная окружения @code{NIX_BUILD_CORES} для процесса сборки, который затем может использовать её для применения внутреннего параллелизма, например, для запуска @code{make -j$NIX_BUILD_CORES}."
 
 #. type: item
-#: doc/guix.texi:1406 doc/guix.texi:8247
+#: doc/guix.texi:1410 doc/guix.texi:8341
 #, no-wrap
 msgid "--max-jobs=@var{n}"
 msgstr "--max-jobs=@var{n}"
 
 #. type: itemx
-#: doc/guix.texi:1407 doc/guix.texi:8248
+#: doc/guix.texi:1411 doc/guix.texi:8342
 #, no-wrap
 msgid "-M @var{n}"
 msgstr "-M @var{n}"
 
 #. type: table
-#: doc/guix.texi:1412
+#: doc/guix.texi:1416
 msgid "Allow at most @var{n} build jobs in parallel.  The default value is @code{1}.  Setting it to @code{0} means that no builds will be performed locally; instead, the daemon will offload builds (@pxref{Daemon Offload Setup}), or simply fail."
 msgstr "Разрешить максимум @var{n} параллельных задач сборки. Значение по умолчанию - @code{1}. Установка в @code{0} означает, чтоб сборки не будут выполняться локально, вместо этого, демон будет разгружать сборки (@pxref{Daemon Offload Setup}) или просто отчитается об ошибке."
 
 #. type: item
-#: doc/guix.texi:1413 doc/guix.texi:8218
+#: doc/guix.texi:1417 doc/guix.texi:8312
 #, no-wrap
 msgid "--max-silent-time=@var{seconds}"
 msgstr "--max-silent-time=@var{seconds}"
 
 #. type: table
-#: doc/guix.texi:1416 doc/guix.texi:8221
+#: doc/guix.texi:1420 doc/guix.texi:8315
 msgid "When the build or substitution process remains silent for more than @var{seconds}, terminate it and report a build failure."
 msgstr "Когда процесс сборки или подстановки молчит более @var{seconds} секунд, завершить его и отчитаться об ошибке сборки."
 
 #. type: table
-#: doc/guix.texi:1418 doc/guix.texi:1427
+#: doc/guix.texi:1422 doc/guix.texi:1431
 msgid "The default value is @code{0}, which disables the timeout."
 msgstr "Значение по умолчанию - @code{0}, что значит отключить таймаут."
 
 #. type: table
-#: doc/guix.texi:1421
+#: doc/guix.texi:1425
 msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--max-silent-time}})."
 msgstr "Значение, заданное здесь, может быть переопределено клиентами (@pxref{Common Build Options, @code{--max-silent-time}})."
 
 #. type: item
-#: doc/guix.texi:1422 doc/guix.texi:8225
+#: doc/guix.texi:1426 doc/guix.texi:8319
 #, no-wrap
 msgid "--timeout=@var{seconds}"
 msgstr "--timeout=@var{seconds}"
 
 #. type: table
-#: doc/guix.texi:1425 doc/guix.texi:8228
+#: doc/guix.texi:1429 doc/guix.texi:8322
 msgid "Likewise, when the build or substitution process lasts for more than @var{seconds}, terminate it and report a build failure."
 msgstr "Точно так же, когда процесс сборки или подстановки длится более @var{seconds}, завершить его и отчитаться об ошибке сборки."
 
 #. type: table
-#: doc/guix.texi:1430
+#: doc/guix.texi:1434
 msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--timeout}})."
 msgstr "Значение, заданное здесь, может быть переопределено клиентами (@pxref{Common Build Options, @code{--timeout}})."
 
 #. type: item
-#: doc/guix.texi:1431
+#: doc/guix.texi:1435
 #, no-wrap
 msgid "--rounds=@var{N}"
 msgstr "--rounds=@var{N}"
 
 #. type: table
-#: doc/guix.texi:1436
+#: doc/guix.texi:1440
 msgid "Build each derivation @var{n} times in a row, and raise an error if consecutive build results are not bit-for-bit identical.  Note that this setting can be overridden by clients such as @command{guix build} (@pxref{Invoking guix build})."
 msgstr "Собирать каждую деривацию @var{n} раз подряд и вызывать ошибку, если результаты последовательных сборок не идентичны бит-к-биту. Отметим, что эта настройка может быть переопределена клиентами в команде, например, @command{guix build} (@pxref{Invoking guix build})."
 
 #. type: table
-#: doc/guix.texi:1440 doc/guix.texi:8592
+#: doc/guix.texi:1444 doc/guix.texi:8691
 msgid "When used in conjunction with @option{--keep-failed}, the differing output is kept in the store, under @file{/gnu/store/@dots{}-check}.  This makes it easy to look for differences between the two results."
 msgstr "При использовании вместе с @option{--keep-failed} различные результаты сохраняются на складе под @file{/gnu/store/@dots{}-check}. Это делает возможным просмотр различий между двумя результатами."
 
 #. type: item
-#: doc/guix.texi:1441
+#: doc/guix.texi:1445
 #, no-wrap
 msgid "--debug"
 msgstr "--debug"
 
 #. type: table
-#: doc/guix.texi:1443
+#: doc/guix.texi:1447
 msgid "Produce debugging output."
 msgstr "Выводить отладочную информацию."
 
 #. type: table
-#: doc/guix.texi:1447
+#: doc/guix.texi:1451
 msgid "This is useful to debug daemon start-up issues, but then it may be overridden by clients, for example the @code{--verbosity} option of @command{guix build} (@pxref{Invoking guix build})."
 msgstr "Это полезно для отладки проблем запуска демона, но затем это может быть переопределено клиентами, например, опцией  @code{--verbosity} команды @command{guix build} (@pxref{Invoking guix build})."
 
 #. type: item
-#: doc/guix.texi:1448
+#: doc/guix.texi:1452
 #, no-wrap
 msgid "--chroot-directory=@var{dir}"
 msgstr "--chroot-directory=@var{dir}"
 
 #. type: table
-#: doc/guix.texi:1450
+#: doc/guix.texi:1454
 msgid "Add @var{dir} to the build chroot."
 msgstr "Добавить директорию @var{dir} в chroot сборки."
 
 #. type: table
-#: doc/guix.texi:1456
+#: doc/guix.texi:1460
 msgid "Doing this may change the result of build processes---for instance if they use optional dependencies found in @var{dir} when it is available, and not otherwise.  For that reason, it is not recommended to do so.  Instead, make sure that each derivation declares all the inputs that it needs."
 msgstr "Это может изменить результаты процессов сборки, например, если они используют необязательные (опциональные) зависимости, найденные в  @var{dir}, если они доступны, но только так, а не иначе. Поэтому не рекомендуется делать так. Вместо этого, убедитесь, что каждая деривация объявляет все необходимые входные данные."
 
 #. type: item
-#: doc/guix.texi:1457
+#: doc/guix.texi:1461
 #, no-wrap
 msgid "--disable-chroot"
 msgstr "--disable-chroot"
 
 #. type: table
-#: doc/guix.texi:1459
+#: doc/guix.texi:1463
 msgid "Disable chroot builds."
 msgstr "Отключить chroot для сборки."
 
 #. type: table
-#: doc/guix.texi:1464
+#: doc/guix.texi:1468
 msgid "Using this option is not recommended since, again, it would allow build processes to gain access to undeclared dependencies.  It is necessary, though, when @command{guix-daemon} is running under an unprivileged user account."
 msgstr "Использование этой опции не рекомендуется, так как опять же это позволит процессам сборки получить доступ к не объявленным зависимостям. Это важно, даже если @command{guix-daemon} запущен под аккаунтом непривилегированного пользователя."
 
 #. type: item
-#: doc/guix.texi:1465
+#: doc/guix.texi:1469
 #, no-wrap
 msgid "--log-compression=@var{type}"
 msgstr "--log-compression=@var{type}"
 
 #. type: table
-#: doc/guix.texi:1468
+#: doc/guix.texi:1472
 msgid "Compress build logs according to @var{type}, one of @code{gzip}, @code{bzip2}, or @code{none}."
 msgstr "Архивировать логи сборки методом @var{type}. Это один из: @code{gzip}, @code{bzip2} или @code{none}."
 
 #. type: table
-#: doc/guix.texi:1472
+#: doc/guix.texi:1476
 msgid "Unless @code{--lose-logs} is used, all the build logs are kept in the @var{localstatedir}.  To save space, the daemon automatically compresses them with bzip2 by default."
 msgstr "Если не используется @code{--lose-logs}, все логи сборки сохраняются в @var{localstatedir}. Для экономии места демон автоматически сжимает их с помощью bzip2 по умолчанию."
 
 #. type: item
-#: doc/guix.texi:1473
+#: doc/guix.texi:1477
 #, no-wrap
 msgid "--disable-deduplication"
 msgstr "--disable-deduplication"
 
 #. type: cindex
-#: doc/guix.texi:1474 doc/guix.texi:3665
+#: doc/guix.texi:1478 doc/guix.texi:3686
 #, no-wrap
 msgid "deduplication"
 msgstr "дедупликация"
 
 #. type: table
-#: doc/guix.texi:1476
+#: doc/guix.texi:1480
 msgid "Disable automatic file ``deduplication'' in the store."
 msgstr "Отключить автоматическую \"дедупликацию\" файлов на складе."
 
 #. type: table
-#: doc/guix.texi:1483
+#: doc/guix.texi:1487
 msgid "By default, files added to the store are automatically ``deduplicated'': if a newly added file is identical to another one found in the store, the daemon makes the new file a hard link to the other file.  This can noticeably reduce disk usage, at the expense of slightly increased input/output load at the end of a build process.  This option disables this optimization."
 msgstr "По умолчанию файлы, добавленные на склад, автоматически \"дедуплицируются\": если вновь добавленный файл идентичен другому, найденному на складе, демон делает новый файл жесткой ссылкой на другой файл. Это существенно сокращает использование места на диске за счёт небольшого увеличения запросов ввода/вывода в конце процесса сборки. Эта опция отключает такую оптимизацию."
 
 #. type: item
-#: doc/guix.texi:1484
+#: doc/guix.texi:1488
 #, no-wrap
 msgid "--gc-keep-outputs[=yes|no]"
 msgstr "--gc-keep-outputs[=yes|no]"
 
 #. type: table
-#: doc/guix.texi:1487
+#: doc/guix.texi:1491
 msgid "Tell whether the garbage collector (GC) must keep outputs of live derivations."
 msgstr "Сообщить, должен ли сборщик мусора (GC) сохранять выходные данные живой деривации."
 
 #. type: cindex
-#: doc/guix.texi:1488 doc/guix.texi:3478
+#: doc/guix.texi:1492 doc/guix.texi:3499
 #, no-wrap
 msgid "GC roots"
 msgstr "Корни сборщика мусора"
 
 #. type: cindex
-#: doc/guix.texi:1489 doc/guix.texi:3479
+#: doc/guix.texi:1493 doc/guix.texi:3500
 #, no-wrap
 msgid "garbage collector roots"
 msgstr "корни сборщика мусора"
 
 #. type: table
-#: doc/guix.texi:1494
+#: doc/guix.texi:1498
 msgid "When set to ``yes'', the GC will keep the outputs of any live derivation available in the store---the @code{.drv} files.  The default is ``no'', meaning that derivation outputs are kept only if they are reachable from a GC root.  @xref{Invoking guix gc}, for more on GC roots."
 msgstr "При установке в \"yes\" (да), сборщик мусора (GC) будет сохранять результаты любой живой деривации, доступной на складе, --- файлы @code{.drv}. Значение по умолчанию - \"no\" (нет) - означает, что результаты дериваций хранятся только, если они доступны из корней сборщика мусора (GC roots). Смотрите @xref{Invoking guix gc} для информации о корнях сборщика мусора."
 
 #. type: item
-#: doc/guix.texi:1495
+#: doc/guix.texi:1499
 #, no-wrap
 msgid "--gc-keep-derivations[=yes|no]"
 msgstr "--gc-keep-derivations[=yes|no]"
 
 #. type: table
-#: doc/guix.texi:1498
+#: doc/guix.texi:1502
 msgid "Tell whether the garbage collector (GC) must keep derivations corresponding to live outputs."
 msgstr "Сообщить, должен ли сборщик мусора (GC) сохранять деривации, соответствующие живым результатам."
 
 #. type: table
-#: doc/guix.texi:1503
+#: doc/guix.texi:1507
 msgid "When set to ``yes'', as is the case by default, the GC keeps derivations---i.e., @code{.drv} files---as long as at least one of their outputs is live.  This allows users to keep track of the origins of items in their store.  Setting it to ``no'' saves a bit of disk space."
 msgstr "При указании \"yes\" (да), что является значением по умолчанию, сборщик мусора сохраняет деривации, то есть файлы @code{.drv}, до тех пор, пока любой из их выходов остаётся живым. Это позволяет пользователям отслеживать исходники элементов на складе. Установка в \"no\" (нет) немного экономит место на диске."
 
 #. type: table
-#: doc/guix.texi:1511
+#: doc/guix.texi:1515
 msgid "In this way, setting @code{--gc-keep-derivations} to ``yes'' causes liveness to flow from outputs to derivations, and setting @code{--gc-keep-outputs} to ``yes'' causes liveness to flow from derivations to outputs.  When both are set to ``yes'', the effect is to keep all the build prerequisites (the sources, compiler, libraries, and other build-time tools) of live objects in the store, regardless of whether these prerequisites are reachable from a GC root.  This is convenient for developers since it saves rebuilds or downloads."
 msgstr "Таким образом, установка @code{--gc-keep-derivations} в \"yes\" (да) даётт возможность пройти от результатов до дериваций, а установка  @code{--gc-keep-outputs} в \"yes\" (да), делает возможным пройти от дериваций до результатов. Если оба установлены в \"yes\", тогда это сохранит всё используемое для сборки (исходники, компилятор, библиотеки и другие инструменты сборки) живых объектов на складе, без учёта, доступны эти инструменты сборки из корней сборщика мусора или нет. Это удобно для разработчиков, так как это сокращает пересборки или скачивания."
 
 #. type: item
-#: doc/guix.texi:1512
+#: doc/guix.texi:1516
 #, no-wrap
 msgid "--impersonate-linux-2.6"
 msgstr "--impersonate-linux-2.6"
 
 #. type: table
-#: doc/guix.texi:1515
+#: doc/guix.texi:1519
 msgid "On Linux-based systems, impersonate Linux 2.6.  This means that the kernel's @code{uname} system call will report 2.6 as the release number."
 msgstr "На системах, основанных на Linux, выдавать себя за Linux 2.6. Это означает, что системный вызов ядра @code{uname} будет выдавать 2.6 номером релиза."
 
 #. type: table
-#: doc/guix.texi:1518
+#: doc/guix.texi:1522
 msgid "This might be helpful to build programs that (usually wrongfully) depend on the kernel version number."
 msgstr "Это полезно для сборки программ, которые (обычно по ошибке) зависят от версии ядра."
 
 #. type: item
-#: doc/guix.texi:1519
+#: doc/guix.texi:1523
 #, no-wrap
 msgid "--lose-logs"
 msgstr "--lose-logs"
 
 #. type: table
-#: doc/guix.texi:1522
+#: doc/guix.texi:1526
 msgid "Do not keep build logs.  By default they are kept under @code{@var{localstatedir}/guix/log}."
 msgstr "Не сохранять логи сборки. По умолчанию они сохраняются под @code{@var{localstatedir}/guix/log}."
 
 #. type: item
-#: doc/guix.texi:1523 doc/guix.texi:3873 doc/guix.texi:4887 doc/guix.texi:5238
-#: doc/guix.texi:8536 doc/guix.texi:9894 doc/guix.texi:10100
-#: doc/guix.texi:10735 doc/guix.texi:25924 doc/guix.texi:26606
+#: doc/guix.texi:1527 doc/guix.texi:3894 doc/guix.texi:4908 doc/guix.texi:5248
+#: doc/guix.texi:8635 doc/guix.texi:9993 doc/guix.texi:10199
+#: doc/guix.texi:10837 doc/guix.texi:26187 doc/guix.texi:26869
 #, no-wrap
 msgid "--system=@var{system}"
 msgstr "--system=@var{system}"
 
 #. type: table
-#: doc/guix.texi:1527
+#: doc/guix.texi:1531
 msgid "Assume @var{system} as the current system type.  By default it is the architecture/kernel pair found at configure time, such as @code{x86_64-linux}."
 msgstr "Считать @var{system} текущим типом системы. По умолчанию это пара архитектура/ядро, обнаруженная во время конфигурации, например, @code{x86_64-linux}."
 
 #. type: item
-#: doc/guix.texi:1528 doc/guix.texi:8021
+#: doc/guix.texi:1532 doc/guix.texi:8115
 #, no-wrap
 msgid "--listen=@var{endpoint}"
 msgstr "--listen=@var{endpoint}"
 
 #. type: table
-#: doc/guix.texi:1533
+#: doc/guix.texi:1537
 msgid "Listen for connections on @var{endpoint}.  @var{endpoint} is interpreted as the file name of a Unix-domain socket if it starts with @code{/} (slash sign).  Otherwise, @var{endpoint} is interpreted as a host name or host name and port to listen to.  Here are a few examples:"
 msgstr "Слушать соединения с @var{endpoint}. @var{endpoint} интерпретируется как имя файла сокета Unix-домена, если начинается с @code{/} (знак слеша). В противном случае @var{endpoint} интерпретируется как имя хоста или им хоста и порт для прослушивания. Вот несколько примеров:"
 
 #. type: item
-#: doc/guix.texi:1535
+#: doc/guix.texi:1539
 #, no-wrap
 msgid "--listen=/gnu/var/daemon"
 msgstr "--listen=/gnu/var/daemon"
 
 #. type: table
-#: doc/guix.texi:1538
+#: doc/guix.texi:1542
 msgid "Listen for connections on the @file{/gnu/var/daemon} Unix-domain socket, creating it if needed."
 msgstr "Слушать соединения с сокетом Unix-домена @file{/gnu/var/daemon}, который создаётся при необходимости."
 
 #. type: item
-#: doc/guix.texi:1539
+#: doc/guix.texi:1543
 #, no-wrap
 msgid "--listen=localhost"
 msgstr "--listen=localhost"
 
 #. type: cindex
-#: doc/guix.texi:1540 doc/guix.texi:6796
+#: doc/guix.texi:1544 doc/guix.texi:6869
 #, no-wrap
 msgid "daemon, remote access"
 msgstr "демон, удалённый доступ"
 
 #. type: cindex
-#: doc/guix.texi:1541 doc/guix.texi:6797
+#: doc/guix.texi:1545 doc/guix.texi:6870
 #, no-wrap
 msgid "remote access to the daemon"
 msgstr "удалённый доступ к демону"
 
 #. type: cindex
-#: doc/guix.texi:1542 doc/guix.texi:6798
+#: doc/guix.texi:1546 doc/guix.texi:6871
 #, no-wrap
 msgid "daemon, cluster setup"
 msgstr "демон, установка кластера"
 
 #. type: cindex
-#: doc/guix.texi:1543 doc/guix.texi:6799
+#: doc/guix.texi:1547 doc/guix.texi:6872
 #, no-wrap
 msgid "clusters, daemon setup"
 msgstr "кластеры, установка демона"
 
 #. type: table
-#: doc/guix.texi:1546
+#: doc/guix.texi:1550
 msgid "Listen for TCP connections on the network interface corresponding to @code{localhost}, on port 44146."
 msgstr "Слушать соединения TCP сетевого интерфейса, относящиеся к @code{localhost}, на порту 44146."
 
 #. type: item
-#: doc/guix.texi:1547
+#: doc/guix.texi:1551
 #, no-wrap
 msgid "--listen=128.0.0.42:1234"
 msgstr "--listen=128.0.0.42:1234"
 
 #. type: table
-#: doc/guix.texi:1550
+#: doc/guix.texi:1554
 msgid "Listen for TCP connections on the network interface corresponding to @code{128.0.0.42}, on port 1234."
 msgstr "Слушать соединения TCP сетевого интерфейса, относящиеся к @code{128.0.0.42}, на порту 1234."
 
 #. type: table
-#: doc/guix.texi:1557
+#: doc/guix.texi:1561
 msgid "This option can be repeated multiple times, in which case @command{guix-daemon} accepts connections on all the specified endpoints.  Users can tell client commands what endpoint to connect to by setting the @code{GUIX_DAEMON_SOCKET} environment variable (@pxref{The Store, @code{GUIX_DAEMON_SOCKET}})."
 msgstr "Эта опция может повторяться много раз, в таком случае @command{guix-daemon} принимает соединения на всех обозначенных точках. Пользователи могут через клиентские команды сообщать, через какие точки соединяться, для этого нужно устанавливать переменную окружения @code{GUIX_DAEMON_SOCKET} (@pxref{The Store, @code{GUIX_DAEMON_SOCKET}})."
 
 #. type: quotation
-#: doc/guix.texi:1564
+#: doc/guix.texi:1568
 msgid "The daemon protocol is @emph{unauthenticated and unencrypted}.  Using @code{--listen=@var{host}} is suitable on local networks, such as clusters, where only trusted nodes may connect to the build daemon.  In other cases where remote access to the daemon is needed, we recommend using Unix-domain sockets along with SSH."
 msgstr "Протокол демона @emph{неаутентичный и нешифрованный}. Использование @code{--listen=@var{host}} подходит локальным сетям, как например, кластерам, где только доверенные узлы могут соединяться с демоном сборки. В других случаях, когда необходим удалённый доступ к демону рекомендуется использовать сокеты Unix-домена вместе с SSH."
 
 #. type: table
-#: doc/guix.texi:1569
+#: doc/guix.texi:1573
 msgid "When @code{--listen} is omitted, @command{guix-daemon} listens for connections on the Unix-domain socket located at @file{@var{localstatedir}/guix/daemon-socket/socket}."
 msgstr "Когда @code{--listen} пропущена, @command{guix-daemon} слушает соединения с сокетом Unix-домена, расположенным в @file{@var{localstatedir}/guix/daemon-socket/socket}."
 
 #. type: Plain text
-#: doc/guix.texi:1579
+#: doc/guix.texi:1583
 msgid "When using Guix on top of GNU/Linux distribution other than Guix System---a so-called @dfn{foreign distro}---a few additional steps are needed to get everything in place.  Here are some of them."
 msgstr "При использовании дистрибутива GNU/Linux, отличного от системы, называемого также @dfn{чужой дистрибутив}, необходимо несколько дополнительных шагов, чтобы всё работало. Вот некоторые из них."
 
 #. type: anchor{#1}
-#: doc/guix.texi:1583
+#: doc/guix.texi:1587
 msgid "locales-and-locpath"
 msgstr "locales-and-locpath"
 
 #. type: cindex
-#: doc/guix.texi:1583
+#: doc/guix.texi:1587
 #, no-wrap
 msgid "locales, when not on Guix System"
 msgstr "локали, если не на системе Guix"
 
 #. type: vindex
-#: doc/guix.texi:1584 doc/guix.texi:11942
+#: doc/guix.texi:1588 doc/guix.texi:12057
 #, no-wrap
 msgid "LOCPATH"
 msgstr "LOCPATH"
 
 #. type: vindex
-#: doc/guix.texi:1585
+#: doc/guix.texi:1589
 #, no-wrap
 msgid "GUIX_LOCPATH"
 msgstr "GUIX_LOCPATH"
 
 #. type: Plain text
-#: doc/guix.texi:1590
+#: doc/guix.texi:1594
 msgid "Packages installed @i{via} Guix will not use the locale data of the host system.  Instead, you must first install one of the locale packages available with Guix and then define the @code{GUIX_LOCPATH} environment variable:"
 msgstr "Пакеты, установленные @i{с помощью} Guix, не будут использовать данные локали хост-системы. Вместо этого вы должны вначале установить один из пакетов локали, доступных в Guix, а затем определить переменную окружения @code{GUIX_LOCPATH}:"
 
 #. type: example
-#: doc/guix.texi:1594
+#: doc/guix.texi:1598
 #, no-wrap
 msgid ""
 "$ guix install glibc-locales\n"
@@ -5413,392 +5530,402 @@ msgstr ""
 "$ export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale\n"
 
 #. type: Plain text
-#: doc/guix.texi:1600
-msgid "Note that the @code{glibc-locales} package contains data for all the locales supported by the GNU@tie{}libc and weighs in at around 110@tie{}MiB.  Alternatively, the @code{glibc-utf8-locales} is smaller but limited to a few UTF-8 locales."
+#: doc/guix.texi:1604
+#, fuzzy
+#| msgid "Note that the @code{glibc-locales} package contains data for all the locales supported by the GNU@tie{}libc and weighs in at around 110@tie{}MiB.  Alternatively, the @code{glibc-utf8-locales} is smaller but limited to a few UTF-8 locales."
+msgid "Note that the @code{glibc-locales} package contains data for all the locales supported by the GNU@tie{}libc and weighs in at around 917@tie{}MiB.  Alternatively, the @code{glibc-utf8-locales} is smaller but limited to a few UTF-8 locales."
 msgstr "Отметим, что пакет  @code{glibc-locales} содержит данные для всех локалей, поддерживаемых GNU@tie{}libc, и весит околоа 110@tie{}Миб. В альтернативу @code{glibc-utf8-locales} меньше, но ограничен несколькими локалями UTF-8."
 
 #. type: Plain text
-#: doc/guix.texi:1604
+#: doc/guix.texi:1608
 msgid "The @code{GUIX_LOCPATH} variable plays a role similar to @code{LOCPATH} (@pxref{Locale Names, @code{LOCPATH},, libc, The GNU C Library Reference Manual}).  There are two important differences though:"
 msgstr "Переменная @code{GUIX_LOCPATH} играет ту же роль, что и @code{LOCPATH} (@pxref{Locale Names, @code{LOCPATH},, libc, The GNU C Library Reference Manual}). Но есть два существенных различия."
 
 #. type: enumerate
-#: doc/guix.texi:1611
+#: doc/guix.texi:1615
 msgid "@code{GUIX_LOCPATH} is honored only by the libc in Guix, and not by the libc provided by foreign distros.  Thus, using @code{GUIX_LOCPATH} allows you to make sure the programs of the foreign distro will not end up loading incompatible locale data."
 msgstr "@code{GUIX_LOCPATH} учитывается только libc в Guix, но не учитывается libc, предоставляемым чужим дистрибутивом. Так что использование @code{GUIX_LOCPATH} позволяет вам убедиться, что программы чужого дистрибутива не будут производить загрузку несовместимых данных локали."
 
 #. type: enumerate
-#: doc/guix.texi:1618
+#: doc/guix.texi:1622
 msgid "libc suffixes each entry of @code{GUIX_LOCPATH} with @code{/X.Y}, where @code{X.Y} is the libc version---e.g., @code{2.22}.  This means that, should your Guix profile contain a mixture of programs linked against different libc version, each libc version will only try to load locale data in the right format."
 msgstr "libc добавляет суффиксы @code{/X.Y} к каждому компоненту @code{GUIX_LOCPATH}, где @code{X.Y} - это версия libc, например, @code{2.22}. Это значит, что если ваш профиль Guix будет содержать смесь программ, связанных с дугой версией libc, каждая версия libc будет пытаться загружать только данные локали в правильном формате."
 
 #. type: Plain text
-#: doc/guix.texi:1622
+#: doc/guix.texi:1626
 msgid "This is important because the locale data format used by different libc versions may be incompatible."
 msgstr "Это важно, потому что использование данных локали другой версией libc может быть неприемлемо."
 
 #. type: cindex
-#: doc/guix.texi:1625
+#: doc/guix.texi:1629
 #, no-wrap
 msgid "name service switch, glibc"
 msgstr "выбор имён сервисов, glibc"
 
 #. type: cindex
-#: doc/guix.texi:1626
+#: doc/guix.texi:1630
 #, no-wrap
 msgid "NSS (name service switch), glibc"
 msgstr "NSS (выбор имён сервисов), glibc"
 
 #. type: cindex
-#: doc/guix.texi:1627
+#: doc/guix.texi:1631
 #, no-wrap
 msgid "nscd (name service caching daemon)"
 msgstr "nscd (демон кеша имён сервисов)"
 
 #. type: cindex
-#: doc/guix.texi:1628
+#: doc/guix.texi:1632
 #, no-wrap
 msgid "name service caching daemon (nscd)"
 msgstr "демон кеша имён сервисов (nscd)"
 
 #. type: Plain text
-#: doc/guix.texi:1635
+#: doc/guix.texi:1639
 msgid "When using Guix on a foreign distro, we @emph{strongly recommend} that the system run the GNU C library's @dfn{name service cache daemon}, @command{nscd}, which should be listening on the @file{/var/run/nscd/socket} socket.  Failing to do that, applications installed with Guix may fail to look up host names or user accounts, or may even crash.  The next paragraphs explain why."
 msgstr "При использовании Guix на чужом дистрибутиве мы @emph{настойчиво рекомендуем}, чтобы система запускала @dfn{демон кеша имён сервисов} библиотеки GNU C, @command{nscd}, который должен слушать сокет @file{/var/run/nscd/socket}. Если это не сделано, приложения, установленные Guix, могут некорректно адресовать имена хостов или аккаунты пользователей и даже падать. Ниже объясняется почему."
 
 #. type: file{#1}
-#: doc/guix.texi:1636
+#: doc/guix.texi:1640
 #, no-wrap
 msgid "nsswitch.conf"
 msgstr "nsswitch.conf"
 
 #. type: Plain text
-#: doc/guix.texi:1641
+#: doc/guix.texi:1645
 msgid "The GNU C library implements a @dfn{name service switch} (NSS), which is an extensible mechanism for ``name lookups'' in general: host name resolution, user accounts, and more (@pxref{Name Service Switch,,, libc, The GNU C Library Reference Manual})."
 msgstr "Библиотека GNU C реализует @dfn{выбор имён сервисов} (NSS), который представляет собой расширяемый механизм для резолвинга имён в целом: резолвинг имён хостов, аккаунтов пользователей и другое (@pxref{Name Service Switch,,, libc, The GNU C Library Reference Manual})."
 
 #. type: cindex
-#: doc/guix.texi:1642
+#: doc/guix.texi:1646
 #, no-wrap
 msgid "Network information service (NIS)"
 msgstr "Сервис сетевой информации (NIS)"
 
 #. type: cindex
-#: doc/guix.texi:1643
+#: doc/guix.texi:1647
 #, no-wrap
 msgid "NIS (Network information service)"
 msgstr "NIS (сервис сетевой информации)"
 
 #. type: Plain text
-#: doc/guix.texi:1652
+#: doc/guix.texi:1656
 msgid "Being extensible, the NSS supports @dfn{plugins}, which provide new name lookup implementations: for example, the @code{nss-mdns} plugin allow resolution of @code{.local} host names, the @code{nis} plugin allows user account lookup using the Network information service (NIS), and so on.  These extra ``lookup services'' are configured system-wide in @file{/etc/nsswitch.conf}, and all the programs running on the system honor those settings (@pxref{NSS Configuration File,,, libc, The GNU C Reference Manual})."
 msgstr "Будучи расширяемым, NSS поддерживает @dfn{плагины}, которые предоставляют реализации разрешения новых имён: плагин @code{nss-mdns} резолвит имена хостов @code{.local}, плагин @code{nis} адресует пользовательские аккаунты, используя сервис сетевой информации (NIS) и т.д. Эти дополнительные сервисы адресации настраиваются для всей системы в @file{/etc/nsswitch.conf}, и все запущенные в системе программы учитывают эти настройки (@pxref{NSS Configuration File,,, libc, The GNU C Reference Manual})."
 
 #. type: Plain text
-#: doc/guix.texi:1662
+#: doc/guix.texi:1666
 msgid "When they perform a name lookup---for instance by calling the @code{getaddrinfo} function in C---applications first try to connect to the nscd; on success, nscd performs name lookups on their behalf.  If the nscd is not running, then they perform the name lookup by themselves, by loading the name lookup services into their own address space and running it.  These name lookup services---the @file{libnss_*.so} files---are @code{dlopen}'d, but they may come from the host system's C library, rather than from the C library the application is linked against (the C library coming from Guix)."
 msgstr "Когда выполняется разрешение имён, например, вызовом функции C @code{getaddrinfo}, приложения вначале делают попытку соединиться с nscd; в случае успеха nscd выполняет разрешение имён по их запросу. Если nscd не запущен, тогда они выполняют разрешение имён самостоятельно, загружая сервисы разрешения имён в их собственные адресные пространства и запуская их. Эти сервисы разрешения имён --- файлы @file{libnss_*.so} --- запускаются @code{dlopen}, но они могут поставляться системной библиотекой C, а не библиотекой C, с которой залинковано приложение (библиотека C из Guix)."
 
 #. type: Plain text
-#: doc/guix.texi:1667
+#: doc/guix.texi:1671
 msgid "And this is where the problem is: if your application is linked against Guix's C library (say, glibc 2.24) and tries to load NSS plugins from another C library (say, @code{libnss_mdns.so} for glibc 2.22), it will likely crash or have its name lookups fail unexpectedly."
 msgstr "Вот где кроется проблема --- если ваше приложение залинковано с библиотекой C Guix (скажем, glibc 2.24) и пытается загрузить плагины NSS из другой библиотеки C (скажем, @code{libnss_mdns.so} для glibc 2.22), это вероятно вызовет падение или резолвинг имени завершится с ошибкой."
 
 #. type: Plain text
-#: doc/guix.texi:1672
+#: doc/guix.texi:1676
 msgid "Running @command{nscd} on the system, among other advantages, eliminates this binary incompatibility problem because those @code{libnss_*.so} files are loaded in the @command{nscd} process, not in applications themselves."
 msgstr "Запуск @command{nscd} в системе, помимо преимуществ, также исключает эту проблему несовместимости программ, потому что файлы @code{libnss_*.so} загружены в процессе @command{nscd}, а не в самом приложении."
 
 #. type: subsection
-#: doc/guix.texi:1673
+#: doc/guix.texi:1677
 #, no-wrap
 msgid "X11 Fonts"
 msgstr "Шрифты X11"
 
 #. type: Plain text
-#: doc/guix.texi:1683
+#: doc/guix.texi:1687
 msgid "The majority of graphical applications use Fontconfig to locate and load fonts and perform X11-client-side rendering.  The @code{fontconfig} package in Guix looks for fonts in @file{$HOME/.guix-profile} by default.  Thus, to allow graphical applications installed with Guix to display fonts, you have to install fonts with Guix as well.  Essential font packages include @code{gs-fonts}, @code{font-dejavu}, and @code{font-gnu-freefont-ttf}."
 msgstr "Большинство графических приложений использует Fontconfig для обнаружения и загрузки шрифтов, а также рендеринга X11 на клиенте. Пакет Guix @code{fontconfig} отвечает за шрифты в @file{$HOME/.guix-profile} по умолчанию. Так что, чтобы графические приложения, установленные с помощью Guix, отображали шрифты, необходимо установить шрифты также с помощью Guix. Основные пакеты шрифтов:  @code{gs-fonts}, @code{font-dejavu} и @code{font-gnu-freefont-ttf}."
 
+#. type: code{#1}
+#: doc/guix.texi:1688
+#, no-wrap
+msgid "fc-cache"
+msgstr "fc-cache"
+
+#. type: cindex
+#: doc/guix.texi:1689
+#, no-wrap
+msgid "font cache"
+msgstr "кеш шрифтов"
+
+#. type: Plain text
+#: doc/guix.texi:1693
+msgid "Once you have installed or removed fonts, or when you notice an application that does not find fonts, you may need to install Fontconfig and to force an update of its font cache by running:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:1697
+#, no-wrap
+msgid ""
+"guix install fontconfig\n"
+"fc-cache -rv\n"
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:1690
+#: doc/guix.texi:1705
 msgid "To display text written in Chinese languages, Japanese, or Korean in graphical applications, consider installing @code{font-adobe-source-han-sans} or @code{font-wqy-zenhei}.  The former has multiple outputs, one per language family (@pxref{Packages with Multiple Outputs}).  For instance, the following command installs fonts for Chinese languages:"
 msgstr "Для отображения в графических приложениях текста на китайском, японском, корейском нужно установить @code{font-adobe-source-han-sans} или @code{font-wqy-zenhei}. Первый имеет множественный выход, один для языковой семьи (@pxref{Packages with Multiple Outputs}). Например, следующая команда устанавливает шрифты для китайских языков:"
 
 #. type: example
-#: doc/guix.texi:1693
+#: doc/guix.texi:1708
 #, no-wrap
 msgid "guix install font-adobe-source-han-sans:cn\n"
 msgstr "guix install font-adobe-source-han-sans:cn\n"
 
 #. type: code{#1}
-#: doc/guix.texi:1695
+#: doc/guix.texi:1710
 #, no-wrap
 msgid "xterm"
 msgstr "xterm"
 
 #. type: Plain text
-#: doc/guix.texi:1699
+#: doc/guix.texi:1714
 msgid "Older programs such as @command{xterm} do not use Fontconfig and instead rely on server-side font rendering.  Such programs require to specify a full name of a font using XLFD (X Logical Font Description), like this:"
 msgstr "Старые программы, например, @command{xterm}, не используют Fontconfig, а вместо этого вызывают рендеринг шрифтов на стороне сервера. Таким программам необходимо указывать полное имя шрифта, используя XLFD (X Logical Font Description), примерно так:"
 
 #. type: example
-#: doc/guix.texi:1702
+#: doc/guix.texi:1717
 #, no-wrap
 msgid "-*-dejavu sans-medium-r-normal-*-*-100-*-*-*-*-*-1\n"
 msgstr "-*-dejavu sans-medium-r-normal-*-*-100-*-*-*-*-*-1\n"
 
 #. type: Plain text
-#: doc/guix.texi:1706
+#: doc/guix.texi:1721
 msgid "To be able to use such full names for the TrueType fonts installed in your Guix profile, you need to extend the font path of the X server:"
 msgstr "Чтобы иметь возможность использовать такие полные имена для шрифтов TrueType, установленных в вашем профиле Guix, вам нужно расширить пути шрифтов X-сервера:"
 
 #. type: example
-#: doc/guix.texi:1711
+#: doc/guix.texi:1726
 #, no-wrap
 msgid "xset +fp $(dirname $(readlink -f ~/.guix-profile/share/fonts/truetype/fonts.dir))\n"
 msgstr "xset +fp $(dirname $(readlink -f ~/.guix-profile/share/fonts/truetype/fonts.dir))\n"
 
 #. type: code{#1}
-#: doc/guix.texi:1713
+#: doc/guix.texi:1728
 #, no-wrap
 msgid "xlsfonts"
 msgstr "xlsfonts"
 
 #. type: Plain text
-#: doc/guix.texi:1716
+#: doc/guix.texi:1731
 msgid "After that, you can run @code{xlsfonts} (from @code{xlsfonts} package)  to make sure your TrueType fonts are listed there."
 msgstr "После этого можно запустить @code{xlsfonts} (из пакета @code{xlsfonts}), чтобы убедиться, что ваши шрифты TrueType находятся там."
 
 #. type: code{#1}
-#: doc/guix.texi:1717
-#, no-wrap
-msgid "fc-cache"
-msgstr "fc-cache"
-
-#. type: cindex
-#: doc/guix.texi:1718
-#, no-wrap
-msgid "font cache"
-msgstr "кеш шрифтов"
-
-#. type: Plain text
-#: doc/guix.texi:1724
-#, fuzzy
-#| msgid "After installing fonts you may have to refresh the font cache to use them in applications.  The same applies when applications installed via Guix do not seem to find fonts.  To force rebuilding of the font cache run @code{fc-cache -f}.  The @code{fc-cache} command is provided by the @code{fontconfig} package."
-msgid "After installing fonts you may have to refresh the font cache to use them in applications.  The same applies when applications installed via Guix do not seem to find fonts.  To force rebuilding of the font cache run @code{fc-cache -rv}.  The @code{fc-cache} command is provided by the @code{fontconfig} package."
-msgstr "После установки шрифтов, возможно вам потребуется обновить кеш шрифтов, чтобы использовать их в приложениях. Это необходимо делать, когда приложения, установленные с помощью Guix, не находят шрифты. Для того чтобы пересобрать кеш шрифтов, запустите @code{fc-cache -f}. Команда @code{fc-cache} предоставляется пакетом @code{fontconfig}."
-
-#. type: code{#1}
-#: doc/guix.texi:1727 doc/guix.texi:25663
+#: doc/guix.texi:1735 doc/guix.texi:25926
 #, no-wrap
 msgid "nss-certs"
 msgstr "nss-certs"
 
 #. type: Plain text
-#: doc/guix.texi:1730
+#: doc/guix.texi:1738
 msgid "The @code{nss-certs} package provides X.509 certificates, which allow programs to authenticate Web servers accessed over HTTPS."
 msgstr "Пакет @code{nss-certs} предоставялет сертификаты X.509, которые позволяют программам аутентифицировать веб-серверы и работать через HTTPS."
 
 #. type: Plain text
-#: doc/guix.texi:1735
+#: doc/guix.texi:1743
 msgid "When using Guix on a foreign distro, you can install this package and define the relevant environment variables so that packages know where to look for certificates.  @xref{X.509 Certificates}, for detailed information."
 msgstr "При использовании Guix на чужом дистрибутиве можно установить этот пакет и определить соответствующие переменные окружения, чтобы пакеты знали, где искать сертификаты. Смотрите @xref{X.509 Certificates} для подробной информации."
 
 #. type: subsection
-#: doc/guix.texi:1736
+#: doc/guix.texi:1744
 #, no-wrap
 msgid "Emacs Packages"
 msgstr "Пакеты Emacs"
 
 #. type: code{#1}
-#: doc/guix.texi:1738
+#: doc/guix.texi:1746
 #, no-wrap
 msgid "emacs"
 msgstr "emacs"
 
 #. type: Plain text
-#: doc/guix.texi:1749
-msgid "When you install Emacs packages with Guix, the elisp files may be placed either in @file{$HOME/.guix-profile/share/emacs/site-lisp/} or in sub-directories of @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}.  The latter directory exists because potentially there may exist thousands of Emacs packages and storing all their files in a single directory may not be reliable (because of name conflicts).  So we think using a separate directory for each package is a good idea.  It is very similar to how the Emacs package system organizes the file structure (@pxref{Package Files,,, emacs, The GNU Emacs Manual})."
-msgstr "Когда вы устанавливаете пакеты Emacs с помощью Guix, файлы elisp могут помещаться в @file{$HOME/.guix-profile/share/emacs/site-lisp/} или поддиректориях @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}. Последняя директория существует, потому что потенциально могут существовать тысячи пакетов Emacs, и сохранение всех их файлов в одной директории может быть неприемлемо (из-за конфликта имён). Так что мы считаем хорошей идеей использовать отдельную директорию для каждого пакета. Это очень похоже на то, как система пакетов Emacs организует файловую структуру (@pxref{Package Files,,, emacs, The GNU Emacs Manual})."
+#: doc/guix.texi:1752
+msgid "When you install Emacs packages with Guix, the Elisp files are placed under the @file{share/emacs/site-lisp/} directory of the profile in which they are installed.  The Elisp libraries are made available to Emacs through the @code{EMACSLOADPATH} environment variable, which is set when installing Emacs itself."
+msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1755
-msgid "By default, Emacs (installed with Guix) ``knows'' where these packages are placed, so you do not need to perform any configuration.  If, for some reason, you want to avoid auto-loading Emacs packages installed with Guix, you can do so by running Emacs with @code{--no-site-file} option (@pxref{Init File,,, emacs, The GNU Emacs Manual})."
+#: doc/guix.texi:1759
+#, fuzzy
+#| msgid "By default, Emacs (installed with Guix) ``knows'' where these packages are placed, so you do not need to perform any configuration.  If, for some reason, you want to avoid auto-loading Emacs packages installed with Guix, you can do so by running Emacs with @code{--no-site-file} option (@pxref{Init File,,, emacs, The GNU Emacs Manual})."
+msgid "Additionally, autoload definitions are automatically evaluated at the initialization of Emacs, by the Guix-specific @code{guix-emacs-autoload-packages} procedure.  If, for some reason, you want to avoid auto-loading the Emacs packages installed with Guix, you can do so by running Emacs with the @code{--no-site-file} option (@pxref{Init File,,, emacs, The GNU Emacs Manual})."
 msgstr "По умолчанию Emacs (установленный Guix) \"знает\", куда размещаются эти пакеты, так что вам не нужно выполнять конфигурацию. Если по каким-либо причинам вы хотите отменить автозагрузку пакетов Emacs, установленных с помощью Guix, вы можете это сделать, запустив Emacs с опцией @code{--no-site-file} (@pxref{Init File,,, emacs, The GNU Emacs Manual})."
 
 #. type: subsection
-#: doc/guix.texi:1756
+#: doc/guix.texi:1760
 #, no-wrap
 msgid "The GCC toolchain"
 msgstr "Тулчейн GCC"
 
 #. type: cindex
-#: doc/guix.texi:1758
+#: doc/guix.texi:1762
 #, no-wrap
 msgid "GCC"
 msgstr "GCC"
 
 #. type: cindex
-#: doc/guix.texi:1759
+#: doc/guix.texi:1763
 #, no-wrap
 msgid "ld-wrapper"
 msgstr "ld-wrapper"
 
 #. type: Plain text
-#: doc/guix.texi:1768
+#: doc/guix.texi:1772
 msgid "Guix offers individual compiler packages such as @code{gcc} but if you are in need of a complete toolchain for compiling and linking source code what you really want is the @code{gcc-toolchain} package.  This package provides a complete GCC toolchain for C/C++ development, including GCC itself, the GNU C Library (headers and binaries, plus debugging symbols in the @code{debug} output), Binutils, and a linker wrapper."
 msgstr "Guix предлагает индивидуальные пакеты компиляторов, как например, @code{gcc}. Но если вам необходим полный набор инструментов (тулчейн) для компиляции и линковки исходного кода, тогда то, что вам действительно нужно, --- это пакет @code{gcc-toolchain}. Этот пакет предоставляет полный тулчейн GCC для разработки C/C++, включая сам GCC, библиотеку GNU C (заголовки и бинарники, а также отладочные символы в выходе @code{debug}), Binutils и набор линковщика."
 
 #. type: Plain text
-#: doc/guix.texi:1774
+#: doc/guix.texi:1778
 msgid "The wrapper's purpose is to inspect the @code{-L} and @code{-l} switches passed to the linker, add corresponding @code{-rpath} arguments, and invoke the actual linker with this new set of arguments.  You can instruct the wrapper to refuse to link against libraries not in the store by setting the @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}."
 msgstr "Цель оболочки --- проверять опции @code{-L} и @code{-l}, направленные линковщику, и соответствующие аргументы @code{-rpath}, и вызывать соответствующий линковщик с этим новым набором аргументов. Вы можете указать оболочке отклонять линковку с библиотеками, находящимися не на складе, установив переменную окружения @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} в значение @code{no}."
 
 #. type: cindex
-#: doc/guix.texi:1778
+#: doc/guix.texi:1782
 #, no-wrap
 msgid "Upgrading Guix, on a foreign distro"
-msgstr ""
+msgstr "Обновление Guix на ином дистрибутиве"
 
 #. type: Plain text
-#: doc/guix.texi:1781
+#: doc/guix.texi:1785
 #, fuzzy
 #| msgid "upgrading Guix"
 msgid "To upgrade Guix, run:"
-msgstr "обновление версии Guix"
+msgstr "Чтобы обновить Guix, запустите:"
 
 #. type: example
-#: doc/guix.texi:1784
+#: doc/guix.texi:1788
 #, fuzzy, no-wrap
 #| msgid "guix pull"
 msgid "guix pull\n"
-msgstr "guix pull"
+msgstr "guix pull\n"
 
 #. type: Plain text
-#: doc/guix.texi:1787
+#: doc/guix.texi:1791
 #, fuzzy
 #| msgid "@xref{Invoking guix pack}, for more info on this handy tool."
 msgid "@xref{Invoking guix pull}, for more information."
 msgstr "@xref{Invoking guix pack} для подробной информации об этом полезном инструменте."
 
 #. type: cindex
-#: doc/guix.texi:1788
+#: doc/guix.texi:1792
 #, no-wrap
 msgid "upgrading Guix for the root user, on a foreign distro"
-msgstr ""
+msgstr "обновление Guix для пользователя root на ином дистрибутиве"
 
 #. type: cindex
-#: doc/guix.texi:1789
+#: doc/guix.texi:1793
 #, no-wrap
 msgid "upgrading the Guix daemon, on a foreign distro"
-msgstr ""
+msgstr "обновление Guix демона на ином дистрибутиве"
 
 #. type: cindex
-#: doc/guix.texi:1790
+#: doc/guix.texi:1794
 #, no-wrap
 msgid "@command{guix pull} for the root user, on a foreign distro"
-msgstr ""
+msgstr "@command{guix pull} для пользователя root, на ином дистрибутиве"
 
 #. type: Plain text
-#: doc/guix.texi:1793
+#: doc/guix.texi:1797
 msgid "On a foreign distro, you can upgrade the build daemon by running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1796
+#: doc/guix.texi:1800
 #, fuzzy, no-wrap
 #| msgid "Invoking guix pull"
 msgid "sudo -i guix pull\n"
 msgstr "Запуск guix pull"
 
 #. type: Plain text
-#: doc/guix.texi:1801
+#: doc/guix.texi:1805
 msgid "followed by (assuming your distro uses the systemd service management tool):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1804
+#: doc/guix.texi:1808
 #, fuzzy, no-wrap
 #| msgid "semodule -i etc/guix-daemon.cil\n"
 msgid "systemctl restart guix-daemon.service\n"
 msgstr "semodule -i etc/guix-daemon.cil\n"
 
 #. type: Plain text
-#: doc/guix.texi:1808
+#: doc/guix.texi:1812
 msgid "On Guix System, upgrading the daemon is achieved by reconfiguring the system (@pxref{Invoking guix system, @code{guix system reconfigure}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1815
+#: doc/guix.texi:1819
 #, no-wrap
 msgid "installing Guix System"
 msgstr "установка системы Guix"
 
 #. type: cindex
-#: doc/guix.texi:1816
+#: doc/guix.texi:1820
 #, no-wrap
 msgid "Guix System, installation"
 msgstr "Система Guix, установка"
 
 #. type: Plain text
-#: doc/guix.texi:1821
+#: doc/guix.texi:1825
 msgid "This section explains how to install Guix System on a machine.  Guix, as a package manager, can also be installed on top of a running GNU/Linux system, @pxref{Installation}."
 msgstr "Этот раздел объясняет, как установить систему Guix на компьютер. Guix, как пакетный менеджер, можно также установить на уже установленную систему GNU/Linux (@pxref{Installation})."
 
 #. type: quotation
-#: doc/guix.texi:1830
+#: doc/guix.texi:1834
 msgid "You are reading this documentation with an Info reader.  For details on how to use it, hit the @key{RET} key (``return'' or ``enter'') on the link that follows: @pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}.  Hit @kbd{l} afterwards to come back here."
 msgstr "Вы читаете этот документ с помощью info-просмотрщика. Чтобы узнать, как им пользоваться, нажмите кнопку @key{Ввод} (enter) по ссылке: @pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}. Нажмите @kbd{1} после этого, чтобы вернуться."
 
 #. type: quotation
-#: doc/guix.texi:1833
+#: doc/guix.texi:1837
 msgid "Alternately, run @command{info info} in another tty to keep the manual available."
 msgstr "Или запустите @command{info info} в другом  tty, чтобы оставить руководство доступным."
 
 #. type: Plain text
-#: doc/guix.texi:1854
+#: doc/guix.texi:1858
 msgid "We consider Guix System to be ready for a wide range of ``desktop'' and server use cases.  The reliability guarantees it provides---transactional upgrades and rollbacks, reproducibility---make it a solid foundation."
 msgstr "Мы полагаем, система Guix будет широко применяться для офисных и серверных решений. Гарантия надёжности основана на транзакционных обновлениях, откатах и воспроизводимости. Это наше прочное основание."
 
 #. type: Plain text
-#: doc/guix.texi:1857
+#: doc/guix.texi:1861
 msgid "Nevertheless, before you proceed with the installation, be aware of the following noteworthy limitations applicable to version @value{VERSION}:"
 msgstr "Тем не менее, перед началом установки, ознакомьтесь с важной информацией об ограничениях версии @value{VERSION}:"
 
 #. type: itemize
-#: doc/guix.texi:1861
+#: doc/guix.texi:1865
 msgid "Support for the Logical Volume Manager (LVM) is missing."
 msgstr "Менеджер логических томов (LVM) отсутствует."
 
 #. type: itemize
-#: doc/guix.texi:1865
+#: doc/guix.texi:1869
 msgid "More and more system services are provided (@pxref{Services}), but some may be missing."
 msgstr "Мы постоянно добавляем новые сервисы (@pxref{Services}), но некоторые могут отсутствовать."
 
 #. type: itemize
-#: doc/guix.texi:1870
+#: doc/guix.texi:1874
 msgid "GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop Services}), as well as a number of X11 window managers.  However, KDE is currently missing."
 msgstr "Доступные GNOME, Xfce, LXDE и Enlightenment (@pxref{Desktop Services}), а также ряд оконных менеджеров X11. Однако, KDE в настоящее время отсутствует."
 
 #. type: Plain text
-#: doc/guix.texi:1875
+#: doc/guix.texi:1879
 msgid "More than a disclaimer, this is an invitation to report issues (and success stories!), and to join us in improving it.  @xref{Contributing}, for more info."
 msgstr "Мы настойчиво призываем вас присылать отчёты о проблемах (или историиуспеха!). Присоединяйтесь к нам, если вы хотите улучшить Guix. Смотрите @xref{Contributing}, чтобы узнать больше."
 
 #. type: cindex
-#: doc/guix.texi:1880
+#: doc/guix.texi:1884
 #, no-wrap
 msgid "hardware support on Guix System"
 msgstr "поддержка аппаратного обеспечения в системе Guix"
 
 #. type: Plain text
-#: doc/guix.texi:1889
+#: doc/guix.texi:1893
 msgid "GNU@tie{}Guix focuses on respecting the user's computing freedom.  It builds around the kernel Linux-libre, which means that only hardware for which free software drivers and firmware exist is supported.  Nowadays, a wide range of off-the-shelf hardware is supported on GNU/Linux-libre---from keyboards to graphics cards to scanners and Ethernet controllers.  Unfortunately, there are still areas where hardware vendors deny users control over their own computing, and such hardware is not supported on Guix System."
 msgstr "GNU@tie{}Guix особенно заботится об уважении свободы пользователя при работе за компьютером. Она построена на ядре Linux-libre, что означает, что поддерживается только аппаратное обеспечение, которое имеет свободные драйверы и прошивки. Сегодня широкий список наличествующей аппаратуры поддерживается GNU/Linux-libre --- от клавиатур и графических карт до сканеров и контроллеров Ethernet. К сожалению, всё ещё остаётся ряд производителей железа, которые запрещают пользователям управлять их устройствами, и такое аппаратное обеспечение не поддерживается системой Guix."
 
 #. type: cindex
-#: doc/guix.texi:1890
+#: doc/guix.texi:1894
 #, fuzzy, no-wrap
 msgid "WiFi, hardware support"
 msgstr ""
@@ -5808,48 +5935,48 @@ msgstr ""
 "Wi-Fi, поддержка аппаратного обеспечения"
 
 #. type: Plain text
-#: doc/guix.texi:1899
+#: doc/guix.texi:1903
 msgid "One of the main areas where free drivers or firmware are lacking is WiFi devices.  WiFi devices known to work include those using Atheros chips (AR9271 and AR7010), which corresponds to the @code{ath9k} Linux-libre driver, and those using Broadcom/AirForce chips (BCM43xx with Wireless-Core Revision 5), which corresponds to the @code{b43-open} Linux-libre driver.  Free firmware exists for both and is available out-of-the-box on Guix System, as part of @code{%base-firmware} (@pxref{operating-system Reference, @code{firmware}})."
 msgstr "Основной областью, в которой отсутствуют свободные драйверы и прошивки, являются устройства Wi-Fi. Работают устройства Wi-Fi, которые используют платы Atheros (AR9271 и AR7010) и взаимодействуют с драйвером Linux-libre @code{ath9k}, также использующие платы Broadcom/AirForce (BCM43xx with Wireless-Core Revision 5), которые работают с драйвером Linux-libre @code{b43-open}. Свободная прошивка существует для обоих и доступна в системе Guix из коробки как часть @var{%base-firmware} (@pxref{operating-system Reference, @code{firmware}})."
 
 #. type: cindex
-#: doc/guix.texi:1900
+#: doc/guix.texi:1904
 #, no-wrap
 msgid "RYF, Respects Your Freedom"
 msgstr "уважение вашей свободы (RYF)"
 
 #. type: Plain text
-#: doc/guix.texi:1906
+#: doc/guix.texi:1910
 msgid "The @uref{https://www.fsf.org/, Free Software Foundation} runs @uref{https://www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), a certification program for hardware products that respect your freedom and your privacy and ensure that you have control over your device.  We encourage you to check the list of RYF-certified devices."
 msgstr "@uref{https://www.fsf.org/, Фонд свободного программного обспечения FSF} ведёт @uref{https://www.fsf.org/ryf, @dfn{Уважение вашей свободы}} (RYF) --- программу сертификации аппаратного обеспечения, которое уважает вашу свободу и вашу безопасность и утверждает, что вы имеете контроль над вашими устройствами. Мы побуждаем вас проверить список устройств, сертифицированных RYF."
 
 #. type: Plain text
-#: doc/guix.texi:1910
+#: doc/guix.texi:1914
 msgid "Another useful resource is the @uref{https://www.h-node.org/, H-Node} web site.  It contains a catalog of hardware devices with information about their support in GNU/Linux."
 msgstr "Другой полезный ресурс --- сайт @uref{https://www.h-node.org/, H-Node}. Он содержит каталог устройств с информацией об их поддержке в GNU/Linux."
 
 #. type: Plain text
-#: doc/guix.texi:1919
+#: doc/guix.texi:1923
 msgid "An ISO-9660 installation image that can be written to a USB stick or burnt to a DVD can be downloaded from @indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz}, where @var{system} is one of:"
 msgstr "Установочный образ ISO-9660 может быть записан на USB-флеш или DVD, скачать его можно по адресу: @indicateurl{https://alpha.gnu.org/gnu/guix/guix-system-install-@value{VERSION}.@var{system}.iso.xz}, где @var{system} одна из следующих:"
 
 #. type: table
-#: doc/guix.texi:1923
+#: doc/guix.texi:1927
 msgid "for a GNU/Linux system on Intel/AMD-compatible 64-bit CPUs;"
 msgstr "для системы GNU/Linux на 64-битных Intel/AMD-совместимых процессорах;"
 
 #. type: table
-#: doc/guix.texi:1926
+#: doc/guix.texi:1930
 msgid "for a 32-bit GNU/Linux system on Intel-compatible CPUs."
 msgstr "для системы GNU/Linux на 32-битных Intel-совместимых процессорах."
 
 #. type: Plain text
-#: doc/guix.texi:1931
+#: doc/guix.texi:1935
 msgid "Make sure to download the associated @file{.sig} file and to verify the authenticity of the image against it, along these lines:"
 msgstr "Обязательно скачайте связанный файл подписи @file{.sig} и проверьте аутентичность образа так:"
 
 #. type: example
-#: doc/guix.texi:1935
+#: doc/guix.texi:1939
 #, no-wrap
 msgid ""
 "$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig\n"
@@ -5859,39 +5986,39 @@ msgstr ""
 "$ gpg --verify guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig\n"
 
 #. type: Plain text
-#: doc/guix.texi:1955
+#: doc/guix.texi:1959
 msgid "This image contains the tools necessary for an installation.  It is meant to be copied @emph{as is} to a large-enough USB stick or DVD."
 msgstr "Этот образ содержит инструменты, необходимые для установки. Он должен копироваться @emph{как есть} на большую USB-флеш или DVD."
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:1956
+#: doc/guix.texi:1960
 #, no-wrap
 msgid "Copying to a USB Stick"
 msgstr "Запись на USB-флеш"
 
 #. type: Plain text
-#: doc/guix.texi:1959
+#: doc/guix.texi:1963
 msgid "To copy the image to a USB stick, follow these steps:"
 msgstr "Чтобы записать образ на USB-флеш, выполните следующие шаги:"
 
 #. type: enumerate
-#: doc/guix.texi:1963 doc/guix.texi:1988
+#: doc/guix.texi:1967 doc/guix.texi:1992
 msgid "Decompress the image using the @command{xz} command:"
 msgstr "Распакуйте образ, используя команду @command{xz}:"
 
 #. type: example
-#: doc/guix.texi:1966 doc/guix.texi:1991
+#: doc/guix.texi:1970 doc/guix.texi:1995
 #, no-wrap
 msgid "xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz\n"
 msgstr "xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz\n"
 
 #. type: enumerate
-#: doc/guix.texi:1972
+#: doc/guix.texi:1976
 msgid "Insert a USB stick of 1@tie{}GiB or more into your machine, and determine its device name.  Assuming that the USB stick is known as @file{/dev/sdX}, copy the image with:"
 msgstr "Вставьте в компьютер USB-флеш объёмом 1@tie{}Гб или более и определите его имя. Учитывая имя (обычно соответствующее @file{/dev/sdX}) скопируйте образ на него:"
 
 #. type: example
-#: doc/guix.texi:1976
+#: doc/guix.texi:1980
 #, no-wrap
 msgid ""
 "dd if=guix-system-install-@value{VERSION}.@var{system}.iso of=/dev/sdX\n"
@@ -5901,225 +6028,225 @@ msgstr ""
 "sync\n"
 
 #. type: enumerate
-#: doc/guix.texi:1979
+#: doc/guix.texi:1983
 msgid "Access to @file{/dev/sdX} usually requires root privileges."
 msgstr "Доступ к @file{/dev/sdX} обычно требует привилегий root."
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:1981
+#: doc/guix.texi:1985
 #, no-wrap
 msgid "Burning on a DVD"
 msgstr "Запись на DVD"
 
 #. type: Plain text
-#: doc/guix.texi:1984
+#: doc/guix.texi:1988
 msgid "To copy the image to a DVD, follow these steps:"
 msgstr "Чтобы скопировать образ на DVD, проделайте следующие шаги:"
 
 #. type: enumerate
-#: doc/guix.texi:1997
+#: doc/guix.texi:2001
 msgid "Insert a blank DVD into your machine, and determine its device name.  Assuming that the DVD drive is known as @file{/dev/srX}, copy the image with:"
 msgstr "Вставьте чистый DVD в компьютер и определите имя устройства. Обычно DVD определяется как @file{/dev/srX}, скопируйте образ так:"
 
 #. type: example
-#: doc/guix.texi:2000
+#: doc/guix.texi:2004
 #, no-wrap
 msgid "growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{system}.iso\n"
 msgstr "growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{system}.iso\n"
 
 #. type: enumerate
-#: doc/guix.texi:2003
+#: doc/guix.texi:2007
 msgid "Access to @file{/dev/srX} usually requires root privileges."
 msgstr "Доступ к @file{/dev/srX} обычно требует привилегий root."
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:2005
+#: doc/guix.texi:2009
 #, no-wrap
 msgid "Booting"
 msgstr "Загрузка"
 
 #. type: Plain text
-#: doc/guix.texi:2012
+#: doc/guix.texi:2016
 #, fuzzy
 #| msgid "Once this is done, you should be able to reboot the system and boot from the USB stick or DVD.  The latter usually requires you to get in the BIOS or UEFI boot menu, where you can choose to boot from the USB stick."
 msgid "Once this is done, you should be able to reboot the system and boot from the USB stick or DVD.  The latter usually requires you to get in the BIOS or UEFI boot menu, where you can choose to boot from the USB stick.  In order to boot from Libreboot, switch to the command mode by pressing the @kbd{c} key and type @command{search_grub usb}."
 msgstr "Когда это сделано, вы должны перезагрузить систему и загрузиться с USB-флеш или DVD. Последнее обычно требует доступа к меню BIOS или UEFI, где можно выбрать загрузку с USB-флеш."
 
 #. type: Plain text
-#: doc/guix.texi:2015
+#: doc/guix.texi:2019
 msgid "@xref{Installing Guix in a VM}, if, instead, you would like to install Guix System in a virtual machine (VM)."
 msgstr "Смотрите @xref{Installing Guix in a VM}, если вы хотите установить систему Guix на виртуальную машину (VM)."
 
 #. type: Plain text
-#: doc/guix.texi:2025
+#: doc/guix.texi:2029
 msgid "Once you have booted, you can use the guided graphical installer, which makes it easy to get started (@pxref{Guided Graphical Installation}).  Alternately, if you are already familiar with GNU/Linux and if you want more control than what the graphical installer provides, you can choose the ``manual'' installation process (@pxref{Manual Installation})."
 msgstr "Когда вы загрузитесь, вы можете использовать графическую установку, которая намного проще для начала (@pxref{Guided Graphical Installation}). Или если вы уже знакомы с GNU/Linux или вы хотите больший контроль, чем это предоставляет графическая установка, вы можете выбрать ручной процесс установки (@pxref{Manual Installation})."
 
 #. type: Plain text
-#: doc/guix.texi:2033
+#: doc/guix.texi:2037
 msgid "The graphical installer is available on TTY1.  You can obtain root shells on TTYs 3 to 6 by hitting @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4}, etc.  TTY2 shows this documentation and you can reach it with @kbd{ctrl-alt-f2}.  Documentation is browsable using the Info reader commands (@pxref{Top,,, info-stnd, Stand-alone GNU Info}).  The installation system runs the GPM mouse daemon, which allows you to select text with the left mouse button and to paste it with the middle button."
 msgstr "Графическа установка доступна в TTY1. Вы можете запустить оболочку root в TTY 3-6, нажимая @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4} и т.д.  TTY2 отображает эту документацию, открыть его можно клавишами @kbd{ctrl-alt-f2}. Листать документацию можно командами просмотрщика Info (@pxref{Top,,, info-stnd, Stand-alone GNU Info}). Установка системы запускает демона мыши GPM, который позволяет вам выделять текст лековй кнопкой мыши и вставлять средней кнопкой."
 
 #. type: quotation
-#: doc/guix.texi:2038
+#: doc/guix.texi:2042
 msgid "Installation requires access to the Internet so that any missing dependencies of your system configuration can be downloaded.  See the ``Networking'' section below."
 msgstr "Установка требует доступа к Интернету, чтобы скачивать любые отсутствующие зависимости в вашей конфигурации системы. Смотрите раздел \"Сеть\" ниже."
 
 #. type: Plain text
-#: doc/guix.texi:2045
+#: doc/guix.texi:2049
 msgid "The graphical installer is a text-based user interface.  It will guide you, with dialog boxes, through the steps needed to install GNU@tie{}Guix System."
 msgstr "Графический установщик представляет собой текстовый интерфейс. Он взаимодействует через диалоговые блоки, проходя шаги установки системы GNU@tie{}Guix."
 
 #. type: Plain text
-#: doc/guix.texi:2050
+#: doc/guix.texi:2054
 msgid "The first dialog boxes allow you to set up the system as you use it during the installation: you can choose the language, keyboard layout, and set up networking, which will be used during the installation.  The image below shows the networking dialog."
 msgstr "Первый диалоговый блок позволяет вам установить систему в таком виде, как во время установки. Вы можете выбрать язык, раскладку клавиатуры, задать настройки сети для установки. На картинке ниже --- диалог настройки сети."
 
 #. type: Plain text
-#: doc/guix.texi:2052
+#: doc/guix.texi:2056
 msgid "@image{images/installer-network,5in,, networking setup with the graphical installer}"
 msgstr "@image{images/installer-network,5in,, networking setup with the graphical installer}"
 
 #. type: Plain text
-#: doc/guix.texi:2057
+#: doc/guix.texi:2061
 msgid "Later steps allow you to partition your hard disk, as shown in the image below, to choose whether or not to use encrypted file systems, to enter the host name and root password, and to create an additional account, among other things."
 msgstr "Следующие шаги позволят вам разметить диск, как это показано на картинке ниже. Также можно выбрать шифрование вайловой системы (или без шифрования), ввести имя хоста и пароль root, создать дополнительную учётную запись и другие действия."
 
 #. type: Plain text
-#: doc/guix.texi:2059
+#: doc/guix.texi:2063
 msgid "@image{images/installer-partitions,5in,, partitioning with the graphical installer}"
 msgstr "@image{images/installer-partitions,5in,, partitioning with the graphical installer}"
 
 #. type: Plain text
-#: doc/guix.texi:2062
+#: doc/guix.texi:2066
 msgid "Note that, at any time, the installer allows you to exit the current installation step and resume at a previous step, as show in the image below."
 msgstr "Отметим, что в любое время установщик позволяет вам отменить текущий шаг и вернуться к предыдущему шагу установки, как это показано на картинке ниже."
 
 #. type: Plain text
-#: doc/guix.texi:2064
+#: doc/guix.texi:2068
 msgid "@image{images/installer-resume,5in,, resuming the installation process}"
 msgstr "@image{images/installer-resume,5in,, resuming the installation process}"
 
 #. type: Plain text
-#: doc/guix.texi:2069
+#: doc/guix.texi:2073
 msgid "Once you're done, the installer produces an operating system configuration and displays it (@pxref{Using the Configuration System}).  At that point you can hit ``OK'' and installation will proceed.  On success, you can reboot into the new system and enjoy.  @xref{After System Installation}, for what's next!"
 msgstr "Когда настройки выполнены, установщик сгенерирует конфигурацию операционной системы и отобразит её (@pxref{Using the Configuration System}). На этом этапе нажатие \"OK\" запустит установку. После успешнго завершения нужно перезагрузиться и использовать новую систему. Смотрите @xref{After System Installation}, чтобы узнать ещё больше."
 
 #. type: Plain text
-#: doc/guix.texi:2079
+#: doc/guix.texi:2083
 msgid "This section describes how you would ``manually'' install GNU@tie{}Guix System on your machine.  This option requires familiarity with GNU/Linux, with the shell, and with common administration tools.  If you think this is not for you, consider using the guided graphical installer (@pxref{Guided Graphical Installation})."
 msgstr "Этот раздел описывает, как можно вручную установить систему GNU@tie{}Guix на вашу машину. Это потребует знаний GNU/Linux, оболочки и инструментов администрирования. Если вы считаете, это не для вас, используйте вариант графической установки (@pxref{Guided Graphical Installation})."
 
 #. type: Plain text
-#: doc/guix.texi:2085
+#: doc/guix.texi:2089
 msgid "The installation system provides root shells on TTYs 3 to 6; press @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4}, and so on to reach them.  It includes many common tools needed to install the system.  But it is also a full-blown Guix System, which means that you can install additional packages, should you need it, using @command{guix package} (@pxref{Invoking guix package})."
 msgstr "Во время установки доступна оболочка root в TTY от 3 до 6. Нажмите  @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4} и т.д., чтобы переключиться на них. Они имеют много стандартных инструментов для установки системы. Но это также работающая система Guix, а это значит, что вы можете установить дополнительные пакеты, которые потребуются, используя @command{guix package} (@pxref{Invoking guix package})."
 
 #. type: subsection
-#: doc/guix.texi:2092
+#: doc/guix.texi:2096
 #, no-wrap
 msgid "Keyboard Layout, Networking, and Partitioning"
 msgstr "Раскладка клавиатуры, Сеть, Разметка диска"
 
 #. type: Plain text
-#: doc/guix.texi:2097
+#: doc/guix.texi:2101
 msgid "Before you can install the system, you may want to adjust the keyboard layout, set up networking, and partition your target hard disk.  This section will guide you through this."
 msgstr "Перед установкой системы вам может понадобиться смена раскладки клавиатуры, а также настройка сети и разметка целевого жёсткого диска. В этом разделе приведены соответствующие инструкции."
 
 #. type: cindex
-#: doc/guix.texi:2100 doc/guix.texi:11770
+#: doc/guix.texi:2104 doc/guix.texi:11882
 #, no-wrap
 msgid "keyboard layout"
 msgstr "раскладка клавиатуры"
 
 #. type: Plain text
-#: doc/guix.texi:2104
+#: doc/guix.texi:2108
 msgid "The installation image uses the US qwerty keyboard layout.  If you want to change it, you can use the @command{loadkeys} command.  For example, the following command selects the Dvorak keyboard layout:"
 msgstr "Установочный образ использует раскладку клавиатуры US qwerty. Если нужно поменять её, можно пользоваться командой @command{loadkeys}. Например, следующая команда выбирает раскладку клавиатуры Dvorak:"
 
 #. type: example
-#: doc/guix.texi:2107
+#: doc/guix.texi:2111
 #, no-wrap
 msgid "loadkeys dvorak\n"
 msgstr "loadkeys dvorak\n"
 
 #. type: Plain text
-#: doc/guix.texi:2112
+#: doc/guix.texi:2116
 msgid "See the files under @file{/run/current-system/profile/share/keymaps} for a list of available keyboard layouts.  Run @command{man loadkeys} for more information."
 msgstr "Смотрите файлы в @file{/run/current-system/profile/share/keymaps}, чтобы найти список доступных раскладок. Запустите @command{man loadkeys}, чтобы узнать больше."
 
 #. type: subsubsection
-#: doc/guix.texi:2113
+#: doc/guix.texi:2117
 #, no-wrap
 msgid "Networking"
 msgstr "Сеть"
 
 #. type: Plain text
-#: doc/guix.texi:2116
+#: doc/guix.texi:2120
 msgid "Run the following command to see what your network interfaces are called:"
 msgstr "Запустите следующую команду, чтобы узнать имена сетевых интерфейсов:"
 
 #. type: example
-#: doc/guix.texi:2119
+#: doc/guix.texi:2123
 #, no-wrap
 msgid "ifconfig -a\n"
 msgstr "ifconfig -a\n"
 
 #. type: table
-#: doc/guix.texi:2123 doc/guix.texi:2145
+#: doc/guix.texi:2127 doc/guix.texi:2149
 msgid "@dots{} or, using the GNU/Linux-specific @command{ip} command:"
 msgstr "@dots{} или используйте специальную команду GNU/Linux @command{ip}:"
 
 #. type: example
-#: doc/guix.texi:2126
+#: doc/guix.texi:2130
 #, fuzzy, no-wrap
 #| msgid "ip a\n"
 msgid "ip address\n"
 msgstr "ip a\n"
 
 #. type: Plain text
-#: doc/guix.texi:2133
+#: doc/guix.texi:2137
 msgid "Wired interfaces have a name starting with @samp{e}; for example, the interface corresponding to the first on-board Ethernet controller is called @samp{eno1}.  Wireless interfaces have a name starting with @samp{w}, like @samp{w1p2s0}."
 msgstr "Проводные интерфейсы называются на букву @samp{e}; например, интерфейс, соответствующий первому контроллеру Ethernet на материнской плате, называется @samp{eno1}. Беспроводные интерфейсы имеют имена, начинающиеся с @samp{w}, как @samp{w1p2s0}."
 
 #. type: item
-#: doc/guix.texi:2135
+#: doc/guix.texi:2139
 #, no-wrap
 msgid "Wired connection"
 msgstr "Проводное соединение"
 
 #. type: table
-#: doc/guix.texi:2138
+#: doc/guix.texi:2142
 msgid "To configure a wired network run the following command, substituting @var{interface} with the name of the wired interface you want to use."
 msgstr "Чтобы настроить проводную сеть, запустите следующую команду, заменив @var{interface} именем проводного интерфейса, который вы хотите использовать."
 
 #. type: example
-#: doc/guix.texi:2141
+#: doc/guix.texi:2145
 #, no-wrap
 msgid "ifconfig @var{interface} up\n"
 msgstr "ifconfig @var{interface} up\n"
 
 #. type: example
-#: doc/guix.texi:2148
+#: doc/guix.texi:2152
 #, fuzzy, no-wrap
 #| msgid "ifconfig @var{interface} up\n"
 msgid "ip link set @var{interface} up\n"
 msgstr "ifconfig @var{interface} up\n"
 
 #. type: item
-#: doc/guix.texi:2150
+#: doc/guix.texi:2154
 #, no-wrap
 msgid "Wireless connection"
 msgstr "Беспроводное соединение"
 
 #. type: cindex
-#: doc/guix.texi:2151 doc/guix.texi:13247
+#: doc/guix.texi:2155 doc/guix.texi:13404
 #, no-wrap
 msgid "wireless"
 msgstr "беспроводной"
 
 #. type: cindex
-#: doc/guix.texi:2152 doc/guix.texi:13248
+#: doc/guix.texi:2156 doc/guix.texi:13405
 #, fuzzy, no-wrap
 msgid "WiFi"
 msgstr ""
@@ -6129,23 +6256,23 @@ msgstr ""
 "Wi-Fi"
 
 #. type: table
-#: doc/guix.texi:2157
+#: doc/guix.texi:2161
 msgid "To configure wireless networking, you can create a configuration file for the @command{wpa_supplicant} configuration tool (its location is not important) using one of the available text editors such as @command{nano}:"
 msgstr "Чтобы настроить беспроводную сеть, можно создать конфигурционный файл для @command{wpa_supplicant} (расположение файла неважно). Можно пользоваться любым доступным текстовым редактором, например, @command{nano}:"
 
 #. type: example
-#: doc/guix.texi:2160
+#: doc/guix.texi:2164
 #, no-wrap
 msgid "nano wpa_supplicant.conf\n"
 msgstr "nano wpa_supplicant.conf\n"
 
 #. type: table
-#: doc/guix.texi:2165
+#: doc/guix.texi:2169
 msgid "As an example, the following stanza can go to this file and will work for many wireless networks, provided you give the actual SSID and passphrase for the network you are connecting to:"
 msgstr "Следующий пример настроек подойдёт для большинства беспроводных сетей. Нужно предоставить фактический SSID и парольную фразу для сети, к которой вы подключаетесь:"
 
 #. type: example
-#: doc/guix.texi:2172
+#: doc/guix.texi:2176
 #, no-wrap
 msgid ""
 "network=@{\n"
@@ -6161,186 +6288,209 @@ msgstr ""
 "@}\n"
 
 #. type: table
-#: doc/guix.texi:2177
+#: doc/guix.texi:2181
 msgid "Start the wireless service and run it in the background with the following command (substitute @var{interface} with the name of the network interface you want to use):"
 msgstr "Запустите сервис беспроводной сети в фоновом режиме следующей командой (замените @var{interface} именем сетевого интерфейса, который вы используете):"
 
 #. type: example
-#: doc/guix.texi:2180
+#: doc/guix.texi:2184
 #, no-wrap
 msgid "wpa_supplicant -c wpa_supplicant.conf -i @var{interface} -B\n"
 msgstr "wpa_supplicant -c wpa_supplicant.conf -i @var{interface} -B\n"
 
 #. type: table
-#: doc/guix.texi:2183
+#: doc/guix.texi:2187
 msgid "Run @command{man wpa_supplicant} for more information."
 msgstr "Запустите @command{man wpa_supplicant}, чтобы узнать больше."
 
 #. type: cindex
-#: doc/guix.texi:2185
+#: doc/guix.texi:2189
 #, no-wrap
 msgid "DHCP"
 msgstr "DHCP"
 
 #. type: Plain text
-#: doc/guix.texi:2188
+#: doc/guix.texi:2192
 msgid "At this point, you need to acquire an IP address.  On a network where IP addresses are automatically assigned @i{via} DHCP, you can run:"
 msgstr "Теперь нужно получить IP-адрес. В случае сети, где IP-адреса автоматически распределяются @i{с помощью} DHCP, можно запустить:"
 
 #. type: example
-#: doc/guix.texi:2191
+#: doc/guix.texi:2195
 #, no-wrap
 msgid "dhclient -v @var{interface}\n"
 msgstr "dhclient -v @var{interface}\n"
 
 #. type: Plain text
-#: doc/guix.texi:2194
+#: doc/guix.texi:2198
 msgid "Try to ping a server to see if networking is up and running:"
 msgstr "Попробуйте пинговать сервер, чтобы узнать, работает ли сеть:"
 
 #. type: example
-#: doc/guix.texi:2197
+#: doc/guix.texi:2201
 #, no-wrap
 msgid "ping -c 3 gnu.org\n"
 msgstr "ping -c 3 gnu.org\n"
 
 #. type: Plain text
-#: doc/guix.texi:2201
+#: doc/guix.texi:2205
 msgid "Setting up network access is almost always a requirement because the image does not contain all the software and tools that may be needed."
 msgstr "Настройка доступа к сети необходима почти всегда, потому что ораз может не иметь программное обеспечение и инструменты, которые могут понадобиться."
 
 #. type: cindex
-#: doc/guix.texi:2202
+#: doc/guix.texi:2206
+#, fuzzy, no-wrap
+#| msgid "Guix System, installation"
+msgid "proxy, during system installation"
+msgstr "Система Guix, установка"
+
+#. type: Plain text
+#: doc/guix.texi:2209
+msgid "If you need HTTP and HTTPS access to go through a proxy, run the following command:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:2212
+#, no-wrap
+msgid "herd set-http-proxy guix-daemon @var{URL}\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:2217
+msgid "where @var{URL} is the proxy URL, for example @code{http://example.org:8118}."
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:2218
 #, no-wrap
 msgid "installing over SSH"
 msgstr "установка через SSH"
 
 #. type: Plain text
-#: doc/guix.texi:2205
+#: doc/guix.texi:2221
 msgid "If you want to, you can continue the installation remotely by starting an SSH server:"
 msgstr "Если желаете, вы можете продолжить установку удалённо, запустив SSH-сервер:"
 
 #. type: example
-#: doc/guix.texi:2208
+#: doc/guix.texi:2224
 #, no-wrap
 msgid "herd start ssh-daemon\n"
 msgstr "herd start ssh-daemon\n"
 
 #. type: Plain text
-#: doc/guix.texi:2212
+#: doc/guix.texi:2228
 msgid "Make sure to either set a password with @command{passwd}, or configure OpenSSH public key authentication before logging in."
 msgstr "Не забудьте задать пароль командой @command{passwd} или настроить публичный ключ OpenSSH для аутентификации, чтобы иметь возможность подключиться."
 
 #. type: subsubsection
-#: doc/guix.texi:2213
+#: doc/guix.texi:2229
 #, no-wrap
 msgid "Disk Partitioning"
 msgstr "Разметка диска"
 
 #. type: Plain text
-#: doc/guix.texi:2217
+#: doc/guix.texi:2233
 msgid "Unless this has already been done, the next step is to partition, and then format the target partition(s)."
 msgstr "Если это ещё не сделано, тогда нужно разделить диск, а затем отформатировать целевой(-ые) раздел(ы)."
 
 #. type: Plain text
-#: doc/guix.texi:2222
+#: doc/guix.texi:2238
 msgid "The installation image includes several partitioning tools, including Parted (@pxref{Overview,,, parted, GNU Parted User Manual}), @command{fdisk}, and @command{cfdisk}.  Run it and set up your disk with the partition layout you want:"
 msgstr "Установочный образ содержит несколько инструментов для разметки, включая Parted (@pxref{Overview,,, parted, GNU Parted User Manual}), @command{fdisk} и @command{cfdisk}. Запустите и настройте ваш диск, используя план разметки, который нужен:"
 
 #. type: example
-#: doc/guix.texi:2225
+#: doc/guix.texi:2241
 #, no-wrap
 msgid "cfdisk\n"
 msgstr "cfdisk\n"
 
 #. type: Plain text
-#: doc/guix.texi:2231
+#: doc/guix.texi:2247
 msgid "If your disk uses the GUID Partition Table (GPT) format and you plan to install BIOS-based GRUB (which is the default), make sure a BIOS Boot Partition is available (@pxref{BIOS installation,,, grub, GNU GRUB manual})."
 msgstr "Если ваш диск использует формат GUID Partition Table (GPT), и вы планируете использовать GRUB, работающий с BIOS (что по умолчанию), убедитесь, что раздел BIOS Boot Partition доступен (@pxref{BIOS installation,,, grub, GNU GRUB manual})."
 
 #. type: cindex
-#: doc/guix.texi:2232
+#: doc/guix.texi:2248
 #, no-wrap
 msgid "EFI, installation"
 msgstr "EFI, установка"
 
 #. type: cindex
-#: doc/guix.texi:2233
+#: doc/guix.texi:2249
 #, no-wrap
 msgid "UEFI, installation"
 msgstr "UEFI, установка"
 
 #. type: cindex
-#: doc/guix.texi:2234
+#: doc/guix.texi:2250
 #, no-wrap
 msgid "ESP, EFI system partition"
 msgstr "ESP, EFI разметка системы"
 
 #. type: Plain text
-#: doc/guix.texi:2238
+#: doc/guix.texi:2254
 msgid "If you instead wish to use EFI-based GRUB, a FAT32 @dfn{EFI System Partition} (ESP) is required.  This partition can be mounted at @file{/boot/efi} for instance and must have the @code{esp} flag set.  E.g., for @command{parted}:"
 msgstr "Если вместо этого вы хотите использовать GRUB, работающий с EFI, тогда необходима @dfn{разметка система EFI} FAT32 (ESP). Такая разметка может, например, монтироваться в @file{/boot/efi} и должна иметь флаг @code{esp}. То есть в случае @command{parted}:"
 
 #. type: example
-#: doc/guix.texi:2241
+#: doc/guix.texi:2257
 #, no-wrap
 msgid "parted /dev/sda set 1 esp on\n"
 msgstr "parted /dev/sda set 1 esp on\n"
 
 #. type: vindex
-#: doc/guix.texi:2244 doc/guix.texi:26053
+#: doc/guix.texi:2260 doc/guix.texi:26316
 #, no-wrap
 msgid "grub-bootloader"
 msgstr "grub-bootloader"
 
 #. type: vindex
-#: doc/guix.texi:2245 doc/guix.texi:26047
+#: doc/guix.texi:2261 doc/guix.texi:26310
 #, no-wrap
 msgid "grub-efi-bootloader"
 msgstr "grub-efi-bootloader"
 
 #. type: quotation
-#: doc/guix.texi:2252
+#: doc/guix.texi:2268
 msgid "Unsure whether to use EFI- or BIOS-based GRUB? If the directory @file{/sys/firmware/efi} exists in the installation image, then you should probably perform an EFI installation, using @code{grub-efi-bootloader}.  Otherwise you should use the BIOS-based GRUB, known as @code{grub-bootloader}.  @xref{Bootloader Configuration}, for more info on bootloaders."
 msgstr "Не уверенны, что выбрать: GRUB, взаимодействующий с EFI или BIOS? Если существует директория @file{/sys/firmware/efi} в установочом образе, тогда вам следует использовать установку EFI и @code{grub-efi-bootloader}. В противном случае нужно использовать GRUB, работающий с BIOS, называемый @code{grub-bootloader}. Смотрите @xref{Bootloader Configuration} для большей информации о загрузчиках."
 
 #. type: Plain text
-#: doc/guix.texi:2260
+#: doc/guix.texi:2276
 #, fuzzy
 #| msgid "Once you are done partitioning the target hard disk drive, you have to create a file system on the relevant partition(s)@footnote{Currently Guix System only supports ext4 and btrfs file systems.  In particular, code that reads file system UUIDs and labels only works for these file system types.}.  For the ESP, if you have one and assuming it is @file{/dev/sda1}, run:"
 msgid "Once you are done partitioning the target hard disk drive, you have to create a file system on the relevant partition(s)@footnote{Currently Guix System only supports ext4, btrfs, and JFS file systems.  In particular, code that reads file system UUIDs and labels only works for these file system types.}.  For the ESP, if you have one and assuming it is @file{/dev/sda1}, run:"
 msgstr "Когда разметка целевого диска выполнена, нужно создать файловую систему на соответствующем(-их) разделе(-ах)@footnote{В данный момент система Guix поддерживает только файловые системы ext4 и btrfs. По факту, код, читающий UUID и метки файлвых систем, работает только для этих типов файловых систем.}. В случае ESP, если у вас раздел @file{/dev/sda1}, выполните:"
 
 #. type: example
-#: doc/guix.texi:2263
+#: doc/guix.texi:2279
 #, no-wrap
 msgid "mkfs.fat -F32 /dev/sda1\n"
 msgstr "mkfs.fat -F32 /dev/sda1\n"
 
 #. type: Plain text
-#: doc/guix.texi:2271
+#: doc/guix.texi:2287
 msgid "Preferably, assign file systems a label so that you can easily and reliably refer to them in @code{file-system} declarations (@pxref{File Systems}).  This is typically done using the @code{-L} option of @command{mkfs.ext4} and related commands.  So, assuming the target root partition lives at @file{/dev/sda2}, a file system with the label @code{my-root} can be created with:"
 msgstr "Желательно добавить метки файловых систем, чтобы вы могли ссылаться на них по именам в объявлениях @code{file-system} (@pxref{File Systems}). Обычно это можно сделать опцией @code{-L} в @command{mkfs.ext4}, например. Допустим, раздел root располагается в @file{/dev/sda2}, можно добавить метку @code{my-root} следующим образом:"
 
 #. type: example
-#: doc/guix.texi:2274
+#: doc/guix.texi:2290
 #, no-wrap
 msgid "mkfs.ext4 -L my-root /dev/sda2\n"
 msgstr "mkfs.ext4 -L my-root /dev/sda2\n"
 
 #. type: cindex
-#: doc/guix.texi:2276 doc/guix.texi:11024
+#: doc/guix.texi:2292 doc/guix.texi:11132
 #, no-wrap
 msgid "encrypted disk"
 msgstr "шифрованный диск"
 
 #. type: Plain text
-#: doc/guix.texi:2283
+#: doc/guix.texi:2299
 msgid "If you are instead planning to encrypt the root partition, you can use the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}} for more information.)  Assuming you want to store the root partition on @file{/dev/sda2}, the command sequence would be along these lines:"
 msgstr "Если же вы планируете шифровать раздел root, можно воспользоваться утилитами Cryptsetup/LUKS (смотрите @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}} for more information.) Допустим, если раздел root размещается в @file{/dev/sda2}, необходимо выполнить следующие команды:"
 
 #. type: example
-#: doc/guix.texi:2288
+#: doc/guix.texi:2304
 #, no-wrap
 msgid ""
 "cryptsetup luksFormat /dev/sda2\n"
@@ -6352,28 +6502,28 @@ msgstr ""
 "mkfs.ext4 -L my-root /dev/mapper/my-partition\n"
 
 #. type: Plain text
-#: doc/guix.texi:2293
+#: doc/guix.texi:2309
 msgid "Once that is done, mount the target file system under @file{/mnt} with a command like (again, assuming @code{my-root} is the label of the root file system):"
 msgstr "Когда это сделано, монтируйте целевую файловую систему под @file{/mnt} следующей командой (опять же полагая, что метка раздела root --- @code{my-root}):"
 
 #. type: example
-#: doc/guix.texi:2296
+#: doc/guix.texi:2312
 #, no-wrap
 msgid "mount LABEL=my-root /mnt\n"
 msgstr "mount LABEL=my-root /mnt\n"
 
 #. type: Plain text
-#: doc/guix.texi:2302
+#: doc/guix.texi:2318
 msgid "Also mount any other file systems you would like to use on the target system relative to this path.  If you have opted for @file{/boot/efi} as an EFI mount point for example, mount it at @file{/mnt/boot/efi} now so it is found by @code{guix system init} afterwards."
 msgstr "Также монтируйте любые другие файловые системы внутрь целевой файловой системы. Если например, выбрана точка монтирования EFI @file{/boot/efi}, монтируйте её в @file{/mnt/boot/efi}, так, чтобы она обнаруживалась после запуска @code{guix system init}."
 
 #. type: Plain text
-#: doc/guix.texi:2307
+#: doc/guix.texi:2323
 msgid "Finally, if you plan to use one or more swap partitions (@pxref{Memory Concepts, swap space,, libc, The GNU C Library Reference Manual}), make sure to initialize them with @command{mkswap}.  Assuming you have one swap partition on @file{/dev/sda3}, you would run:"
 msgstr "Наконец, если вы планируете использовать один или более разделов swap (@pxref{Memory Concepts, swap space,, libc, The GNU C Library Reference Manual}), обязательно инициируйте их командой @command{mkswap}. Допустим, если ваш раздел swap размещён в @file{/dev/sda3}, нужно выполнить:"
 
 #. type: example
-#: doc/guix.texi:2311
+#: doc/guix.texi:2327
 #, no-wrap
 msgid ""
 "mkswap /dev/sda3\n"
@@ -6383,12 +6533,12 @@ msgstr ""
 "swapon /dev/sda3\n"
 
 #. type: Plain text
-#: doc/guix.texi:2319
+#: doc/guix.texi:2335
 msgid "Alternatively, you may use a swap file.  For example, assuming that in the new system you want to use the file @file{/swapfile} as a swap file, you would run@footnote{This example will work for many types of file systems (e.g., ext4).  However, for copy-on-write file systems (e.g., btrfs), the required steps may be different.  For details, see the manual pages for @command{mkswap} and @command{swapon}.}:"
 msgstr "Возможно, вместо этого вы используете swap-файл. Например, предположим, вы хотите использовать в новой системе swap-файл в @file{/swapfile}, тогда нужно выполнить@footnote{Этот пример работает для многих типов файловых систем, например, ext4. Однако для файловых систем, использующих механизм копирование при записи (copy-on-write), например, btrfs, необходимы другие шаги. Подробнее смотрите в мануалах для @command{mkswap} и @command{swapon}.}:"
 
 #. type: example
-#: doc/guix.texi:2327
+#: doc/guix.texi:2343
 #, no-wrap
 msgid ""
 "# This is 10 GiB of swap space.  Adjust \"count\" to change the size.\n"
@@ -6406,38 +6556,38 @@ msgstr ""
 "swapon /mnt/swapfile\n"
 
 #. type: Plain text
-#: doc/guix.texi:2332
+#: doc/guix.texi:2348
 msgid "Note that if you have encrypted the root partition and created a swap file in its file system as described above, then the encryption also protects the swap file, just like any other file in that file system."
 msgstr "Заметим, что если вы шифруете раздел root и создаёте swap-файл в его файловой системе, как это описано выше, шифрование также будет защищать swap-файл, как и любой другой файл в этой файловой системе."
 
 #. type: Plain text
-#: doc/guix.texi:2338
+#: doc/guix.texi:2354
 msgid "With the target partitions ready and the target root mounted on @file{/mnt}, we're ready to go.  First, run:"
 msgstr "Когда целевые разделы готовы и раздел root монтирован под @file{/mnt}, всё готово для старта. Сначала запустите:"
 
 #. type: example
-#: doc/guix.texi:2341
+#: doc/guix.texi:2357
 #, no-wrap
 msgid "herd start cow-store /mnt\n"
 msgstr "herd start cow-store /mnt\n"
 
 #. type: Plain text
-#: doc/guix.texi:2348
+#: doc/guix.texi:2364
 msgid "This makes @file{/gnu/store} copy-on-write, such that packages added to it during the installation phase are written to the target disk on @file{/mnt} rather than kept in memory.  This is necessary because the first phase of the @command{guix system init} command (see below) entails downloads or builds to @file{/gnu/store} which, initially, is an in-memory file system."
 msgstr "Это сделает @file{/gnu/store} копируемым при записи (copy-on-write), что заставит систему записывать пакеты, добавляемые в систему на этапе установки, на целевой диск под @file{/mnt}, а не держать их в памяти. Это важно, потому что по команде @command{guix system init} (смотрите ниже) будут скачиваться или собираться пакеты в @file{/gnu/store}, которая изначально находится в файловой системе, загрузженной в память."
 
 #. type: Plain text
-#: doc/guix.texi:2359
+#: doc/guix.texi:2375
 msgid "Next, you have to edit a file and provide the declaration of the operating system to be installed.  To that end, the installation system comes with three text editors.  We recommend GNU nano (@pxref{Top,,, nano, GNU nano Manual}), which supports syntax highlighting and parentheses matching; other editors include GNU Zile (an Emacs clone), and nvi (a clone of the original BSD @command{vi} editor).  We strongly recommend storing that file on the target root file system, say, as @file{/mnt/etc/config.scm}.  Failing to do that, you will have lost your configuration file once you have rebooted into the newly-installed system."
 msgstr "Далее нужно редактировать файл объявления операционной системы, которым будет пользоваться установщик. Для этого при установке системы можно использовать три текстовых редактора. Мы ркомендуем GNU nano (@pxref{Top,,, nano, GNU nano Manual}) --- он поддерживает подсветку синтаксиса и работу со скобками. Другие редакторы: GNU Zile (клон Emacs), nvi (клон исходного редактора BSD @command{vi}). Мы настойчиво рекомендуем сохранять файл конфигураций в целевой файловой системе root, например, как @file{/mnt/etc/config.scm}. Иначе есть возможность потерять конфигурационный файл, когда вы загрузитесь в новую установенную систему."
 
 #. type: Plain text
-#: doc/guix.texi:2366
+#: doc/guix.texi:2382
 msgid "@xref{Using the Configuration System}, for an overview of the configuration file.  The example configurations discussed in that section are available under @file{/etc/configuration} in the installation image.  Thus, to get started with a system configuration providing a graphical display server (a ``desktop'' system), you can run something along these lines:"
 msgstr "Смотрите @xref{Using the Configuration System} для подробностей о конфигурационном файле. Конфигурационный файл для примера доступен под @file{/etc/configuration} установочного образа. Например, чтобы получить систему с графическим сервером (т.е. десктопную систему), можно это сделать примерно так:"
 
 #. type: example
-#: doc/guix.texi:2371
+#: doc/guix.texi:2387
 #, no-wrap
 msgid ""
 "# mkdir /mnt/etc\n"
@@ -6449,53 +6599,53 @@ msgstr ""
 "# nano /mnt/etc/config.scm\n"
 
 #. type: Plain text
-#: doc/guix.texi:2375
+#: doc/guix.texi:2391
 msgid "You should pay attention to what your configuration file contains, and in particular:"
 msgstr "Нужно уделить внимание содержимому конфигурационного файла, в частности:"
 
 #. type: itemize
-#: doc/guix.texi:2386
+#: doc/guix.texi:2402
 msgid "Make sure the @code{bootloader-configuration} form refers to the target you want to install GRUB on.  It should mention @code{grub-bootloader} if you are installing GRUB in the legacy way, or @code{grub-efi-bootloader} for newer UEFI systems.  For legacy systems, the @code{target} field names a device, like @code{/dev/sda}; for UEFI systems it names a path to a mounted EFI partition, like @code{/boot/efi}; do make sure the path is currently mounted and a @code{file-system} entry is specified in your configuration."
 msgstr "Убедитесь, что @code{bootloader-configuration} указывает на тот раздел, в который вы хотите установить GRUB. Он должен содержать @code{grub-bootloader}, если вы используете legacy-GRUB, или @code{grub-efi-bootloader} для новых систем UEFI. Для систем legacy поле @code{target} содержит имя устройства, например, @code{/dev/sda}; для систем UEFI он указывает имя раздела EFI, например, @code{/boot/efi}. Так что обязательно проверьте, чтобы нужный путь был монтирован, и запись @code{file-system} содержала нужную уонфигурацию."
 
 #. type: itemize
-#: doc/guix.texi:2392
+#: doc/guix.texi:2408
 msgid "Be sure that your file system labels match the value of their respective @code{device} fields in your @code{file-system} configuration, assuming your @code{file-system} configuration uses the @code{file-system-label} procedure in its @code{device} field."
 msgstr "Убедитесь, чтобы в полях @code{device} были указаны метки ваших файловых систем внутри конфигурации @code{file-system}, если конечно, конфигурация @code{file-system} использует процедуру @code{file-system-label} в поле @code{device}."
 
 #. type: itemize
-#: doc/guix.texi:2396
+#: doc/guix.texi:2412
 msgid "If there are encrypted or RAID partitions, make sure to add a @code{mapped-devices} field to describe them (@pxref{Mapped Devices})."
 msgstr "При наличии шифрованных разделов RAID, обязательно добавьте поле @code{mapped-devices}, чтобы описать их (@pxref{Mapped Devices})."
 
 #. type: Plain text
-#: doc/guix.texi:2401
+#: doc/guix.texi:2417
 msgid "Once you are done preparing the configuration file, the new system must be initialized (remember that the target root file system is mounted under @file{/mnt}):"
 msgstr "Когда вы подготовили конфигурационный файл, нужно инициализировать новую систему (помните, что целевой раздел root монтирован под @file{/mnt}):"
 
 #. type: example
-#: doc/guix.texi:2404
+#: doc/guix.texi:2420
 #, no-wrap
 msgid "guix system init /mnt/etc/config.scm /mnt\n"
 msgstr "guix system init /mnt/etc/config.scm /mnt\n"
 
 #. type: Plain text
-#: doc/guix.texi:2411
+#: doc/guix.texi:2427
 msgid "This copies all the necessary files and installs GRUB on @file{/dev/sdX}, unless you pass the @option{--no-bootloader} option.  For more information, @pxref{Invoking guix system}.  This command may trigger downloads or builds of missing packages, which can take some time."
 msgstr "Это копирует все нужные файлы и устанавливает GRUB в @file{/dev/sdX}, если конечно, вы не задали опцию @option{--no-bootloader}. Подробнее - @pxref{Invoking guix system}. Эта команда может вызывать скачивание или сборку отсутствующих пакетов, что может занять время."
 
 #. type: Plain text
-#: doc/guix.texi:2419
+#: doc/guix.texi:2435
 msgid "Once that command has completed---and hopefully succeeded!---you can run @command{reboot} and boot into the new system.  The @code{root} password in the new system is initially empty; other users' passwords need to be initialized by running the @command{passwd} command as @code{root}, unless your configuration specifies otherwise (@pxref{user-account-password, user account passwords}).  @xref{After System Installation}, for what's next!"
 msgstr "Когда эта команда завершена, надеемся, успешно, можно запустить @command{reboot} и загрузиться в новую систему.  Пароль @code{root} в новой системе изначально пустой; пароли других пользователей должны быть заданы командой @command{passwd} от @code{root}, если конечно, ваша конфиурация не содержит указания (@pxref{user-account-password, user account passwords}). Смотрите @xref{After System Installation}, чтобы узнать, что дальше."
 
 #. type: Plain text
-#: doc/guix.texi:2426
+#: doc/guix.texi:2442
 msgid "Success, you've now booted into Guix System! From then on, you can update the system whenever you want by running, say:"
 msgstr "Замечательно! Теперь вы загрузились в систему Guix! Теперь можно обновить систему, когда у вас будет на это время, запустив, например:"
 
 #. type: example
-#: doc/guix.texi:2430
+#: doc/guix.texi:2446
 #, no-wrap
 msgid ""
 "guix pull\n"
@@ -6505,91 +6655,96 @@ msgstr ""
 "sudo guix system reconfigure /etc/config.scm\n"
 
 #. type: Plain text
-#: doc/guix.texi:2436
+#: doc/guix.texi:2452
 msgid "This builds a new system generation with the latest packages and services (@pxref{Invoking guix system}).  We recommend doing that regularly so that your system includes the latest security updates (@pxref{Security Updates})."
 msgstr "Это соберёт поколение (generation) системы с последними пакетами и сервисами (@pxref{Invoking guix system}). Мы рекомендуем делать это регулярно, чтобы ваша система содержала обновления безопасности (@pxref{Security Updates})."
 
 #. type: cindex
-#: doc/guix.texi:2439
+#: doc/guix.texi:2455
 #, no-wrap
 msgid "sudo vs. @command{guix pull}"
 msgstr "sudo vs. @command{guix pull}"
 
 #. type: quotation
-#: doc/guix.texi:2443
+#: doc/guix.texi:2459
 msgid "Note that @command{sudo guix} runs your user's @command{guix} command and @emph{not} root's, because @command{sudo} leaves @code{PATH} unchanged.  To explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}."
 msgstr "Отметим, что @command{sudo guix} запускает команду @command{guix} от вашего пользователя, но @emph{не} от root, потому что @command{sudo} не меняет @code{PATH}. Чтобы вместо этого запустить @command{guix} от root, напечатайте @command{sudo -i guix @dots{}}."
 
+#. type: quotation
+#: doc/guix.texi:2464
+msgid "The difference matters here, because @command{guix pull} updates the @command{guix} command and package definitions only for the user it is ran as.  This means that if you choose to use @command{guix system reconfigure} in root's login shell, you'll need to @command{guix pull} separately."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:2447
+#: doc/guix.texi:2468
 msgid "Join us on @code{#guix} on the Freenode IRC network or on @email{guix-devel@@gnu.org} to share your experience!"
 msgstr "Присоединяйтесь к нашему IRC-каналу @code{#guix} в сети Freenode или пишите на @email{guix-devel@@gnu.org}, чтобы поделиться опытом!"
 
 #. type: section
-#: doc/guix.texi:2450
+#: doc/guix.texi:2471
 #, no-wrap
 msgid "Installing Guix in a Virtual Machine"
 msgstr "Установка Guix на виртуальную машину (VM)"
 
 #. type: cindex
-#: doc/guix.texi:2452
+#: doc/guix.texi:2473
 #, no-wrap
 msgid "virtual machine, Guix System installation"
 msgstr "виртуальная машина, установка системы Guix"
 
 #. type: cindex
-#: doc/guix.texi:2453
+#: doc/guix.texi:2474
 #, no-wrap
 msgid "virtual private server (VPS)"
 msgstr "виртуальный приватный сервер (VPS)"
 
 #. type: cindex
-#: doc/guix.texi:2454
+#: doc/guix.texi:2475
 #, no-wrap
 msgid "VPS (virtual private server)"
 msgstr "VPS (virtual private server)"
 
 #. type: Plain text
-#: doc/guix.texi:2458
+#: doc/guix.texi:2479
 msgid "If you'd like to install Guix System in a virtual machine (VM) or on a virtual private server (VPS) rather than on your beloved machine, this section is for you."
 msgstr "Если вы хотите установить систему Guix на виртуальную машину (VM) или на виртуальный приватный сервер (VPS) вместо вашей любимой машины, этот раздел для вас."
 
 #. type: Plain text
-#: doc/guix.texi:2461
+#: doc/guix.texi:2482
 #, fuzzy
 #| msgid "To boot a @uref{http://qemu.org/,QEMU} VM for installing Guix System in a disk image, follow these steps:"
 msgid "To boot a @uref{https://qemu.org/,QEMU} VM for installing Guix System in a disk image, follow these steps:"
 msgstr "Чтобы загрузить Guix в @uref{http://qemu.org/,QEMU} VM и установить образ, выполните шаги:"
 
 #. type: enumerate
-#: doc/guix.texi:2466
+#: doc/guix.texi:2487
 msgid "First, retrieve and decompress the Guix system installation image as described previously (@pxref{USB Stick and DVD Installation})."
 msgstr "Во-первых, найдите и распакуйте установочный образ системы Guix, как описано ранее (@pxref{USB Stick and DVD Installation})."
 
 #. type: enumerate
-#: doc/guix.texi:2470
+#: doc/guix.texi:2491
 msgid "Create a disk image that will hold the installed system.  To make a qcow2-formatted disk image, use the @command{qemu-img} command:"
 msgstr "Создайте образ диска, который будет содержать установленную систему. Чтобы создать образ диска qcow2, используйте команду @command{qemu-img}:"
 
 #. type: example
-#: doc/guix.texi:2473
+#: doc/guix.texi:2494
 #, fuzzy, no-wrap
 #| msgid "qemu-img create -f qcow2 guixsd.img 50G\n"
 msgid "qemu-img create -f qcow2 guix-system.img 50G\n"
 msgstr "qemu-img create -f qcow2 guixsd.img 50G\n"
 
 #. type: enumerate
-#: doc/guix.texi:2477
+#: doc/guix.texi:2498
 msgid "The resulting file will be much smaller than 50 GB (typically less than 1 MB), but it will grow as the virtualized storage device is filled up."
 msgstr "Результирующий файл будет намного меньше 50Гб (обычно менее 1Мб), но он будет увеличиваться с заполнение виртуального устройства."
 
 #. type: enumerate
-#: doc/guix.texi:2480
+#: doc/guix.texi:2501
 msgid "Boot the USB installation image in an VM:"
 msgstr "Загрузите установочный образ USB в VM:"
 
 #. type: example
-#: doc/guix.texi:2486
+#: doc/guix.texi:2507
 #, fuzzy, no-wrap
 #| msgid ""
 #| "qemu-system-x86_64 -m 1024 -smp 1 \\\n"
@@ -6608,35 +6763,35 @@ msgstr ""
 "  -drive file=guixsd.img\n"
 
 #. type: enumerate
-#: doc/guix.texi:2490
+#: doc/guix.texi:2511
 msgid "@code{-enable-kvm} is optional, but significantly improves performance, @pxref{Running Guix in a VM}."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:2494
+#: doc/guix.texi:2515
 msgid "You're now root in the VM, proceed with the installation process.  @xref{Preparing for Installation}, and follow the instructions."
 msgstr "Теперь вы в корне VM, проделайте процесс установки @xref{Preparing for Installation} и последующие инструкции."
 
 #. type: Plain text
-#: doc/guix.texi:2499
+#: doc/guix.texi:2520
 #, fuzzy
 #| msgid "Once installation is complete, you can boot the system that's on your @file{guixsd.img} image.  @xref{Running Guix in a VM}, for how to do that."
 msgid "Once installation is complete, you can boot the system that's on your @file{guix-system.img} image.  @xref{Running Guix in a VM}, for how to do that."
 msgstr "Когда установка завершена, можно загрузиться в систему, которая расположена в образе @file{guixsd.img}. Смотрите @xref{Running Guix in a VM}, чтобы узнать, как это сделать."
 
 #. type: cindex
-#: doc/guix.texi:2503
+#: doc/guix.texi:2524
 #, no-wrap
 msgid "installation image"
 msgstr "установочный образ"
 
 #. type: Plain text
-#: doc/guix.texi:2506
+#: doc/guix.texi:2527
 msgid "The installation image described above was built using the @command{guix system} command, specifically:"
 msgstr "Установочный образ, описанный выше, собран командой @command{guix system}, а именно:"
 
 #. type: example
-#: doc/guix.texi:2510
+#: doc/guix.texi:2531
 #, no-wrap
 msgid ""
 "guix system disk-image --file-system-type=iso9660 \\\n"
@@ -6646,271 +6801,271 @@ msgstr ""
 "  gnu/system/install.scm\n"
 
 #. type: Plain text
-#: doc/guix.texi:2515
+#: doc/guix.texi:2536
 msgid "Have a look at @file{gnu/system/install.scm} in the source tree, and see also @ref{Invoking guix system} for more information about the installation image."
 msgstr "Нужно просмотреть @file{gnu/system/install.scm} в дереве исходников, а также @ref{Invoking guix system}, чтобы получить больше информации об установочном образе."
 
 #. type: section
-#: doc/guix.texi:2516
+#: doc/guix.texi:2537
 #, no-wrap
 msgid "Building the Installation Image for ARM Boards"
 msgstr "Сбрка и установка образа для плат ARM"
 
 #. type: Plain text
-#: doc/guix.texi:2520
+#: doc/guix.texi:2541
 #, fuzzy
 #| msgid "Many ARM boards require a specific variant of the @uref{http://www.denx.de/wiki/U-Boot/, U-Boot} bootloader."
 msgid "Many ARM boards require a specific variant of the @uref{https://www.denx.de/wiki/U-Boot/, U-Boot} bootloader."
 msgstr "Многие платы ARM требуют специфический вариант загрузчика  @uref{http://www.denx.de/wiki/U-Boot/, U-Boot}."
 
 #. type: Plain text
-#: doc/guix.texi:2524
+#: doc/guix.texi:2545
 msgid "If you build a disk image and the bootloader is not available otherwise (on another boot drive etc), it's advisable to build an image that includes the bootloader, specifically:"
 msgstr "Если вы собираете образ диска, а загрузчик не доступен (на другом устройстве загрузке и т.п.), советуем собрать образ, который включает загрузчик, то есть так:"
 
 #. type: example
-#: doc/guix.texi:2527
+#: doc/guix.texi:2548
 #, no-wrap
 msgid "guix system disk-image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) \"A20-OLinuXino-Lime2\")'\n"
 msgstr "guix system disk-image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) \"A20-OLinuXino-Lime2\")'\n"
 
 #. type: Plain text
-#: doc/guix.texi:2531
+#: doc/guix.texi:2552
 msgid "@code{A20-OLinuXino-Lime2} is the name of the board.  If you specify an invalid board, a list of possible boards will be printed."
 msgstr "@code{A20-OLinuXino-Lime2} --- это имя материнской платы. Если вы обозначите недействительную плату, будет выведен список возможных плат."
 
 #. type: cindex
-#: doc/guix.texi:2536
+#: doc/guix.texi:2557
 #, no-wrap
 msgid "packages"
 msgstr "пакеты"
 
 #. type: Plain text
-#: doc/guix.texi:2541
+#: doc/guix.texi:2562
 msgid "The purpose of GNU Guix is to allow users to easily install, upgrade, and remove software packages, without having to know about their build procedures or dependencies.  Guix also goes beyond this obvious set of features."
 msgstr "Целью GNU Guix является предоставление пользователям возможности легко устанавливать, обновлять и удалять пакеты программного обеспечения, без необходимости изучения процедур их сборки и без необходимости разрешения зависимостей. Также Guix имеет следующие обязательные особенности."
 
 #. type: Plain text
-#: doc/guix.texi:2549
+#: doc/guix.texi:2570
 msgid "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 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):"
 msgstr ""
 "Этот раздел описывает основные особенности Guix и предоставляемые им инструменты управления пакетами. Кроме интерфейса командной строки, который описан ниже (@pxref{Invoking guix package, @code{guix package}}), можно также использовать интерфейс Emacs-Guix (@pxref{Top,,, emacs-guix, The Emacs-\"\n"
 "\"Guix Reference Manual}), если установить пакет @code{emacs-guix} (выполните команду @kbd{M-x guix-help}, чтобы начать работу с ним):"
 
 #. type: example
-#: doc/guix.texi:2552
+#: doc/guix.texi:2573
 #, no-wrap
 msgid "guix install emacs-guix\n"
 msgstr "guix install emacs-guix\n"
 
 #. type: Plain text
-#: doc/guix.texi:2574
+#: doc/guix.texi:2595
 msgid "When using Guix, each package ends up in the @dfn{package store}, in its own directory---something that resembles @file{/gnu/store/xxx-package-1.2}, where @code{xxx} is a base32 string."
 msgstr "При использовании Guix каждый пакет после установки размещается в @dfn{package store}, в собственной директории, например, @file{/gnu/store/xxx-package-1.2}, где @code{xxx} - это строка base32."
 
 #. type: Plain text
-#: doc/guix.texi:2579
+#: doc/guix.texi:2600
 msgid "Instead of referring to these directories, users have their own @dfn{profile}, which points to the packages that they actually want to use.  These profiles are stored within each user's home directory, at @code{$HOME/.guix-profile}."
 msgstr "Вместо того, чтобы ссылаться на эти директории, пользователям нужно обращаться к их @dfn{профилям}, профиль указывает на пакеты, которые они хотят использовать. Эти профили хранятся в домашней директории каждого пользователя в @code{$HOME/.guix-profile}."
 
 #. type: Plain text
-#: doc/guix.texi:2587
+#: doc/guix.texi:2608
 msgid "For example, @code{alice} installs GCC 4.7.2.  As a result, @file{/home/alice/.guix-profile/bin/gcc} points to @file{/gnu/store/@dots{}-gcc-4.7.2/bin/gcc}.  Now, on the same machine, @code{bob} had already installed GCC 4.8.0.  The profile of @code{bob} simply continues to point to @file{/gnu/store/@dots{}-gcc-4.8.0/bin/gcc}---i.e., both versions of GCC coexist on the same system without any interference."
 msgstr "Например,  @code{alice} устанавливает GCC 4.7.2. В результате @file{/home/alice/.guix-profile/bin/gcc} указывает на @file{/gnu/store/@dots{}-gcc-4.7.2/bin/gcc}. Допустим, на той же машине @code{bob} установил GCC 4.8.0. Профиль пользователя @code{bob} просто указывает на @file{/gnu/store/@dots{}-gcc-4.8.0/bin/gcc}. То есть обе версии GCC присутствуют в одной системе без помех."
 
 #. type: Plain text
-#: doc/guix.texi:2591
+#: doc/guix.texi:2612
 msgid "The @command{guix package} command is the central tool to manage packages (@pxref{Invoking guix package}).  It operates on the per-user profiles, and can be used @emph{with normal user privileges}."
 msgstr "Команда @command{guix package} --- главный инструмент для управления пакетами (@pxref{Invoking guix package}). Она работает с профилями пользователей, которые имеют @emph{права обычных пользователей}."
 
 #. type: cindex
-#: doc/guix.texi:2592 doc/guix.texi:2671
+#: doc/guix.texi:2613 doc/guix.texi:2692
 #, no-wrap
 msgid "transactions"
 msgstr "транзакции"
 
 #. type: Plain text
-#: doc/guix.texi:2599
+#: doc/guix.texi:2620
 msgid "The command provides the obvious install, remove, and upgrade operations.  Each invocation is actually a @emph{transaction}: either the specified operation succeeds, or nothing happens.  Thus, if the @command{guix package} process is terminated during the transaction, or if a power outage occurs during the transaction, then the user's profile remains in its previous state, and remains usable."
 msgstr "Команда предоставляет обязательные операции установки, удаления и обновления. Каждый вызов представляет собой @emph{транзакцию}, независимо от того, выполнены успешно заданные операции, или ничего не произошло. Так, если процесс @command{guix package} завершился во время транзакции, или произошёл сбой питания во время транзакции, тогда профиль пользователя остаётся в исходном состоянии, готовом к использованию."
 
 #. type: Plain text
-#: doc/guix.texi:2607
+#: doc/guix.texi:2628
 msgid "In addition, any package transaction may be @emph{rolled back}.  So, if, for example, an upgrade installs a new version of a package that turns out to have a serious bug, users may roll back to the previous instance of their profile, which was known to work well.  Similarly, the global system configuration on Guix is subject to transactional upgrades and roll-back (@pxref{Using the Configuration System})."
 msgstr "В дополнение, каждую транзакцию, которая работает с пакетами, можно @emph{откатить}. Так если, например, обновление устанавливает новую версию пакета, которая имеет серьёзный баг, пользователи могут откатиться до предыдущей инстанции своего профиля, который работал нормально. Точно так же, глобальные настройки системы Guix являются объектом транзакционных обновлений и откатов (@pxref{Using the Configuration System})."
 
 #. type: Plain text
-#: doc/guix.texi:2614
+#: doc/guix.texi:2635
 msgid "All packages in the package store may be @emph{garbage-collected}.  Guix can determine which packages are still referenced by user profiles, and remove those that are provably no longer referenced (@pxref{Invoking guix gc}).  Users may also explicitly remove old generations of their profile so that the packages they refer to can be collected."
 msgstr "Все пакеты на складе могут быть @emph{собраны как мусор}. Guix может определить, какие пакеты всё ещё используются профилями пользователей, и удалить те, которые однозначно больше не используются  (@pxref{Invoking guix gc}). Также пользователи могут явно удалить старые поколения (generations) их профилей, поэтому пакеты, на которые ссылались старые профили, могут быть удалены."
 
 #. type: cindex
-#: doc/guix.texi:2615 doc/guix.texi:4371
+#: doc/guix.texi:2636 doc/guix.texi:4392
 #, no-wrap
 msgid "reproducibility"
 msgstr "воспроизводимость"
 
 #. type: Plain text
-#: doc/guix.texi:2627
+#: doc/guix.texi:2648
 msgid "Guix takes a @dfn{purely functional} approach to package management, as described in the introduction (@pxref{Introduction}).  Each @file{/gnu/store} package directory name contains a hash of all the inputs that were used to build that package---compiler, libraries, build scripts, etc.  This direct correspondence allows users to make sure a given package installation matches the current state of their distribution.  It also helps maximize @dfn{build reproducibility}: thanks to the isolated build environments that are used, a given build is likely to yield bit-identical files when performed on different machines (@pxref{Invoking guix-daemon, container})."
 msgstr "Guix реализует @dfn{чисто функциональный} подход к управлению пакетами, как описано во введении (@pxref{Introduction}). В @file{/gnu/store} имя директории каждого пакета содержит хеш всех входных данных, которые использовались при сборке пакета: компилятор, библиотеки, скрипты сборки и т.д. Это прямое соответствие позволяет пользователям убедиться, что данная установка пакета соответствует текущему состоянию дистрибутива. Также это помогает улучшить @dfn{воспроизводимость сборки}: благодаря изолированному окружению сборки, которая используется при установке пакета, результат сборки содержит точно такие же файлы на разных машинах (@pxref{Invoking guix-daemon, container})."
 
 #. type: Plain text
-#: doc/guix.texi:2638
+#: doc/guix.texi:2659
 msgid "This foundation allows Guix to support @dfn{transparent binary/source deployment}.  When a pre-built binary for a @file{/gnu/store} item is available from an external source---a @dfn{substitute}, Guix just downloads it and unpacks it; otherwise, it builds the package from source, locally (@pxref{Substitutes}).  Because build results are usually bit-for-bit reproducible, users do not have to trust servers that provide substitutes: they can force a local build and @emph{challenge} providers (@pxref{Invoking guix challenge})."
 msgstr "Эта концепция позволяет Guix поддерживать @dfn{прозрачное внедрение бинарников/исходников}. Когда доступен элемент @file{/gnu/store}, собранный заранее на внешнем источнике, то есть готова @dfn{подстановка}, Guix просто скачивает и распаковывает его. В противном случае он собирает пакет из исходников на локальной машине (@pxref{Substitutes}). Так как результаты сборки обычно воспроизводимы бит-к-биту, пользователи не должны доверять серверам, которые поставляют подстановки --- они могут целенаправленно запросить локальную сборку и @emph{не пользоваться} серверами подстановки (@pxref{Invoking guix challenge})."
 
 #. type: Plain text
-#: doc/guix.texi:2644
+#: doc/guix.texi:2665
 msgid "Control over the build environment is a feature that is also useful for developers.  The @command{guix environment} command allows developers of a package to quickly set up the right development environment for their package, without having to manually install the dependencies of the package into their profile (@pxref{Invoking guix environment})."
 msgstr "Управление окружением сборки --- функция, которая полезна для разработчиков. Команда @command{guix environment} позволяет разработчикам пакетов быстро установить требуемое окружение разработки без необходимости устанавливать в свой профиль зависимости пакета вручную (@pxref{Invoking guix environment})."
 
 #. type: cindex
-#: doc/guix.texi:2645
+#: doc/guix.texi:2666
 #, no-wrap
 msgid "replication, of software environments"
 msgstr "повторение, окружения программного обеспечения"
 
 #. type: cindex
-#: doc/guix.texi:2646
+#: doc/guix.texi:2667
 #, no-wrap
 msgid "provenance tracking, of software artifacts"
 msgstr "трекинг источника, артефакты программного обеспечения"
 
 #. type: Plain text
-#: doc/guix.texi:2653
+#: doc/guix.texi:2674
 msgid "All of Guix and its package definitions is version-controlled, and @command{guix pull} allows you to ``travel in time'' on the history of Guix itself (@pxref{Invoking guix pull}).  This makes it possible to replicate a Guix instance on a different machine or at a later point in time, which in turn allows you to @emph{replicate complete software environments}, while retaining precise @dfn{provenance tracking} of the software."
 msgstr "Guix и его определения пакетов подчняются контролю версиями, и @command{guix pull} позволяет \"путешествовать во времени\" по истории Guix (@pxref{Invoking guix pull}). Это позволяет повторять инстанцию Guix на разных машинах или по прошествию времени, что в свою очередь позволяет вам @emph{повторять полностью программное окружение} из достпуных @dfn{трекеров источников} программного обеспечения."
 
 #. type: section
-#: doc/guix.texi:2655
+#: doc/guix.texi:2676
 #, no-wrap
 msgid "Invoking @command{guix package}"
 msgstr "Вызов @command{guix package}"
 
 #. type: cindex
-#: doc/guix.texi:2657
+#: doc/guix.texi:2678
 #, no-wrap
 msgid "installing packages"
 msgstr "установка пакетов"
 
 #. type: cindex
-#: doc/guix.texi:2658
+#: doc/guix.texi:2679
 #, no-wrap
 msgid "removing packages"
 msgstr "удаление пакетов"
 
 #. type: cindex
-#: doc/guix.texi:2659
+#: doc/guix.texi:2680
 #, no-wrap
 msgid "package installation"
 msgstr "установка пакета"
 
 #. type: cindex
-#: doc/guix.texi:2660
+#: doc/guix.texi:2681
 #, no-wrap
 msgid "package removal"
 msgstr "удаление пакета"
 
 #. type: Plain text
-#: doc/guix.texi:2666
+#: doc/guix.texi:2687
 msgid "The @command{guix package} command is the tool that allows users to install, upgrade, and remove packages, as well as rolling back to previous configurations.  It operates only on the user's own profile, and works with normal user privileges (@pxref{Features}).  Its syntax is:"
 msgstr "Команда @command{guix package} --- инструмент, который позволяет пользователям устанавливать, обновлять и удалять пакеты, а также откатываться до предыдущих конфигураций (@pxref{Features}). Его синтаксис:"
 
 #. type: example
-#: doc/guix.texi:2669
+#: doc/guix.texi:2690
 #, no-wrap
 msgid "guix package @var{options}\n"
 msgstr "guix package @var{options}\n"
 
 #. type: Plain text
-#: doc/guix.texi:2676
+#: doc/guix.texi:2697
 msgid "Primarily, @var{options} specifies the operations to be performed during the transaction.  Upon completion, a new profile is created, but previous @dfn{generations} of the profile remain available, should the user want to roll back."
 msgstr "В первую очередь, @var{options} (опции) задают операции, которые нужно выполнить в транзакции. По завершении создаётся новый профиль, а предыдущие @dfn{поколения} (generations) профиля остаются доступными, если пользователь решит откатиться."
 
 #. type: Plain text
-#: doc/guix.texi:2679
+#: doc/guix.texi:2700
 msgid "For example, to remove @code{lua} and install @code{guile} and @code{guile-cairo} in a single transaction:"
 msgstr "Например, чтобы удалить @code{lua} и устанвоить @code{guile} и @code{guile-cairo} в одной транзакции, напечатайте:"
 
 #. type: example
-#: doc/guix.texi:2682
+#: doc/guix.texi:2703
 #, no-wrap
 msgid "guix package -r lua -i guile guile-cairo\n"
 msgstr "guix package -r lua -i guile guile-cairo\n"
 
 #. type: cindex
-#: doc/guix.texi:2684
+#: doc/guix.texi:2705
 #, no-wrap
 msgid "aliases, for @command{guix package}"
 msgstr "синонимы, для @command{guix package}"
 
 #. type: Plain text
-#: doc/guix.texi:2686
+#: doc/guix.texi:2707
 msgid "For your convenience, we also provide the following aliases:"
 msgstr "Для вашего удобства мы также предоставляем следующие синонимы:"
 
 #. type: itemize
-#: doc/guix.texi:2690
+#: doc/guix.texi:2711
 msgid "@command{guix search} is an alias for @command{guix package -s},"
 msgstr "@command{guix search} - синоним @command{guix package -s},"
 
 #. type: itemize
-#: doc/guix.texi:2692
+#: doc/guix.texi:2713
 msgid "@command{guix install} is an alias for @command{guix package -i},"
 msgstr "@command{guix install} - синоним @command{guix package -i},"
 
 #. type: itemize
-#: doc/guix.texi:2694
+#: doc/guix.texi:2715
 msgid "@command{guix remove} is an alias for @command{guix package -r},"
 msgstr "@command{guix remove} - синоним @command{guix package -r},"
 
 #. type: itemize
-#: doc/guix.texi:2696
+#: doc/guix.texi:2717
 msgid "@command{guix upgrade} is an alias for @command{guix package -u},"
 msgstr "@command{guix upgrade} — это синоним @command{guix package -u},"
 
 #. type: itemize
-#: doc/guix.texi:2698
+#: doc/guix.texi:2719
 #, fuzzy
 #| msgid "@command{guix search} is an alias for @command{guix package -s},"
 msgid "and @command{guix show} is an alias for @command{guix package --show=}."
 msgstr "@command{guix search} - синоним @command{guix package -s},"
 
 #. type: Plain text
-#: doc/guix.texi:2703
+#: doc/guix.texi:2724
 msgid "These aliases are less expressive than @command{guix package} and provide fewer options, so in some cases you'll probably want to use @command{guix package} directly."
 msgstr "Эти синонимы не такие мощные, как @command{guix package}, и предоставляют меньше опций, так что в некоторых случаях вам скорее нужно пользоваться непосредственно @command{guix package}."
 
 #. type: Plain text
-#: doc/guix.texi:2708
+#: doc/guix.texi:2729
 msgid "@command{guix package} also supports a @dfn{declarative approach} whereby the user specifies the exact set of packages to be available and passes it @i{via} the @option{--manifest} option (@pxref{profile-manifest, @option{--manifest}})."
 msgstr "@command{guix package} также поддерживает @dfn{декларативный подход}, с помощью которого пользователь зааёт точный набор пакетов, которые должны быть доступны, и передаёт его @i{в опции} @option{--manifest} (@pxref{profile-manifest, @option{--manifest}})."
 
 #. type: cindex
-#: doc/guix.texi:2709
+#: doc/guix.texi:2730
 #, no-wrap
 msgid "profile"
 msgstr "профиль"
 
 #. type: Plain text
-#: doc/guix.texi:2715
+#: doc/guix.texi:2736
 msgid "For each user, a symlink to the user's default profile is automatically created in @file{$HOME/.guix-profile}.  This symlink always points to the current generation of the user's default profile.  Thus, users can add @file{$HOME/.guix-profile/bin} to their @code{PATH} environment variable, and so on."
 msgstr "Для каждого пользователя автоматически создаётся символическая ссылка на профиль по умолчанию, она располагается в файле @file{$HOME/.guix-profile}. Эта ссылка всегда указывает на текущее поколение пользовательского профиля по умолчанию. Так пользователи могут добавить @file{$HOME/.guix-profile/bin} в свою переменную окружения @code{PATH} и прочее."
 
 #. type: cindex
-#: doc/guix.texi:2715 doc/guix.texi:2913
+#: doc/guix.texi:2736 doc/guix.texi:2934
 #, no-wrap
 msgid "search paths"
 msgstr "пути поиска"
 
 #. type: Plain text
-#: doc/guix.texi:2720
+#: doc/guix.texi:2741
 msgid "If you are not using Guix System, consider adding the following lines to your @file{~/.bash_profile} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}) so that newly-spawned shells get all the right environment variable definitions:"
 msgstr "Если вы не используете систему Guix, предполагается добавление следующих строк в ваш @file{~/.bash_profile} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}), чтобы порождаемые оболочки получили все необходимые определения переменных окружения:"
 
 #. type: example
-#: doc/guix.texi:2724
+#: doc/guix.texi:2745
 #, no-wrap
 msgid ""
 "GUIX_PROFILE=\"$HOME/.guix-profile\" ; \\\n"
@@ -6920,249 +7075,249 @@ msgstr ""
 "source \"$HOME/.guix-profile/etc/profile\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:2735
+#: doc/guix.texi:2756
 msgid "In a multi-user setup, user profiles are stored in a place registered as a @dfn{garbage-collector root}, which @file{$HOME/.guix-profile} points to (@pxref{Invoking guix gc}).  That directory is normally @code{@var{localstatedir}/guix/profiles/per-user/@var{user}}, where @var{localstatedir} is the value passed to @code{configure} as @code{--localstatedir}, and @var{user} is the user name.  The @file{per-user} directory is created when @command{guix-daemon} is started, and the @var{user} sub-directory is created by @command{guix package}."
 msgstr "В случае многопользовательской установки, профили пользователей сохраняются в месте, которое зарегстрировано как @dfn{garbage-collector root}, которое указывет на @file{$HOME/.guix-profile} (@pxref{Invoking guix gc}). Эта директория обычно ссылается на @code{@var{localstatedir}/guix/profiles/per-user/@var{user}}, где @var{localstatedir} --- значение, переданное скрипту @code{configure} опцией @code{--localstatedir}, а @var{user} --- имя пользователя. Директория @file{per-user} создаёся, когда запускается @command{guix-daemon}, а поддиректория @var{user} создаётся @command{guix package}."
 
 #. type: Plain text
-#: doc/guix.texi:2737
+#: doc/guix.texi:2758
 msgid "The @var{options} can be among the following:"
 msgstr "Опции @var{options} могут быть следующими:"
 
 #. type: item
-#: doc/guix.texi:2740
+#: doc/guix.texi:2761
 #, no-wrap
 msgid "--install=@var{package} @dots{}"
 msgstr "--install=@var{package} @dots{}"
 
 #. type: itemx
-#: doc/guix.texi:2741
+#: doc/guix.texi:2762
 #, no-wrap
 msgid "-i @var{package} @dots{}"
 msgstr "-i @var{package} @dots{}"
 
 #. type: table
-#: doc/guix.texi:2743
+#: doc/guix.texi:2764
 msgid "Install the specified @var{package}s."
 msgstr "Установить заданный пакет."
 
 #. type: table
-#: doc/guix.texi:2748
+#: doc/guix.texi:2769
 msgid "Each @var{package} may specify either a simple package name, such as @code{guile}, or a package name followed by an at-sign and version number, such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter case, the newest version prefixed by @code{1.8} is selected.)"
 msgstr "Каждый @var{package} может задавать простое имя пакета, как например, @code{guile}, или имя пакета с указанием номера версии, например, @code{guile@@1.8.8} или просто @code{guile@@1.8} (в последнем случае выбирается самая новая версия с префиксом @code{1.8}.)"
 
 #. type: table
-#: doc/guix.texi:2756
+#: doc/guix.texi:2777
 msgid "If no version number is specified, the newest available version will be selected.  In addition, @var{package} may contain a colon, followed by the name of one of the outputs of the package, as in @code{gcc:doc} or @code{binutils@@2.22:lib} (@pxref{Packages with Multiple Outputs}).  Packages with a corresponding name (and optionally version) are searched for among the GNU distribution modules (@pxref{Package Modules})."
 msgstr "Если не задан номер версии, тогда будет выбрана самая новая доступная версия. Добавм, что @var{package} может содержать двоеточие и одно имя выходных данных пакета, как @code{gcc:doc} или @code{binutils@@2.22:lib} (@pxref{Packages with Multiple Outputs}). Пакеты с соответствующим именем (и опционально, версией) будут отыскиваться в модулях дистрибутива GNU (@pxref{Package Modules})."
 
 #. type: cindex
-#: doc/guix.texi:2757
+#: doc/guix.texi:2778
 #, no-wrap
 msgid "propagated inputs"
 msgstr "распространяемые входные данные"
 
 #. type: table
-#: doc/guix.texi:2763
+#: doc/guix.texi:2784
 msgid "Sometimes packages have @dfn{propagated inputs}: these are dependencies that automatically get installed along with the required package (@pxref{package-propagated-inputs, @code{propagated-inputs} in @code{package} objects}, for information about propagated inputs in package definitions)."
 msgstr "Иногда пакеты имеют @dfn{распространённые входные данные} (propagated inputs) --- это зависимости, которые устанавливаются автоматически вместе с требуемыми пакетами (см. @pxref{package-propagated-inputs, @code{propagated-inputs} in @code{package} objects} для подробной информации о распространяемых входных днных в определениях пакетов)."
 
 #. type: anchor{#1}
-#: doc/guix.texi:2770
+#: doc/guix.texi:2791
 msgid "package-cmd-propagated-inputs"
 msgstr "package-cmd-propagated-inputs"
 
 #. type: table
-#: doc/guix.texi:2770
+#: doc/guix.texi:2791
 msgid "An example is the GNU MPC library: its C header files refer to those of the GNU MPFR library, which in turn refer to those of the GMP library.  Thus, when installing MPC, the MPFR and GMP libraries also get installed in the profile; removing MPC also removes MPFR and GMP---unless they had also been explicitly installed by the user."
 msgstr "Примером является библиотека GNU MPC: его файлы заголовков C ссылаются на файлы библиотеки GNU MPFR, которые в свою очередь, ссылаются на библиотеку GMP. Так при установке MPC, также в профиль будут устанволены библиотеки MPFR и GMP; удаление MPC также удалит MPFR и GMP, если конечно, они не были явно установлены пользователем."
 
 #. type: table
-#: doc/guix.texi:2775
+#: doc/guix.texi:2796
 msgid "Besides, packages sometimes rely on the definition of environment variables for their search paths (see explanation of @code{--search-paths} below).  Any missing or possibly incorrect environment variable definitions are reported here."
 msgstr "Кроме того, пакеты иногда зависят от переменных окружения --- от их путей поиска (смотрите разъяснение @code{--search-paths} ниже). Любая отсутствующая или, возможно, некорректная переменная окружения вызывает сообщение отчета."
 
 #. type: item
-#: doc/guix.texi:2776
+#: doc/guix.texi:2797
 #, no-wrap
 msgid "--install-from-expression=@var{exp}"
 msgstr "--install-from-expression=@var{exp}"
 
 #. type: itemx
-#: doc/guix.texi:2777
+#: doc/guix.texi:2798
 #, no-wrap
 msgid "-e @var{exp}"
 msgstr "-e @var{exp}"
 
 #. type: table
-#: doc/guix.texi:2779
+#: doc/guix.texi:2800
 msgid "Install the package @var{exp} evaluates to."
 msgstr "Устанавить пакет, соответствующий @var{exp}."
 
 #. type: table
-#: doc/guix.texi:2784
+#: doc/guix.texi:2805
 msgid "@var{exp} must be a Scheme expression that evaluates to a @code{} object.  This option is notably useful to disambiguate between same-named variants of a package, with expressions such as @code{(@@ (gnu packages base) guile-final)}."
 msgstr "@var{exp} должно быть выражением Scheme, которое определяет объект @code{}. Эта опция полезна, чтобы указать однозначно пакет, который имеет схожие варианты имён, например, выражением @code{(@@ (gnu packages base) guile-final)}."
 
 #. type: table
-#: doc/guix.texi:2788
+#: doc/guix.texi:2809
 msgid "Note that this option installs the first output of the specified package, which may be insufficient when needing a specific output of a multiple-output package."
 msgstr "Отметим, что эта опция устанавливает первое содержимое пакета, чего может быть недостаточно, если нужен специфичный выход пакета со множественным выходом."
 
 #. type: item
-#: doc/guix.texi:2789
+#: doc/guix.texi:2810
 #, no-wrap
 msgid "--install-from-file=@var{file}"
 msgstr "--install-from-file=@var{file}"
 
 #. type: itemx
-#: doc/guix.texi:2790 doc/guix.texi:8448
+#: doc/guix.texi:2811 doc/guix.texi:8542
 #, no-wrap
 msgid "-f @var{file}"
 msgstr "-f @var{file}"
 
 #. type: table
-#: doc/guix.texi:2792
+#: doc/guix.texi:2813
 msgid "Install the package that the code within @var{file} evaluates to."
 msgstr "Устанавить пакет, который определён в файле."
 
 #. type: table
-#: doc/guix.texi:2795 doc/guix.texi:4820
+#: doc/guix.texi:2816 doc/guix.texi:4841
 msgid "As an example, @var{file} might contain a definition like this (@pxref{Defining Packages}):"
 msgstr "Например, @var{file} может содержать содержать определение (@pxref{Defining Packages}):"
 
 #. type: include
-#: doc/guix.texi:2797 doc/guix.texi:8456
+#: doc/guix.texi:2818 doc/guix.texi:8550
 #, no-wrap
 msgid "package-hello.scm"
 msgstr "package-hello.scm"
 
 #. type: table
-#: doc/guix.texi:2804
+#: doc/guix.texi:2825
 msgid "Developers may find it useful to include such a @file{guix.scm} file in the root of their project source tree that can be used to test development snapshots and create reproducible development environments (@pxref{Invoking guix environment})."
 msgstr "Пользователи могут найти полезным включить подобный файл @file{guix.scm} в корень дерева своего проекта исходного кода, и он будет использоваться для тестирования разработки снепшотов и для создания воспроизводимого окружения разработки (@pxref{Invoking guix environment})."
 
 #. type: item
-#: doc/guix.texi:2805
+#: doc/guix.texi:2826
 #, no-wrap
 msgid "--remove=@var{package} @dots{}"
 msgstr "--remove=@var{package} @dots{}"
 
 #. type: itemx
-#: doc/guix.texi:2806
+#: doc/guix.texi:2827
 #, no-wrap
 msgid "-r @var{package} @dots{}"
 msgstr "-r @var{package} @dots{}"
 
 #. type: table
-#: doc/guix.texi:2808
+#: doc/guix.texi:2829
 msgid "Remove the specified @var{package}s."
 msgstr "Удалить обозначенный пакет."
 
 #. type: table
-#: doc/guix.texi:2813
+#: doc/guix.texi:2834
 msgid "As for @code{--install}, each @var{package} may specify a version number and/or output name in addition to the package name.  For instance, @code{-r glibc:debug} would remove the @code{debug} output of @code{glibc}."
 msgstr "Касаемо @code{--install}, каждый пакет @var{package} может задавать номер версии и имя содержимого в добавлении к имени пакета. Например,  @code{-r glibc:debug} удалит содержимое @code{debug} из  @code{glibc}."
 
 #. type: item
-#: doc/guix.texi:2814
+#: doc/guix.texi:2835
 #, no-wrap
 msgid "--upgrade[=@var{regexp} @dots{}]"
 msgstr "--upgrade[=@var{regexp} @dots{}]"
 
 #. type: itemx
-#: doc/guix.texi:2815
+#: doc/guix.texi:2836
 #, no-wrap
 msgid "-u [@var{regexp} @dots{}]"
 msgstr "-u [@var{regexp} @dots{}]"
 
 #. type: cindex
-#: doc/guix.texi:2816
+#: doc/guix.texi:2837
 #, no-wrap
 msgid "upgrading packages"
 msgstr "обновление пакетов"
 
 #. type: table
-#: doc/guix.texi:2820
+#: doc/guix.texi:2841
 msgid "Upgrade all the installed packages.  If one or more @var{regexp}s are specified, upgrade only installed packages whose name matches a @var{regexp}.  Also see the @code{--do-not-upgrade} option below."
 msgstr "Обновить все устанволенные пакеты. Если задано одно или более значений @var{regexp}, обновление затронет только пакеты, которые соответствуют @var{regexp}. Также смотрите опцию @code{--do-not-upgrade} ниже."
 
 #. type: table
-#: doc/guix.texi:2825
+#: doc/guix.texi:2846
 msgid "Note that this upgrades package to the latest version of packages found in the distribution currently installed.  To update your distribution, you should regularly run @command{guix pull} (@pxref{Invoking guix pull})."
 msgstr "Отметим, что это обновляет пакеты, которые установлены в системе, до последних версий, имеющихся в дистрибутиве. Чтобы обновить дистрибутив, нужно регулярно запускать @command{guix pull} (@pxref{Invoking guix pull})."
 
 #. type: item
-#: doc/guix.texi:2826
+#: doc/guix.texi:2847
 #, no-wrap
 msgid "--do-not-upgrade[=@var{regexp} @dots{}]"
 msgstr "--do-not-upgrade[=@var{regexp} @dots{}]"
 
 #. type: table
-#: doc/guix.texi:2831
+#: doc/guix.texi:2852
 msgid "When used together with the @code{--upgrade} option, do @emph{not} upgrade any packages whose name matches a @var{regexp}.  For example, to upgrade all packages in the current profile except those containing the substring ``emacs'':"
 msgstr "При совместном использовании с опцией @code{--upgrade} @emph{не} обновляет ни один пакет, чьё имя соответствует @var{regexp}. Например, обновить все пакеты в текущем профиле , кроме тех, которые содержат подстроку \"emacs\":"
 
 #. type: example
-#: doc/guix.texi:2834
+#: doc/guix.texi:2855
 #, no-wrap
 msgid "$ guix package --upgrade . --do-not-upgrade emacs\n"
 msgstr "$ guix package --upgrade . --do-not-upgrade emacs\n"
 
 #. type: anchor{#1}
-#: doc/guix.texi:2836
+#: doc/guix.texi:2857
 #, no-wrap
 msgid "profile-manifest"
 msgstr "profile-manifest"
 
 #. type: item
-#: doc/guix.texi:2836 doc/guix.texi:4825 doc/guix.texi:5224 doc/guix.texi:9426
-#: doc/guix.texi:10741
+#: doc/guix.texi:2857 doc/guix.texi:4846 doc/guix.texi:5234 doc/guix.texi:9525
+#: doc/guix.texi:10843
 #, no-wrap
 msgid "--manifest=@var{file}"
 msgstr "--manifest=@var{file}"
 
 #. type: itemx
-#: doc/guix.texi:2837 doc/guix.texi:4826 doc/guix.texi:5225 doc/guix.texi:9427
+#: doc/guix.texi:2858 doc/guix.texi:4847 doc/guix.texi:5235 doc/guix.texi:9526
 #, no-wrap
 msgid "-m @var{file}"
 msgstr "-m @var{file}"
 
 #. type: cindex
-#: doc/guix.texi:2838
+#: doc/guix.texi:2859
 #, no-wrap
 msgid "profile declaration"
 msgstr "описание профиля"
 
 #. type: cindex
-#: doc/guix.texi:2839
+#: doc/guix.texi:2860
 #, no-wrap
 msgid "profile manifest"
 msgstr "манифест профиля"
 
 #. type: table
-#: doc/guix.texi:2843
+#: doc/guix.texi:2864
 msgid "Create a new generation of the profile from the manifest object returned by the Scheme code in @var{file}.  This option can be repeated several times, in which case the manifests are concatenated."
 msgstr "Создаёт новую версию профиля из объекта манифеста, возвращаемого кодом Scheme в @var{file}. Этот параметр можно указывать несколько раз. В результате манифесты будут объединены в один."
 
 #. type: table
-#: doc/guix.texi:2849
+#: doc/guix.texi:2870
 msgid "This allows you to @emph{declare} the profile's contents rather than constructing it through a sequence of @code{--install} and similar commands.  The advantage is that @var{file} can be put under version control, copied to different machines to reproduce the same profile, and so on."
 msgstr "Это позволяет вам @emph{описать} содержимое профиля вместо того, чтобы собирать его последовательностью команд @code{--install} и других. Преимущество в том, что @var{file} может подчиняться контролю версиями, копироваться на другие машины, чтобы повторить такой же профиль и т.д."
 
 #. type: table
-#: doc/guix.texi:2853
+#: doc/guix.texi:2874
 msgid "@var{file} must return a @dfn{manifest} object, which is roughly a list of packages:"
 msgstr "@var{file} должен возвращать объект @dfn{manifest}, который, грубо говоря, является списком пакетов:"
 
 #. type: findex
-#: doc/guix.texi:2854
+#: doc/guix.texi:2875
 #, no-wrap
 msgid "packages->manifest"
 msgstr "packages->manifest"
 
 #. type: lisp
-#: doc/guix.texi:2857
+#: doc/guix.texi:2878
 #, no-wrap
 msgid ""
 "(use-package-modules guile emacs)\n"
@@ -7172,7 +7327,7 @@ msgstr ""
 "\n"
 
 #. type: lisp
-#: doc/guix.texi:2863
+#: doc/guix.texi:2884
 #, no-wrap
 msgid ""
 "(packages->manifest\n"
@@ -7188,18 +7343,18 @@ msgstr ""
 "       (list guile-2.0 \"debug\")))\n"
 
 #. type: findex
-#: doc/guix.texi:2865
+#: doc/guix.texi:2886
 #, no-wrap
 msgid "specifications->manifest"
 msgstr "specifications->manifest"
 
 #. type: table
-#: doc/guix.texi:2872
+#: doc/guix.texi:2893
 msgid "In this example we have to know which modules define the @code{emacs} and @code{guile-2.0} variables to provide the right @code{use-package-modules} line, which can be cumbersome.  We can instead provide regular package specifications and let @code{specifications->manifest} look up the corresponding package objects, like this:"
 msgstr "В этом примере мыдолжны знать, какие модули содержат определения переменных @code{emacs} и @code{guile-2.0}, чтобы написать правильную строку @code{use-package-modules}, что может быть затруднительно. Вместо этого мы можем обозначить обычные спецификации пакетов и сделать, чтобы @code{specifications->manifest} искал соответствующие объекты пакетов так:"
 
 #. type: lisp
-#: doc/guix.texi:2876
+#: doc/guix.texi:2897
 #, no-wrap
 msgid ""
 "(specifications->manifest\n"
@@ -7209,122 +7364,122 @@ msgstr ""
 " '(\"emacs\" \"guile@@2.2\" \"guile@@2.2:debug\"))\n"
 
 #. type: item
-#: doc/guix.texi:2878 doc/guix.texi:3827
+#: doc/guix.texi:2899 doc/guix.texi:3848
 #, no-wrap
 msgid "--roll-back"
 msgstr "--roll-back"
 
 #. type: cindex
-#: doc/guix.texi:2879 doc/guix.texi:3828 doc/guix.texi:26399
+#: doc/guix.texi:2900 doc/guix.texi:3849 doc/guix.texi:26662
 #, no-wrap
 msgid "rolling back"
 msgstr "откат"
 
 #. type: cindex
-#: doc/guix.texi:2880 doc/guix.texi:3829
+#: doc/guix.texi:2901 doc/guix.texi:3850
 #, no-wrap
 msgid "undoing transactions"
 msgstr "отменение транзакций"
 
 #. type: cindex
-#: doc/guix.texi:2881 doc/guix.texi:3830
+#: doc/guix.texi:2902 doc/guix.texi:3851
 #, no-wrap
 msgid "transactions, undoing"
 msgstr "транзакции, отмена"
 
 #. type: table
-#: doc/guix.texi:2884
+#: doc/guix.texi:2905
 msgid "Roll back to the previous @dfn{generation} of the profile---i.e., undo the last transaction."
 msgstr "Откатиться до предыдущего @dfn{поколения} профиля, то есть отменить последнюю транзакцию."
 
 #. type: table
-#: doc/guix.texi:2887
+#: doc/guix.texi:2908
 msgid "When combined with options such as @code{--install}, roll back occurs before any other actions."
 msgstr "При сочетании с опциеями как @code{--install}, откат выполняется до всех прочих действий."
 
 #. type: table
-#: doc/guix.texi:2891
+#: doc/guix.texi:2912
 msgid "When rolling back from the first generation that actually contains installed packages, the profile is made to point to the @dfn{zeroth generation}, which contains no files apart from its own metadata."
 msgstr "При откате от первого поколения, которое по факту содержит установленные пакеты, профиль будет указывать на @dfn{нулевое поколение}, которое не содержит файлы, кроме собственных метаданных."
 
 #. type: table
-#: doc/guix.texi:2895
+#: doc/guix.texi:2916
 msgid "After having rolled back, installing, removing, or upgrading packages overwrites previous future generations.  Thus, the history of the generations in a profile is always linear."
 msgstr "После выполнения отката, установка, удаление или обновление пакетов по факту заменяет прежние будущие поколения. То есть история поколений в профиле всегда линейная."
 
 #. type: item
-#: doc/guix.texi:2896 doc/guix.texi:3834
+#: doc/guix.texi:2917 doc/guix.texi:3855
 #, no-wrap
 msgid "--switch-generation=@var{pattern}"
 msgstr "--switch-generation=@var{pattern}"
 
 #. type: itemx
-#: doc/guix.texi:2897 doc/guix.texi:3835
+#: doc/guix.texi:2918 doc/guix.texi:3856
 #, no-wrap
 msgid "-S @var{pattern}"
 msgstr "-S @var{pattern}"
 
 #. type: cindex
-#: doc/guix.texi:2898 doc/guix.texi:3126 doc/guix.texi:3836
-#: doc/guix.texi:26357
+#: doc/guix.texi:2919 doc/guix.texi:3147 doc/guix.texi:3857
+#: doc/guix.texi:26620
 #, no-wrap
 msgid "generations"
 msgstr "поколения"
 
 #. type: table
-#: doc/guix.texi:2900 doc/guix.texi:3838
+#: doc/guix.texi:2921 doc/guix.texi:3859
 msgid "Switch to a particular generation defined by @var{pattern}."
 msgstr "Переключиться на определённое поколение, опрделённое @var{pattern}."
 
 #. type: table
-#: doc/guix.texi:2906 doc/guix.texi:3844
+#: doc/guix.texi:2927 doc/guix.texi:3865
 msgid "@var{pattern} may be either a generation number or a number prefixed with ``+'' or ``-''.  The latter means: move forward/backward by a specified number of generations.  For example, if you want to return to the latest generation after @code{--roll-back}, use @code{--switch-generation=+1}."
 msgstr "@var{pattern} может быть либо номером поколения или числом с префиксом \"+\" или \"-\". Последнее означает сменить вперёд/назад на обозначенное число поколений. Например, если вы хотите вернуться к последнему поколению после @code{--roll-back}, используйте @code{--switch-generation=+1}."
 
 #. type: table
-#: doc/guix.texi:2911
+#: doc/guix.texi:2932
 msgid "The difference between @code{--roll-back} and @code{--switch-generation=-1} is that @code{--switch-generation} will not make a zeroth generation, so if a specified generation does not exist, the current generation will not be changed."
 msgstr "Разница между @code{--roll-back} и @code{--switch-generation=-1} заключается в том, что @code{--switch-generation} не создаёт нулевое поколение, так что если заданное поколение не существует, текущее поколение не будет изменено."
 
 #. type: item
-#: doc/guix.texi:2912
+#: doc/guix.texi:2933
 #, no-wrap
 msgid "--search-paths[=@var{kind}]"
 msgstr "--search-paths[=@var{kind}]"
 
 #. type: table
-#: doc/guix.texi:2918
+#: doc/guix.texi:2939
 msgid "Report environment variable definitions, in Bash syntax, that may be needed in order to use the set of installed packages.  These environment variables are used to specify @dfn{search paths} for files used by some of the installed packages."
 msgstr "Вывести отчёт об определениях переменных окружения в синтаксисе Bash. Это может понадобиться для использования набора установленных пакетов. Эти переменные окружения используются некоторыми установленными пакетами для поиска файлов."
 
 #. type: table
-#: doc/guix.texi:2926
+#: doc/guix.texi:2947
 msgid "For example, GCC needs the @code{CPATH} and @code{LIBRARY_PATH} environment variables to be defined so it can look for headers and libraries in the user's profile (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}).  If GCC and, say, the C library are installed in the profile, then @code{--search-paths} will suggest setting these variables to @code{@var{profile}/include} and @code{@var{profile}/lib}, respectively."
 msgstr "Например, для GCC должны быть определены переменные окружения @code{CPATH} и @code{LIBRARY_PATH}, чтобы он мог искать заголовки и библиотеки в профиле пользователя (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}). Если GCC и, скажем, библиотека C установлены в профиле, тогда @code{--search-paths} предложит установить эти переменные в @code{@var{profile}/include} и @code{@var{profile}/lib} соответственно."
 
 #. type: table
-#: doc/guix.texi:2929
+#: doc/guix.texi:2950
 msgid "The typical use case is to define these environment variables in the shell:"
 msgstr "Обычный способ определить эти переменные окружения в оболочке:"
 
 #. type: example
-#: doc/guix.texi:2932
+#: doc/guix.texi:2953
 #, no-wrap
 msgid "$ eval `guix package --search-paths`\n"
 msgstr "$ eval `guix package --search-paths`\n"
 
 #. type: table
-#: doc/guix.texi:2938
+#: doc/guix.texi:2959
 msgid "@var{kind} may be one of @code{exact}, @code{prefix}, or @code{suffix}, meaning that the returned environment variable definitions will either be exact settings, or prefixes or suffixes of the current value of these variables.  When omitted, @var{kind} defaults to @code{exact}."
 msgstr "Вид @var{kind} может быть либо точный адрес @code{exact}, либо префикс @code{prefix}, либо суффикс @code{suffix}, то есть возвращаемые переменные окружения могут быть либо точными, либо префиксами и суффиксами текущего значения этих переменных. При пропуске вид @var{kind} по умолчанию выбирается точный @code{exact}."
 
 #. type: table
-#: doc/guix.texi:2941
+#: doc/guix.texi:2962
 msgid "This option can also be used to compute the @emph{combined} search paths of several profiles.  Consider this example:"
 msgstr "Эта опция также может использоваться для вычисления @emph{комбинированных} путей поиска нескольких профилей. Рассмотрим пример:"
 
 #. type: example
-#: doc/guix.texi:2946
+#: doc/guix.texi:2967
 #, no-wrap
 msgid ""
 "$ guix package -p foo -i guile\n"
@@ -7336,34 +7491,34 @@ msgstr ""
 "$ guix package -p foo -p bar --search-paths\n"
 
 #. type: table
-#: doc/guix.texi:2951
+#: doc/guix.texi:2972
 msgid "The last command above reports about the @code{GUILE_LOAD_PATH} variable, even though, taken individually, neither @file{foo} nor @file{bar} would lead to that recommendation."
 msgstr "Последняя команда выше составляет отчёт о переменной @code{GUILE_LOAD_PATH}, даже если по отдельности ни @file{foo}, ни @file{bar} не предшествуют рекомендациям."
 
 #. type: item
-#: doc/guix.texi:2953 doc/guix.texi:3864 doc/guix.texi:4444
+#: doc/guix.texi:2974 doc/guix.texi:3885 doc/guix.texi:4465
 #, no-wrap
 msgid "--profile=@var{profile}"
 msgstr "--profile=@var{profile}"
 
 #. type: itemx
-#: doc/guix.texi:2954 doc/guix.texi:3865 doc/guix.texi:4445
+#: doc/guix.texi:2975 doc/guix.texi:3886 doc/guix.texi:4466
 #, no-wrap
 msgid "-p @var{profile}"
 msgstr "-p @var{profile}"
 
 #. type: table
-#: doc/guix.texi:2956
+#: doc/guix.texi:2977
 msgid "Use @var{profile} instead of the user's default profile."
 msgstr "Использовать @var{profile} вместо пользовательского профиля по умолчанию."
 
 #. type: table
-#: doc/guix.texi:2961
+#: doc/guix.texi:2982
 msgid "@var{profile} must be the name of a file that will be created upon completion.  Concretely, @var{profile} will be a mere symbolic link (``symlink'') pointing to the actual profile where packages are installed:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2967
+#: doc/guix.texi:2988
 #, no-wrap
 msgid ""
 "$ guix install hello -p ~/code/my-profile\n"
@@ -7373,29 +7528,29 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2971
+#: doc/guix.texi:2992
 msgid "All it takes to get rid of the profile is to remove this symlink and its siblings that point to specific generations:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2974
+#: doc/guix.texi:2995
 #, no-wrap
 msgid "$ rm ~/code/my-profile ~/code/my-profile-*-link\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2976
+#: doc/guix.texi:2997
 #, no-wrap
 msgid "--list-profiles"
 msgstr "--list-profiles"
 
 #. type: table
-#: doc/guix.texi:2978
+#: doc/guix.texi:2999
 msgid "List all the user's profiles:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2985
+#: doc/guix.texi:3006
 #, no-wrap
 msgid ""
 "$ guix package --list-profiles\n"
@@ -7406,90 +7561,90 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2988
+#: doc/guix.texi:3009
 msgid "When running as root, list all the profiles of all the users."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2989
+#: doc/guix.texi:3010
 #, no-wrap
 msgid "collisions, in a profile"
 msgstr "противоречия, в профиле"
 
 #. type: cindex
-#: doc/guix.texi:2990
+#: doc/guix.texi:3011
 #, no-wrap
 msgid "colliding packages in profiles"
 msgstr "соперничающие пакеты в профиле"
 
 #. type: cindex
-#: doc/guix.texi:2991
+#: doc/guix.texi:3012
 #, no-wrap
 msgid "profile collisions"
 msgstr "противоречеия профиля"
 
 #. type: item
-#: doc/guix.texi:2992
+#: doc/guix.texi:3013
 #, no-wrap
 msgid "--allow-collisions"
 msgstr "--allow-collisions"
 
 #. type: table
-#: doc/guix.texi:2994
+#: doc/guix.texi:3015
 msgid "Allow colliding packages in the new profile.  Use at your own risk!"
 msgstr "Разрешить соперничающие пакеты в новом профиле. Используйте на свой собственный страх и риск!"
 
 #. type: table
-#: doc/guix.texi:2998
+#: doc/guix.texi:3019
 msgid "By default, @command{guix package} reports as an error @dfn{collisions} in the profile.  Collisions happen when two or more different versions or variants of a given package end up in the profile."
 msgstr "По умолчанию @command{guix package} делает отчёт о противоречиях @dfn{collisions} в профиле. Противоречия происходят, когда дви или более разных версии или варианта данного пакета присутсвуют в профиле."
 
 #. type: item
-#: doc/guix.texi:2999 doc/guix.texi:3881 doc/guix.texi:5309
+#: doc/guix.texi:3020 doc/guix.texi:3902 doc/guix.texi:5319
 #, no-wrap
 msgid "--bootstrap"
 msgstr "--bootstrap"
 
 #. type: table
-#: doc/guix.texi:3002
+#: doc/guix.texi:3023
 msgid "Use the bootstrap Guile to build the profile.  This option is only useful to distribution developers."
 msgstr "Использовать бутстрап Guile для сборки профиля. Эта опция полезна только разработчикам дистрибутива."
 
 #. type: Plain text
-#: doc/guix.texi:3008
+#: doc/guix.texi:3029
 msgid "In addition to these actions, @command{guix package} supports the following options to query the current state of a profile, or the availability of packages:"
 msgstr "В дополнение к этим действиям @command{guix package} поддерживает следующие опции при обращении к текущему состоянию профиля или для проверки доступности пакетов:"
 
 #. type: item
-#: doc/guix.texi:3011
+#: doc/guix.texi:3032
 #, no-wrap
 msgid "--search=@var{regexp}"
 msgstr "--search=@var{regexp}"
 
 #. type: itemx
-#: doc/guix.texi:3012
+#: doc/guix.texi:3033
 #, no-wrap
 msgid "-s @var{regexp}"
 msgstr "-s @var{regexp}"
 
 #. type: cindex
-#: doc/guix.texi:3013
+#: doc/guix.texi:3034
 #, no-wrap
 msgid "searching for packages"
 msgstr "поиск пакетов"
 
 #. type: table
-#: doc/guix.texi:3019
+#: doc/guix.texi:3040
 msgid "List the available packages whose name, synopsis, or description matches @var{regexp} (in a case-insensitive fashion), sorted by relevance.  Print all the metadata of matching packages in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})."
 msgstr "Вывести список пакетов, чьи имена или описания содержат выражение @var{regexp} с учётом регистра, упорядоченные по соответствию. Печать всех метаданных соответствующих пакетов в формате @code{recutils} (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})."
 
 #. type: table
-#: doc/guix.texi:3022
+#: doc/guix.texi:3043
 msgid "This allows specific fields to be extracted using the @command{recsel} command, for instance:"
 msgstr "Это позволяет извлекать заданые поля, используя команду @command{recsel}, например:"
 
 #. type: example
-#: doc/guix.texi:3028
+#: doc/guix.texi:3049
 #, no-wrap
 msgid ""
 "$ guix package -s malloc | recsel -p name,version,relevance\n"
@@ -7505,7 +7660,7 @@ msgstr ""
 "\n"
 
 #. type: example
-#: doc/guix.texi:3032
+#: doc/guix.texi:3053
 #, no-wrap
 msgid ""
 "name: glibc\n"
@@ -7519,7 +7674,7 @@ msgstr ""
 "\n"
 
 #. type: example
-#: doc/guix.texi:3036
+#: doc/guix.texi:3057
 #, no-wrap
 msgid ""
 "name: libgc\n"
@@ -7531,12 +7686,12 @@ msgstr ""
 "relevance: 1\n"
 
 #. type: table
-#: doc/guix.texi:3040
+#: doc/guix.texi:3061
 msgid "Similarly, to show the name of all the packages available under the terms of the GNU@tie{}LGPL version 3:"
 msgstr "Также для отображения имён всех доступных пакетов под лицензией GNU@tie{}LGPL версии 3:"
 
 #. type: example
-#: doc/guix.texi:3044
+#: doc/guix.texi:3065
 #, no-wrap
 msgid ""
 "$ guix package -s \"\" | recsel -p name -e 'license ~ \"LGPL 3\"'\n"
@@ -7548,7 +7703,7 @@ msgstr ""
 "\n"
 
 #. type: example
-#: doc/guix.texi:3047
+#: doc/guix.texi:3068
 #, no-wrap
 msgid ""
 "name: gmp\n"
@@ -7558,12 +7713,12 @@ msgstr ""
 "@dots{}\n"
 
 #. type: table
-#: doc/guix.texi:3053
+#: doc/guix.texi:3074
 msgid "It is also possible to refine search results using several @code{-s} flags to @command{guix package}, or several arguments to @command{guix search}.  For example, the following command returns a list of board games (this time using the @command{guix search} alias):"
 msgstr "Также можно уточнить поиск, используя несколько флагов @code{-s} в команде @command{guix package} или несколько аргументов в @command{guix search}.  Например, следующая команда возвращает список настольных игр (используя синоним @command{guix search} на этот раз):"
 
 #. type: example
-#: doc/guix.texi:3058
+#: doc/guix.texi:3079
 #, no-wrap
 msgid ""
 "$ guix search '\\' game | recsel -p name\n"
@@ -7575,17 +7730,17 @@ msgstr ""
 "@dots{}\n"
 
 #. type: table
-#: doc/guix.texi:3064
+#: doc/guix.texi:3085
 msgid "If we were to omit @code{-s game}, we would also get software packages that deal with printed circuit boards; removing the angle brackets around @code{board} would further add packages that have to do with keyboards."
 msgstr "При пропуске @code{-s game} мы получим пакеты программного обеспечения, которые работают с печатными платами (boards); удалив угловые скобки рядом с @code{board}, получим пакеты, которые также работают с клавиатурами (keyboards)."
 
 #. type: table
-#: doc/guix.texi:3068
+#: doc/guix.texi:3089
 msgid "And now for a more elaborate example.  The following command searches for cryptographic libraries, filters out Haskell, Perl, Python, and Ruby libraries, and prints the name and synopsis of the matching packages:"
 msgstr "А теперь более запутанный пример. Следующая команда ищет библиотеки криптографии, фильтрует библиотеки Haskel, Perl, Python и Ruby и печатает имена и краткие описания найденных пакетов:"
 
 #. type: example
-#: doc/guix.texi:3072
+#: doc/guix.texi:3093
 #, no-wrap
 msgid ""
 "$ guix search crypto library | \\\n"
@@ -7595,23 +7750,23 @@ msgstr ""
 "    recsel -e '! (name ~ \"^(ghc|perl|python|ruby)\")' -p name,synopsis\n"
 
 #. type: table
-#: doc/guix.texi:3077
+#: doc/guix.texi:3098
 msgid "@xref{Selection Expressions,,, recutils, GNU recutils manual}, for more information on @dfn{selection expressions} for @code{recsel -e}."
 msgstr "См. @xref{Selection Expressions,,, recutils, GNU recutils manual} для подробной информации о регуларяных выражениях @dfn{selection expressions} для @code{recsel -e}."
 
 #. type: item
-#: doc/guix.texi:3078
+#: doc/guix.texi:3099
 #, no-wrap
 msgid "--show=@var{package}"
 msgstr "--show=@var{package}"
 
 #. type: table
-#: doc/guix.texi:3082
+#: doc/guix.texi:3103
 msgid "Show details about @var{package}, taken from the list of available packages, in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})."
 msgstr "Показать детали пакета @var{package} из списка доступных пакетов в формате @code{recutils} (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})."
 
 #. type: example
-#: doc/guix.texi:3087
+#: doc/guix.texi:3108
 #, no-wrap
 msgid ""
 "$ guix package --show=python | recsel -p name,version\n"
@@ -7625,7 +7780,7 @@ msgstr ""
 "\n"
 
 #. type: example
-#: doc/guix.texi:3090
+#: doc/guix.texi:3111
 #, no-wrap
 msgid ""
 "name: python\n"
@@ -7635,14 +7790,14 @@ msgstr ""
 "version: 3.3.5\n"
 
 #. type: table
-#: doc/guix.texi:3094
+#: doc/guix.texi:3115
 #, fuzzy
 #| msgid "You may also specify the full name of a package to only get details about a specific version of it:"
 msgid "You may also specify the full name of a package to only get details about a specific version of it (this time using the @command{guix show} alias):"
 msgstr "Можно также указать полное имя пакета, чтобы получить детали определённой версии пакета:"
 
 #. type: example
-#: doc/guix.texi:3098
+#: doc/guix.texi:3119
 #, fuzzy, no-wrap
 #| msgid ""
 #| "$ guix package --show=python@@3.4 | recsel -p name,version\n"
@@ -7658,234 +7813,236 @@ msgstr ""
 "version: 3.4.3\n"
 
 #. type: item
-#: doc/guix.texi:3102
+#: doc/guix.texi:3123
 #, no-wrap
 msgid "--list-installed[=@var{regexp}]"
 msgstr "--list-installed[=@var{regexp}]"
 
 #. type: itemx
-#: doc/guix.texi:3103
+#: doc/guix.texi:3124
 #, no-wrap
 msgid "-I [@var{regexp}]"
 msgstr "-I [@var{regexp}]"
 
 #. type: table
-#: doc/guix.texi:3107
+#: doc/guix.texi:3128
 msgid "List the currently installed packages in the specified profile, with the most recently installed packages shown last.  When @var{regexp} is specified, list only installed packages whose name matches @var{regexp}."
 msgstr "Вывести текущий список установленных пакетов в заданном профиле, отобразив самый последний установленный пакет последним. Если задано @var{regexp}, будут выведены только пакеты, чьи имена содержат @var{regexp}."
 
 #. type: table
-#: doc/guix.texi:3113
+#: doc/guix.texi:3134
 msgid "For each installed package, print the following items, separated by tabs: the package name, its version string, the part of the package that is installed (for instance, @code{out} for the default output, @code{include} for its headers, etc.), and the path of this package in the store."
 msgstr "Для каждого установленного пакета выводит следующие элементы, разделенные табуляцией (tab): имя пакета, строка версии, частью какого пакета является установленный пакет (например, @code{out} вывода по умолчанию включает @code{include} его заголовки т.д.), а также путь этого пакета на складе."
 
 #. type: item
-#: doc/guix.texi:3114
+#: doc/guix.texi:3135
 #, no-wrap
 msgid "--list-available[=@var{regexp}]"
 msgstr "--list-available[=@var{regexp}]"
 
 #. type: itemx
-#: doc/guix.texi:3115
+#: doc/guix.texi:3136
 #, no-wrap
 msgid "-A [@var{regexp}]"
 msgstr "-A [@var{regexp}]"
 
 #. type: table
-#: doc/guix.texi:3119
-msgid "List packages currently available in the distribution for this system (@pxref{GNU Distribution}).  When @var{regexp} is specified, list only installed packages whose name matches @var{regexp}."
+#: doc/guix.texi:3140
+#, fuzzy
+#| msgid "List packages currently available in the distribution for this system (@pxref{GNU Distribution}).  When @var{regexp} is specified, list only installed packages whose name matches @var{regexp}."
+msgid "List packages currently available in the distribution for this system (@pxref{GNU Distribution}).  When @var{regexp} is specified, list only available packages whose name matches @var{regexp}."
 msgstr "Вывести список пакетов, доступных на текущий момент в дистрибутиве данной системы (@pxref{GNU Distribution}). Если задано @var{regexp}, выводит только установленные пакеты, чьё имя содержит @var{regexp}."
 
 #. type: table
-#: doc/guix.texi:3123
+#: doc/guix.texi:3144
 msgid "For each package, print the following items separated by tabs: its name, its version string, the parts of the package (@pxref{Packages with Multiple Outputs}), and the source location of its definition."
 msgstr "Для каждого пакета выводит следующие элементы, разделённые табуляцией: его имя, строка версии, часть пакета (@pxref{Packages with Multiple Outputs}), а также расположение его определения в исходниках."
 
 #. type: item
-#: doc/guix.texi:3124 doc/guix.texi:3820
+#: doc/guix.texi:3145 doc/guix.texi:3841
 #, no-wrap
 msgid "--list-generations[=@var{pattern}]"
 msgstr "--list-generations[=@var{pattern}]"
 
 #. type: itemx
-#: doc/guix.texi:3125 doc/guix.texi:3821
+#: doc/guix.texi:3146 doc/guix.texi:3842
 #, no-wrap
 msgid "-l [@var{pattern}]"
 msgstr "-l [@var{pattern}]"
 
 #. type: table
-#: doc/guix.texi:3131
+#: doc/guix.texi:3152
 msgid "Return a list of generations along with their creation dates; for each generation, show the installed packages, with the most recently installed packages shown last.  Note that the zeroth generation is never shown."
 msgstr "Вывести список поколений (generations) с датами их создания; для каждого поколения отобразить установленные пакеты, самый последний установленный пакет отобразать последним. Отметим, что нулевое поколение никогда не показывается."
 
 #. type: table
-#: doc/guix.texi:3136
+#: doc/guix.texi:3157
 msgid "For each installed package, print the following items, separated by tabs: the name of a package, its version string, the part of the package that is installed (@pxref{Packages with Multiple Outputs}), and the location of this package in the store."
 msgstr "Для каждого установленного пакета отображает следующие элементы, разделённые табуляцией: имя пакета, строка версии, частью какого пакета является установленный пакет (@pxref{Packages with Multiple Outputs}), а также расположение пакета на складе."
 
 #. type: table
-#: doc/guix.texi:3139
+#: doc/guix.texi:3160
 msgid "When @var{pattern} is used, the command returns only matching generations.  Valid patterns include:"
 msgstr "Если используется @var{pattern}, команда выводит только соответствующие поколения. Правильные паттерны содержат:"
 
 #. type: item
-#: doc/guix.texi:3141
+#: doc/guix.texi:3162
 #, no-wrap
 msgid "@emph{Integers and comma-separated integers}.  Both patterns denote"
 msgstr "@emph{Числа и числа, разделённые запятыми}. Оба паттерна обозначают"
 
 #. type: itemize
-#: doc/guix.texi:3144
+#: doc/guix.texi:3165
 msgid "generation numbers.  For instance, @code{--list-generations=1} returns the first one."
 msgstr "номера поколений. Например, @code{--list-generations=1} возвращает первое."
 
 #. type: itemize
-#: doc/guix.texi:3147
+#: doc/guix.texi:3168
 msgid "And @code{--list-generations=1,8,2} outputs three generations in the specified order.  Neither spaces nor trailing commas are allowed."
 msgstr "А @code{--list-generations=1,8,2} даёт три поколения в заданном пордке. Не опускаются ни пробелы, ни запятые на конце."
 
 #. type: item
-#: doc/guix.texi:3148
+#: doc/guix.texi:3169
 #, no-wrap
 msgid "@emph{Ranges}.  @code{--list-generations=2..9} prints the"
 msgstr "@emph{Диапазоны}.  @code{--list-generations=2..9} выводит"
 
 #. type: itemize
-#: doc/guix.texi:3151
+#: doc/guix.texi:3172
 msgid "specified generations and everything in between.  Note that the start of a range must be smaller than its end."
 msgstr "заданные поколения и все между ними. Отметим, что начало диапазона должно быть меньше его конца."
 
 #. type: itemize
-#: doc/guix.texi:3155
+#: doc/guix.texi:3176
 msgid "It is also possible to omit the endpoint.  For example, @code{--list-generations=2..}, returns all generations starting from the second one."
 msgstr "Также можно пропустить конечную точку. Например, @code{--list-generations=2..} возвращает все поколения, начиная со второго."
 
 #. type: item
-#: doc/guix.texi:3156
+#: doc/guix.texi:3177
 #, no-wrap
 msgid "@emph{Durations}.  You can also get the last @emph{N}@tie{}days, weeks,"
 msgstr "@emph{Сроки}. Также можно задать последние @emph{N}@tie{}дней, недель"
 
 #. type: itemize
-#: doc/guix.texi:3160
+#: doc/guix.texi:3181
 msgid "or months by passing an integer along with the first letter of the duration.  For example, @code{--list-generations=20d} lists generations that are up to 20 days old."
 msgstr "или месяцев, указав число и первую букву срока (d,w,m). Например,  @code{--list-generations=20d} отобразит список поколений старше 20 дней."
 
 #. type: item
-#: doc/guix.texi:3162 doc/guix.texi:3845
+#: doc/guix.texi:3183 doc/guix.texi:3866
 #, no-wrap
 msgid "--delete-generations[=@var{pattern}]"
 msgstr "--delete-generations[=@var{pattern}]"
 
 #. type: itemx
-#: doc/guix.texi:3163 doc/guix.texi:3846
+#: doc/guix.texi:3184 doc/guix.texi:3867
 #, no-wrap
 msgid "-d [@var{pattern}]"
 msgstr "-d [@var{pattern}]"
 
 #. type: table
-#: doc/guix.texi:3166 doc/guix.texi:3849
+#: doc/guix.texi:3187 doc/guix.texi:3870
 msgid "When @var{pattern} is omitted, delete all generations except the current one."
 msgstr "Если @var{pattern} пропущен, удалит все поголения, кроме текущего."
 
 #. type: table
-#: doc/guix.texi:3172 doc/guix.texi:3855
+#: doc/guix.texi:3193 doc/guix.texi:3876
 msgid "This command accepts the same patterns as @option{--list-generations}.  When @var{pattern} is specified, delete the matching generations.  When @var{pattern} specifies a duration, generations @emph{older} than the specified duration match.  For instance, @code{--delete-generations=1m} deletes generations that are more than one month old."
 msgstr "Эта команда принимает такие же паттерны, как @option{--list-generations}. Если @var{pattern} задан, удалит соответствующие поколения. Если паттерн @var{pattern} задаёт срок, выбираются поколения @emph{старше} срока. Например, @code{--delete-generations=1m} удалит поколения, которые старше одного месяца."
 
 #. type: table
-#: doc/guix.texi:3175
+#: doc/guix.texi:3196
 msgid "If the current generation matches, it is @emph{not} deleted.  Also, the zeroth generation is never deleted."
 msgstr "Если текущее поколение попадает под условия паттерна, оно не будет удалено. А также нулевое поокление никогда не удаляется."
 
 #. type: table
-#: doc/guix.texi:3178 doc/guix.texi:3860
+#: doc/guix.texi:3199 doc/guix.texi:3881
 msgid "Note that deleting generations prevents rolling back to them.  Consequently, this command must be used with care."
 msgstr "Отметим, что удаление поколений делает невозможным откат к ним. Следовательно эта команда должна использоваться внимательно."
 
 #. type: Plain text
-#: doc/guix.texi:3189
+#: doc/guix.texi:3210
 msgid "Finally, since @command{guix package} may actually start build processes, it supports all the common build options (@pxref{Common Build Options}).  It also supports package transformation options, such as @option{--with-source} (@pxref{Package Transformation Options}).  However, note that package transformations are lost when upgrading; to preserve transformations across upgrades, you should define your own package variant in a Guile module and add it to @code{GUIX_PACKAGE_PATH} (@pxref{Defining Packages})."
 msgstr "Наконец, так как @command{guix package} может запускать процессы сборки, она поддерживает все привычные опции сборки (@pxref{Common Build Options}). Она также поддерживает опции трансформации пакетов, как @option{--with-source} (@pxref{Package Transformation Options}). Однако, отметим, что трансформации пакетов теряются после обновлений; чтобы сохранить трансформации при обновлениях, нужно определить собственный вариант пакета в модуле Guile и добавить его в @code{GUIX_PACKAGE_PATH} (@pxref{Defining Packages})."
 
 #. type: cindex
-#: doc/guix.texi:3194
+#: doc/guix.texi:3215
 #, no-wrap
 msgid "pre-built binaries"
 msgstr "собранные бинарники"
 
 #. type: Plain text
-#: doc/guix.texi:3200
+#: doc/guix.texi:3221
 msgid "Guix supports transparent source/binary deployment, which means that it can either build things locally, or download pre-built items from a server, or both.  We call these pre-built items @dfn{substitutes}---they are substitutes for local build results.  In many cases, downloading a substitute is much faster than building things locally."
 msgstr "Guix поддерживает прозрачную развёртку исходников/бинарников, это означает возможность сборки пакетов локально или скачивания собранных элементов с сервера, или и то и другое. Мы называем собранные элементы @dfn{подстановками} (substitutes) --- это подстановки результатов локальных сборок. Часто скасивание подстановки намного быстрее, чем сборка пакетов локально."
 
 #. type: Plain text
-#: doc/guix.texi:3205
+#: doc/guix.texi:3226
 msgid "Substitutes can be anything resulting from a derivation build (@pxref{Derivations}).  Of course, in the common case, they are pre-built package binaries, but source tarballs, for instance, which also result from derivation builds, can be available as substitutes."
 msgstr "В качестве подстановок может выступать какой угодно результат сборки деривации (@pxref{Derivations}). Конечно, обычно это собранные пакеты, но также архивы исходников, например, представляя собой результаты сборок дериваций, могут быть доступны в качестве подстановок."
 
 #. type: cindex
-#: doc/guix.texi:3218
+#: doc/guix.texi:3239
 #, no-wrap
 msgid "build farm"
 msgstr "ферма сборки"
 
 #. type: Plain text
-#: doc/guix.texi:3228
+#: doc/guix.texi:3249
 msgid "The @code{@value{SUBSTITUTE-SERVER}} server is a front-end to an official build farm that builds packages from Guix continuously for some architectures, and makes them available as substitutes.  This is the default source of substitutes; it can be overridden by passing the @option{--substitute-urls} option either to @command{guix-daemon} (@pxref{daemon-substitute-urls,, @code{guix-daemon --substitute-urls}})  or to client tools such as @command{guix package} (@pxref{client-substitute-urls,, client @option{--substitute-urls} option})."
 msgstr "Сервер @code{@value{SUBSTITUTE-SERVER}} представляет собой интерфейс официальной фермы сборки, которая последовательно собирает пакеты Guix для некоторых архитектур и делает их доступными в качестве подстановок. Это источник подстановок по умолчанию; он может быть изменён при указании опции @option{--substitute-urls} как для @command{guix-daemon} (@pxref{daemon-substitute-urls,, @code{guix-daemon --substitute-urls}}) так и для клиентских инструментов, как @command{guix package} (@pxref{client-substitute-urls,, client @option{--substitute-urls} option})."
 
 #. type: Plain text
-#: doc/guix.texi:3234
+#: doc/guix.texi:3255
 msgid "Substitute URLs can be either HTTP or HTTPS.  HTTPS is recommended because communications are encrypted; conversely, using HTTP makes all communications visible to an eavesdropper, who could use the information gathered to determine, for instance, whether your system has unpatched security vulnerabilities."
 msgstr "URL подстановок могут быть либо HTTP, либо HTTPS. Рекомендуется HTTPS, так как такая связь шифруется; и наоборот, использование HTTP делает связь видимой для подслушивающих, и они могут использовать собранную информацию, чтобы определить, например, что ваша система не имеет патчей, покрывающих уязвимости безопасности."
 
 #. type: Plain text
-#: doc/guix.texi:3243
+#: doc/guix.texi:3264
 msgid "Substitutes from the official build farm are enabled by default when using Guix System (@pxref{GNU Distribution}).  However, they are disabled by default when using Guix on a foreign distribution, unless you have explicitly enabled them via one of the recommended installation steps (@pxref{Installation}).  The following paragraphs describe how to enable or disable substitutes for the official build farm; the same procedure can also be used to enable substitutes for any other substitute server."
 msgstr "Подстановки из официальной фермы сборки доступны по умолчанию при использовании системы Guix (@pxref{GNU Distribution}). Однако они отключены по умолчанию при использовании Guix на чужом дистрибутиве, если конечно вы явно не включили их на одном из рекомендуемых шагов установки (@pxref{Installation}). Ниже объясняется, как включить или отключить подстановки с официальной фермы сборки; такая же процедура может также использоваться для включения подстановок с любого другого сервера подстановок."
 
 #. type: cindex
-#: doc/guix.texi:3247
+#: doc/guix.texi:3268
 #, no-wrap
 msgid "security"
 msgstr "безопасность"
 
 #. type: cindex
-#: doc/guix.texi:3249
+#: doc/guix.texi:3270
 #, no-wrap
 msgid "access control list (ACL), for substitutes"
 msgstr "список контроля доступом (ACL), для подстановок"
 
 #. type: cindex
-#: doc/guix.texi:3250
+#: doc/guix.texi:3271
 #, no-wrap
 msgid "ACL (access control list), for substitutes"
 msgstr "ACL (список контроля доступом), для подстановок"
 
 #. type: Plain text
-#: doc/guix.texi:3257
+#: doc/guix.texi:3278
 msgid "To allow Guix to download substitutes from @code{@value{SUBSTITUTE-SERVER}} or a mirror thereof, you must add its public key to the access control list (ACL) of archive imports, using the @command{guix archive} command (@pxref{Invoking guix archive}).  Doing so implies that you trust @code{@value{SUBSTITUTE-SERVER}} to not be compromised and to serve genuine substitutes."
 msgstr "Чтобы разрешить Guix скачивать подстановки из @code{@value{SUBSTITUTE-SERVER}} или зеркала, вы должны добавить его публичный ключ в список контроля доступа (ACL) импорта архивов, используя команду @command{guix archive} (@pxref{Invoking guix archive}). Это действие означает, что вы доверяете @code{@value{SUBSTITUTE-SERVER}}, что он не скомпрометирован и может давать подлинные подстановки."
 
 #. type: Plain text
-#: doc/guix.texi:3264
+#: doc/guix.texi:3285
 msgid "The public key for @code{@value{SUBSTITUTE-SERVER}} is installed along with Guix, in @code{@var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub}, where @var{prefix} is the installation prefix of Guix.  If you installed Guix from source, make sure you checked the GPG signature of @file{guix-@value{VERSION}.tar.gz}, which contains this public key file.  Then, you can run something like this:"
 msgstr "Публичный ключ для @code{@value{SUBSTITUTE-SERVER}} устанавливается вместе с Guix в  @code{@var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub}, где @var{prefix} --- префикс установки Guix. Если вы установили Guix из исходников, проверьте подпись GPG @file{guix-@value{VERSION}.tar.gz}, где содержится файл публичного ключа. Затем можно выполнить примерно следующее:"
 
 #. type: example
-#: doc/guix.texi:3267
+#: doc/guix.texi:3288
 #, no-wrap
 msgid "# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub\n"
 msgstr "# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub\n"
 
 #. type: Plain text
-#: doc/guix.texi:3271
+#: doc/guix.texi:3292
 msgid "Once this is in place, the output of a command like @code{guix build} should change from something like:"
 msgstr "Когда это сделано, вывод команды @code{guix build} должен измениться с примерно такого:"
 
 #. type: example
-#: doc/guix.texi:3280
+#: doc/guix.texi:3301
 #, no-wrap
 msgid ""
 "$ guix build emacs --dry-run\n"
@@ -7905,12 +8062,12 @@ msgstr ""
 "@dots{}\n"
 
 #. type: Plain text
-#: doc/guix.texi:3284
+#: doc/guix.texi:3305
 msgid "to something like:"
 msgstr "на примерно следующий:"
 
 #. type: example
-#: doc/guix.texi:3293
+#: doc/guix.texi:3314
 #, no-wrap
 msgid ""
 "$ guix build emacs --dry-run\n"
@@ -7930,149 +8087,149 @@ msgstr ""
 "@dots{}\n"
 
 #. type: Plain text
-#: doc/guix.texi:3300
+#: doc/guix.texi:3321
 #, fuzzy
 #| msgid "This indicates that substitutes from @code{@value{SUBSTITUTE-SERVER}} are usable and will be downloaded, when possible, for future builds."
 msgid "The text changed from ``The following derivations would be built'' to ``112.3 MB would be downloaded''.  This indicates that substitutes from @code{@value{SUBSTITUTE-SERVER}} are usable and will be downloaded, when possible, for future builds."
 msgstr "Это показывает, что подстановки из @code{@value{SUBSTITUTE-SERVER}} готовы к использованию и будут скачиваться, если это возможно, в будущих сборках."
 
 #. type: cindex
-#: doc/guix.texi:3301
+#: doc/guix.texi:3322
 #, no-wrap
 msgid "substitutes, how to disable"
 msgstr "подстановки, как отключить"
 
 #. type: Plain text
-#: doc/guix.texi:3307
+#: doc/guix.texi:3328
 msgid "The substitute mechanism can be disabled globally by running @code{guix-daemon} with @code{--no-substitutes} (@pxref{Invoking guix-daemon}).  It can also be disabled temporarily by passing the @code{--no-substitutes} option to @command{guix package}, @command{guix build}, and other command-line tools."
 msgstr "Механизм подстановок может быть отключен глобально путём запуска @code{guix-daemon} с @code{--no-substitutes} (@pxref{Invoking guix-daemon}). Также он может отключиться временно путём указания опции @code{--no-substitutes} в @command{guix package}, @command{guix build} и других инструментах командной строки."
 
 #. type: cindex
-#: doc/guix.texi:3311
+#: doc/guix.texi:3332
 #, no-wrap
 msgid "digital signatures"
 msgstr "цифровые подписи"
 
 #. type: Plain text
-#: doc/guix.texi:3315
+#: doc/guix.texi:3336
 msgid "Guix detects and raises an error when attempting to use a substitute that has been tampered with.  Likewise, it ignores substitutes that are not signed, or that are not signed by one of the keys listed in the ACL."
 msgstr "Guix определяет и вызывает ошибку, если происходит попытка использовать поддельную подстановку. А также он игнорирует подстановки, которые не подписаны, или те, которые не подписаны ни одним ключом из списка ACL."
 
 #. type: Plain text
-#: doc/guix.texi:3321
+#: doc/guix.texi:3342
 msgid "There is one exception though: if an unauthorized server provides substitutes that are @emph{bit-for-bit identical} to those provided by an authorized server, then the unauthorized server becomes eligible for downloads.  For example, assume we have chosen two substitute servers with this option:"
 msgstr "Но всё же есть одно исключение: если не авторизованный сервер предоставляет подстановки, которые являются @emph{идентичными бит-к-биту} с теми, которые предоставляет авторизованный сервер, тогда неавторизованный сервер становится приемлемым для скачивания. Например, положим, мы выбрали два сервера подстановок такой опцией:"
 
 #. type: example
-#: doc/guix.texi:3324
+#: doc/guix.texi:3345
 #, no-wrap
 msgid "--substitute-urls=\"https://a.example.org https://b.example.org\"\n"
 msgstr "--substitute-urls=\"https://a.example.org https://b.example.org\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:3335
+#: doc/guix.texi:3356
 msgid "If the ACL contains only the key for @code{b.example.org}, and if @code{a.example.org} happens to serve the @emph{exact same} substitutes, then Guix will download substitutes from @code{a.example.org} because it comes first in the list and can be considered a mirror of @code{b.example.org}.  In practice, independent build machines usually produce the same binaries, thanks to bit-reproducible builds (see below)."
 msgstr "Если ACL содержит только ключ для @code{b.example.org}, и если вдруг @code{a.example.org} предоставляет @emph{идентичные} подстановки, тогда Guix будет скачивать подстановки из @code{a.example.org}, потому что он идёт первым в списке и может рассматриваться как зеркало @code{b.example.org}. На практике независимые машины сборки обычно производят одинаковые бинарники благодаря воспроизводимым сборкам (смотрите ниже)."
 
 #. type: Plain text
-#: doc/guix.texi:3342
+#: doc/guix.texi:3363
 msgid "When using HTTPS, the server's X.509 certificate is @emph{not} validated (in other words, the server is not authenticated), contrary to what HTTPS clients such as Web browsers usually do.  This is because Guix authenticates substitute information itself, as explained above, which is what we care about (whereas X.509 certificates are about authenticating bindings between domain names and public keys.)"
 msgstr "При использовании HTTPS, сертификат X.509 сервера @emph{не} проверяется (другими словами, сервер не проходит аутентификацию), супротив тому, что HTTPS-клиенты, как веб-браузеры, обычно делают это. Это потому, что Guix аутентифицирует саму информацию подстановки, как это описано выше, что собственно и представляет для нас интерес (в то время, как сертификаты X.509 относятся к аутентификации связок между доменными именами и публичными ключами)."
 
 #. type: Plain text
-#: doc/guix.texi:3354
+#: doc/guix.texi:3375
 msgid "Substitutes are downloaded over HTTP or HTTPS.  The @code{http_proxy} environment variable can be set in the environment of @command{guix-daemon} and is honored for downloads of substitutes.  Note that the value of @code{http_proxy} in the environment where @command{guix build}, @command{guix package}, and other client commands are run has @emph{absolutely no effect}."
 msgstr "Подстановки скачиваются через HTTP или HTTPS. Можно установить переменную окружения @code{http_proxy} в окружении  @command{guix-daemon}, чтобы она учитывалась при скачивании. Отметим, что значение @code{http_proxy} в окружении, в котором запускаются  @command{guix build}, @command{guix package} и другие клиентские команды @emph{совершенно не даёт эффекта}."
 
 #. type: Plain text
-#: doc/guix.texi:3363
+#: doc/guix.texi:3384
 msgid "Even when a substitute for a derivation is available, sometimes the substitution attempt will fail.  This can happen for a variety of reasons: the substitute server might be offline, the substitute may recently have been deleted, the connection might have been interrupted, etc."
 msgstr "Даже когда подстановка для деривации доступна, иногда попытка подстановки завершается неудачно. Это может происходить по разным причинам: сервер подстановок может быть отключен, подстановка могла быть недавно удалена, связь может прерываться и т.д."
 
 #. type: Plain text
-#: doc/guix.texi:3377
+#: doc/guix.texi:3398
 msgid "When substitutes are enabled and a substitute for a derivation is available, but the substitution attempt fails, Guix will attempt to build the derivation locally depending on whether or not @code{--fallback} was given (@pxref{fallback-option,, common build option @code{--fallback}}).  Specifically, if @code{--fallback} was omitted, then no local build will be performed, and the derivation is considered to have failed.  However, if @code{--fallback} was given, then Guix will attempt to build the derivation locally, and the success or failure of the derivation depends on the success or failure of the local build.  Note that when substitutes are disabled or no substitute is available for the derivation in question, a local build will @emph{always} be performed, regardless of whether or not @code{--fallback} was given."
 msgstr "Когда подстановки включены, и подстановка для деривации доступна, но попытка подстановки завершается с ошибкой, Guix будет пытаться собрать деривацию локально в зависимости от того, задана или нет опция @code{--fallback} (@pxref{fallback-option,, common build option @code{--fallback}}). То есть, если @code{--fallback} пропущена, тогда локальная сборка не будет выполняться, а деривация будет рассматриваться как неудачная. Однако, если @code{--fallback} задана, тогда Guix попытается собрать деривацию локально, и успех или неудача деривации будет зависеть от успешной или неудачной процедуры локальной сборки. Отметим, что когда подстановки отключены или нет доступных подстановок для деривации, локальная сборка @emph{всегда} будет исполняться, вне зависимости от установки опции @code{--fallback}."
 
 #. type: Plain text
-#: doc/guix.texi:3382
+#: doc/guix.texi:3403
 msgid "To get an idea of how many substitutes are available right now, you can try running the @command{guix weather} command (@pxref{Invoking guix weather}).  This command provides statistics on the substitutes provided by a server."
 msgstr "Чтобы узнать,. сколько подстановок доступны в данный момент, можно попробовать запустить команду @command{guix weather} (@pxref{Invoking guix weather}). Эта команда предоставляет статистику подстановок, предоставляемых сервером."
 
 #. type: cindex
-#: doc/guix.texi:3386
+#: doc/guix.texi:3407
 #, no-wrap
 msgid "trust, of pre-built binaries"
 msgstr "доверие, собранным бинарникам"
 
 #. type: Plain text
-#: doc/guix.texi:3396
+#: doc/guix.texi:3417
 msgid "Today, each individual's control over their own computing is at the mercy of institutions, corporations, and groups with enough power and determination to subvert the computing infrastructure and exploit its weaknesses.  While using @code{@value{SUBSTITUTE-SERVER}} substitutes can be convenient, we encourage users to also build on their own, or even run their own build farm, such that @code{@value{SUBSTITUTE-SERVER}} is less of an interesting target.  One way to help is by publishing the software you build using @command{guix publish} so that others have one more choice of server to download substitutes from (@pxref{Invoking guix publish})."
 msgstr "Сегодня индивидуальный контроль над работой за компьютером находится в заложниках у корпораций, организаций и групп, которые имеют достаточно силы и решимости разрушить инфраструктуру компьютерных сетей и внедрить уязвимости. Использование подстановок @code{@value{SUBSTITUTE-SERVER}} может быть удобным, мы также стимулируем пользователей собирать их у себя или даже устанавливать собственные фермы сборки, чтобы уменьшить зависимость от @code{@value{SUBSTITUTE-SERVER}}. Одним из способов помочь является публикация программного обеспечения, которое вы собираете, используя @command{guix publish}, тогда другие получат дополнительный сервер на выбор, чтобы скачивать подстановки (@pxref{Invoking guix publish})."
 
 #. type: Plain text
-#: doc/guix.texi:3408
+#: doc/guix.texi:3429
 msgid "Guix has the foundations to maximize build reproducibility (@pxref{Features}).  In most cases, independent builds of a given package or derivation should yield bit-identical results.  Thus, through a diverse set of independent package builds, we can strengthen the integrity of our systems.  The @command{guix challenge} command aims to help users assess substitute servers, and to assist developers in finding out about non-deterministic package builds (@pxref{Invoking guix challenge}).  Similarly, the @option{--check} option of @command{guix build} allows users to check whether previously-installed substitutes are genuine by rebuilding them locally (@pxref{build-check, @command{guix build --check}})."
 msgstr "Guix определяет цель максимизировать воспроизводимость сборок (@pxref{Features}). В большинстве случаев независимые сборки заданного пакета или деривации должны давать результаты, идентичные до бита. То есть, благодаря ряду независимых сборок пакета мы можем улучшить чистоту наших систем. Команда @command{guix challenge} должна помочь пользователям оценить серверы подстановок, а разработчикам - помочь выявить недетерминистические сборки пакетов (@pxref{Invoking guix challenge}). Подобным образом опция @option{--check} команды @command{guix build} даёт возможность пользователям проверить, яляются ли установленные ранее подстановки подлинными, выполнив их локальную сборку (@pxref{build-check, @command{guix build --check}})."
 
 #. type: Plain text
-#: doc/guix.texi:3412
+#: doc/guix.texi:3433
 msgid "In the future, we want Guix to have support to publish and retrieve binaries to/from other users, in a peer-to-peer fashion.  If you would like to discuss this project, join us on @email{guix-devel@@gnu.org}."
 msgstr "Мы хотим, чтобы Guix в будущем поддерживал публикации и запросы бинарников от/для пользователей в формате равноправного обмена (peer-to-peer). Если вы желаете обсудить этот проект, присоединяйтесь к нам @email{guix-devel@@gnu.org}."
 
 #. type: cindex
-#: doc/guix.texi:3416
+#: doc/guix.texi:3437
 #, no-wrap
 msgid "multiple-output packages"
 msgstr "пакеты со множественным результатом"
 
 #. type: cindex
-#: doc/guix.texi:3417
+#: doc/guix.texi:3438
 #, no-wrap
 msgid "package outputs"
 msgstr "результаты пакета"
 
 #. type: cindex
-#: doc/guix.texi:3418
+#: doc/guix.texi:3439
 #, no-wrap
 msgid "outputs"
 msgstr "результаты"
 
 #. type: Plain text
-#: doc/guix.texi:3428
+#: doc/guix.texi:3449
 msgid "Often, packages defined in Guix have a single @dfn{output}---i.e., the source package leads to exactly one directory in the store.  When running @command{guix install glibc}, one installs the default output of the GNU libc package; the default output is called @code{out}, but its name can be omitted as shown in this command.  In this particular case, the default output of @code{glibc} contains all the C header files, shared libraries, static libraries, Info documentation, and other supporting files."
 msgstr "Часто пакеты, определённые в Guix, имеют один @dfn{выход}, это значит, что исходный пакет даёт только одну директорию на складе. При запуске @command{guix package -i glibc} это устанавливает результат по умолчанию; результат по умолчанию называется @code{выходом}, но его имя может пропускаться, как показано в этой команде. В этом частном случае результат по умолчанию для @code{glibc} содержит все файлы заголовков C, разделяемые библиотеки, статические библиотеки, документацию Info и другие поставляемые файлы."
 
 #. type: Plain text
-#: doc/guix.texi:3436
+#: doc/guix.texi:3457
 msgid "Sometimes it is more appropriate to separate the various types of files produced from a single source package into separate outputs.  For instance, the GLib C library (used by GTK+ and related packages)  installs more than 20 MiB of reference documentation as HTML pages.  To save space for users who do not need it, the documentation goes to a separate output, called @code{doc}.  To install the main GLib output, which contains everything but the documentation, one would run:"
 msgstr "Часто более приемлемым будет разделить различные типы файлов, поставляемых одним исходным пакетом, на отдельные выходы (результаты). Например, библиотека GLib C, используемая GTK+ и связанными с ним пакетами, устанавливает более 20Мб связанной документации в виде страниц HTML. Чтобы экономить место, пользователи, которым это не нужно, документацию можно выделить в отдельный выход, называемый @code{doc}. Чтобы установить основной выход GLib, который содерит всё, кроме документации, можно запустить:"
 
 #. type: example
-#: doc/guix.texi:3439
+#: doc/guix.texi:3460
 #, no-wrap
 msgid "guix install glib\n"
 msgstr "guix install glib\n"
 
 #. type: item
-#: doc/guix.texi:3441 doc/guix.texi:27618 doc/guix.texi:27643
+#: doc/guix.texi:3462 doc/guix.texi:27901 doc/guix.texi:27926
 #, no-wrap
 msgid "documentation"
 msgstr "документация"
 
 #. type: Plain text
-#: doc/guix.texi:3443
+#: doc/guix.texi:3464
 msgid "The command to install its documentation is:"
 msgstr "Команда для установки её документации:"
 
 #. type: example
-#: doc/guix.texi:3446
+#: doc/guix.texi:3467
 #, no-wrap
 msgid "guix install glib:doc\n"
 msgstr "guix install glib:doc\n"
 
 #. type: Plain text
-#: doc/guix.texi:3457
+#: doc/guix.texi:3478
 #, fuzzy
 msgid "Some packages install programs with different ``dependency footprints''.  For instance, the WordNet package installs both command-line tools and graphical user interfaces (GUIs).  The former depend solely on the C library, whereas the latter depend on Tcl/Tk and the underlying X libraries.  In this case, we leave the command-line tools in the default output, whereas the GUIs are in a separate output.  This allows users who do not need the GUIs to save space.  The @command{guix size} command can help find out about such situations (@pxref{Invoking guix size}).  @command{guix graph} can also be helpful (@pxref{Invoking guix graph})."
 msgstr ""
@@ -8082,484 +8239,484 @@ msgstr ""
 "Некоторые пакеты устанавливают программы с различными \"отпечатками зависимостей\". Например, пакет WordNet устанавливает и инструменты командной строки, и графический интерфейс (GUI). Первое зависит только от библиотеки C, а последнее зависит от Tcl/Tk и библиотек X. В таком случае мы оставляем инструменты командной строки в качестве результата (выхода) по умолчанию, в то время как GUI поставляется как отдельный выход. Это экономит место для пользователей, которым не нужен GUI. Команда @command{guix size} может помочь выявить такие ситуации (@pxref{Invoking guix size}). @command{guix graph} также полезна (@pxref{Invoking guix graph})."
 
 #. type: Plain text
-#: doc/guix.texi:3465
+#: doc/guix.texi:3486
 msgid "There are several such multiple-output packages in the GNU distribution.  Other conventional output names include @code{lib} for libraries and possibly header files, @code{bin} for stand-alone programs, and @code{debug} for debugging information (@pxref{Installing Debugging Files}).  The outputs of a packages are listed in the third column of the output of @command{guix package --list-available} (@pxref{Invoking guix package})."
 msgstr "Есть несколько таких пакетов со множественным выходом в дистрибутиве GNU. Другие традиционные имена выходов включают @code{lib} - для библиотек и иногда файлов заголовков, @code{bin} - для самих программ, @code{debug} - для отладочной информации (@pxref{Installing Debugging Files}). Выходы пакетов представлены в третьей колонке вывода @command{guix package --list-available} (@pxref{Invoking guix package})."
 
 #. type: section
-#: doc/guix.texi:3468
+#: doc/guix.texi:3489
 #, no-wrap
 msgid "Invoking @command{guix gc}"
 msgstr "Вызов @command{guix gc}"
 
 #. type: cindex
-#: doc/guix.texi:3470
+#: doc/guix.texi:3491
 #, no-wrap
 msgid "garbage collector"
 msgstr "сборщик мусора"
 
 #. type: cindex
-#: doc/guix.texi:3471
+#: doc/guix.texi:3492
 #, no-wrap
 msgid "disk space"
 msgstr "место на диске"
 
 #. type: Plain text
-#: doc/guix.texi:3477
+#: doc/guix.texi:3498
 msgid "Packages that are installed, but not used, may be @dfn{garbage-collected}.  The @command{guix gc} command allows users to explicitly run the garbage collector to reclaim space from the @file{/gnu/store} directory.  It is the @emph{only} way to remove files from @file{/gnu/store}---removing files or directories manually may break it beyond repair!"
 msgstr "Пакеты, которые установлены, но не используются, могут быть очищены как мусор (@dfn{garbage-collected}).  Команда @command{guix gc} позволяет пользователям непосредственно запустить сборщик мусора и восстановить место в директории @file{/gnu/store}. Это @emph{единственный} способ удалить файлы из @file{/gnu/store} --- удаление файлов вручную может поломать её безвозвратно!"
 
 #. type: Plain text
-#: doc/guix.texi:3488
+#: doc/guix.texi:3509
 msgid "The garbage collector has a set of known @dfn{roots}: any file under @file{/gnu/store} reachable from a root is considered @dfn{live} and cannot be deleted; any other file is considered @dfn{dead} and may be deleted.  The set of garbage collector roots (``GC roots'' for short)  includes default user profiles; by default, the symlinks under @file{/var/guix/gcroots} represent these GC roots.  New GC roots can be added with @command{guix build --root}, for example (@pxref{Invoking guix build}).  The @command{guix gc --list-roots} command lists them."
 msgstr "Сборщик мусора имеет набор известных корней (@dfn{roots}): любой файл в @file{/gnu/store}, доступный из корня, рассматривается как живой (@dfn{live}) и не может быть удалён; любой другой файл рассматривается как мёртвый (@dfn{dead}) и может быть удалён. Набор корней сборщика мусора (сокращённо \"GC roots\") содержит профили пользователей по умолчанию; по умолчанию символические ссылки в @file{/var/guix/gcroots} представляют эти корни сборщика мусора. Новые корни могут добавляться, например, командой @command{guix build --root} (@pxref{Invoking guix build}). Команда @command{guix gc --list-roots} отображает их."
 
 #. type: Plain text
-#: doc/guix.texi:3494
+#: doc/guix.texi:3515
 msgid "Prior to running @code{guix gc --collect-garbage} to make space, it is often useful to remove old generations from user profiles; that way, old package builds referenced by those generations can be reclaimed.  This is achieved by running @code{guix package --delete-generations} (@pxref{Invoking guix package})."
 msgstr "Перед запуском @code{guix gc --collect-garbage} для освобождения места часто бывает полезно удалить старые поколения из пользовательских профилей; так старые пакеты, относящиеся к этим поколениям, будут удалены. Это можно сделать, запустив @code{guix package --delete-generations} (@pxref{Invoking guix package})."
 
 #. type: Plain text
-#: doc/guix.texi:3498
+#: doc/guix.texi:3519
 msgid "Our recommendation is to run a garbage collection periodically, or when you are short on disk space.  For instance, to guarantee that at least 5@tie{}GB are available on your disk, simply run:"
 msgstr "Мы рекомендуем запускать сборщик мусора периодически, или когда вы хотите освободить место на диске. Например, чтобы гарантировать, что по меньшей мере 5@tie{}Гб будет доступно на вашем диске, просто запустите:"
 
 #. type: example
-#: doc/guix.texi:3501
+#: doc/guix.texi:3522
 #, no-wrap
 msgid "guix gc -F 5G\n"
 msgstr "guix gc -F 5G\n"
 
 #. type: Plain text
-#: doc/guix.texi:3510
+#: doc/guix.texi:3531
 msgid "It is perfectly safe to run as a non-interactive periodic job (@pxref{Scheduled Job Execution}, for how to set up such a job).  Running @command{guix gc} with no arguments will collect as much garbage as it can, but that is often inconvenient: you may find yourself having to rebuild or re-download software that is ``dead'' from the GC viewpoint but that is necessary to build other pieces of software---e.g., the compiler tool chain."
 msgstr "Хорошо бы запускать это как неинтерактивную периодическую задачу (@pxref{Scheduled Job Execution}, чтобы узнать, как добавить такую задачу). Запуск @command{guix gc} без аргументов соберёт столько мусора, сколько возможно, но это часто не удобно: можно обнаружить, что придётся заново собирать или скачивать программы, \"убитые\" сборщиком мусора, хотя они необходимы для сборки другого софта, например, это касается инструментов компилятора."
 
 #. type: Plain text
-#: doc/guix.texi:3516
+#: doc/guix.texi:3537
 msgid "The @command{guix gc} command has three modes of operation: it can be used to garbage-collect any dead files (the default), to delete specific files (the @code{--delete} option), to print garbage-collector information, or for more advanced queries.  The garbage collection options are as follows:"
 msgstr "Команда @command{guix gc} предоставляет три способа взаимодействия: может использоваться для сборки мусора (garbage-collect) любых мёртвых файлов (по умолчанию), для удаления конкретных файлов (опция @code{--delete}), для вывода информации сборщика мусора, а также для более изощрённых запросов. Опции сборщика мусора:"
 
 #. type: item
-#: doc/guix.texi:3518
+#: doc/guix.texi:3539
 #, no-wrap
 msgid "--collect-garbage[=@var{min}]"
 msgstr "--collect-garbage[=@var{min}]"
 
 #. type: itemx
-#: doc/guix.texi:3519
+#: doc/guix.texi:3540
 #, no-wrap
 msgid "-C [@var{min}]"
 msgstr "-C [@var{min}]"
 
 #. type: table
-#: doc/guix.texi:3523
+#: doc/guix.texi:3544
 msgid "Collect garbage---i.e., unreachable @file{/gnu/store} files and sub-directories.  This is the default operation when no option is specified."
 msgstr "Собрать мусор, то есть недоступные файлы в @file{/gnu/store} и поддиректориях. Это операция по умолчанию, если не заданы опции."
 
 #. type: table
-#: doc/guix.texi:3528
+#: doc/guix.texi:3549
 msgid "When @var{min} is given, stop once @var{min} bytes have been collected.  @var{min} may be a number of bytes, or it may include a unit as a suffix, such as @code{MiB} for mebibytes and @code{GB} for gigabytes (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})."
 msgstr "Если задана @var{min}, остановиться, когда @var{min} байт собрано.  @var{min} может быть числом байт или может содержать единицу измерения в суффиксе, как например, @code{MiB} для мебибайт и @code{GB} гигабайт (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})."
 
 #. type: table
-#: doc/guix.texi:3530
+#: doc/guix.texi:3551
 msgid "When @var{min} is omitted, collect all the garbage."
 msgstr "Если @var{min} пропущено, собрать весь мусор."
 
 #. type: item
-#: doc/guix.texi:3531
+#: doc/guix.texi:3552
 #, no-wrap
 msgid "--free-space=@var{free}"
 msgstr "--free-space=@var{free}"
 
 #. type: itemx
-#: doc/guix.texi:3532
+#: doc/guix.texi:3553
 #, no-wrap
 msgid "-F @var{free}"
 msgstr "-F @var{free}"
 
 #. type: table
-#: doc/guix.texi:3536
+#: doc/guix.texi:3557
 msgid "Collect garbage until @var{free} space is available under @file{/gnu/store}, if possible; @var{free} denotes storage space, such as @code{500MiB}, as described above."
 msgstr "Собирать мусор, пока не станет доступно @var{free} места в @file{/gnu/store}, если возможно; @var{free} описывает дисковое пространство, как @code{500MiB}, как это описанов выше."
 
 #. type: table
-#: doc/guix.texi:3539
+#: doc/guix.texi:3560
 msgid "When @var{free} or more is already available in @file{/gnu/store}, do nothing and exit immediately."
 msgstr "Когда @var{free} или более места стало свободно в @file{/gnu/store}, ничего не делать и немедленно выйти."
 
 #. type: item
-#: doc/guix.texi:3540
+#: doc/guix.texi:3561
 #, no-wrap
 msgid "--delete-generations[=@var{duration}]"
 msgstr "--delete-generations[=@var{duration}]"
 
 #. type: itemx
-#: doc/guix.texi:3541
+#: doc/guix.texi:3562
 #, no-wrap
 msgid "-d [@var{duration}]"
 msgstr "-d [@var{duration}]"
 
 #. type: table
-#: doc/guix.texi:3545
+#: doc/guix.texi:3566
 msgid "Before starting the garbage collection process, delete all the generations older than @var{duration}, for all the user profiles; when run as root, this applies to all the profiles @emph{of all the users}."
 msgstr "Перед запуском сборщика мусора удалить все поколения, старше @var{duration}, для всех пользовательских профилей; если запускать от root, это применяется для всех профилей @emph{всех пользователей}."
 
 #. type: table
-#: doc/guix.texi:3549
+#: doc/guix.texi:3570
 msgid "For example, this command deletes all the generations of all your profiles that are older than 2 months (except generations that are current), and then proceeds to free space until at least 10 GiB are available:"
 msgstr "Например, следующая команда удаляет все поколения всех ваших профилей, которые старше 2 месцев (кроме текущего поколения), а затем запускается процесс освобождения мместа, пока по меньшей мере 10 GiB не станет доступно:"
 
 #. type: example
-#: doc/guix.texi:3552
+#: doc/guix.texi:3573
 #, no-wrap
 msgid "guix gc -d 2m -F 10G\n"
 msgstr "guix gc -d 2m -F 10G\n"
 
 #. type: item
-#: doc/guix.texi:3554
+#: doc/guix.texi:3575
 #, no-wrap
 msgid "--delete"
 msgstr "--delete"
 
 #. type: itemx
-#: doc/guix.texi:3555
+#: doc/guix.texi:3576
 #, no-wrap
 msgid "-D"
 msgstr "-D"
 
 #. type: table
-#: doc/guix.texi:3559
+#: doc/guix.texi:3580
 msgid "Attempt to delete all the store files and directories specified as arguments.  This fails if some of the files are not in the store, or if they are still live."
 msgstr "Попытаться удалить все файлы и директории склада, приведённые в аргументах. Это завершается с ошибкой, если какие-либо файлы не присутствуют на складе, или если они ещё живы (live)."
 
 #. type: item
-#: doc/guix.texi:3560
+#: doc/guix.texi:3581
 #, no-wrap
 msgid "--list-failures"
 msgstr "--list-failures"
 
 #. type: table
-#: doc/guix.texi:3562
+#: doc/guix.texi:3583
 msgid "List store items corresponding to cached build failures."
 msgstr "Вывести список элементов склада, которые относятся к кешированным неудачным сборкам."
 
 #. type: table
-#: doc/guix.texi:3566
+#: doc/guix.texi:3587
 msgid "This prints nothing unless the daemon was started with @option{--cache-failures} (@pxref{Invoking guix-daemon, @option{--cache-failures}})."
 msgstr "Это ничего не выводит, если демон не был запущен с опцией @option{--cache-failures} (@pxref{Invoking guix-daemon, @option{--cache-failures}})."
 
 #. type: item
-#: doc/guix.texi:3567
+#: doc/guix.texi:3588
 #, no-wrap
 msgid "--list-roots"
 msgstr "--list-roots"
 
 #. type: table
-#: doc/guix.texi:3570
+#: doc/guix.texi:3591
 msgid "List the GC roots owned by the user; when run as root, list @emph{all} the GC roots."
 msgstr "Вывести список корней сборщика мусора (GC roots), которыми владеет пользователь; при запуске от root, выводит список @emph{всех} корней сборщика мусора."
 
 #. type: item
-#: doc/guix.texi:3571
+#: doc/guix.texi:3592
 #, fuzzy, no-wrap
 #| msgid "--list-roots"
 msgid "--list-busy"
 msgstr "--list-roots"
 
 #. type: table
-#: doc/guix.texi:3574
+#: doc/guix.texi:3595
 msgid "List store items in use by currently running processes.  These store items are effectively considered GC roots: they cannot be deleted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3575
+#: doc/guix.texi:3596
 #, no-wrap
 msgid "--clear-failures"
 msgstr "--clear-failures"
 
 #. type: table
-#: doc/guix.texi:3577
+#: doc/guix.texi:3598
 msgid "Remove the specified store items from the failed-build cache."
 msgstr "Удалить заданные элементы склада из кеша неудачных сборок."
 
 #. type: table
-#: doc/guix.texi:3580
+#: doc/guix.texi:3601
 msgid "Again, this option only makes sense when the daemon is started with @option{--cache-failures}.  Otherwise, it does nothing."
 msgstr "Опять же эта опция имеет смысл, если демон запущен с @option{--cache-failures}. В противном случае это не имеет эффекта."
 
 #. type: item
-#: doc/guix.texi:3581
+#: doc/guix.texi:3602
 #, no-wrap
 msgid "--list-dead"
 msgstr "--list-dead"
 
 #. type: table
-#: doc/guix.texi:3584
+#: doc/guix.texi:3605
 msgid "Show the list of dead files and directories still present in the store---i.e., files and directories no longer reachable from any root."
 msgstr "Вывести список мёртвых файлов и директорий, которые по-прежнему присутствуют на складе, то есть файлы и директории, не доступные более из любого корня."
 
 #. type: item
-#: doc/guix.texi:3585
+#: doc/guix.texi:3606
 #, no-wrap
 msgid "--list-live"
 msgstr "--list-live"
 
 #. type: table
-#: doc/guix.texi:3587
+#: doc/guix.texi:3608
 msgid "Show the list of live store files and directories."
 msgstr "Вывести список живых файлов и директорий склада."
 
 #. type: Plain text
-#: doc/guix.texi:3591
+#: doc/guix.texi:3612
 msgid "In addition, the references among existing store files can be queried:"
 msgstr "В дополнение можно запросить связи между существующими файлами на складе:"
 
 #. type: item
-#: doc/guix.texi:3594
+#: doc/guix.texi:3615
 #, no-wrap
 msgid "--references"
 msgstr "--references"
 
 #. type: itemx
-#: doc/guix.texi:3595
+#: doc/guix.texi:3616
 #, no-wrap
 msgid "--referrers"
 msgstr "--referrers"
 
 #. type: cindex
-#: doc/guix.texi:3596 doc/guix.texi:9912
+#: doc/guix.texi:3617 doc/guix.texi:10011
 #, no-wrap
 msgid "package dependencies"
 msgstr "зависимости пакетов"
 
 #. type: table
-#: doc/guix.texi:3599
+#: doc/guix.texi:3620
 msgid "List the references (respectively, the referrers) of store files given as arguments."
 msgstr "Вывести список связанных (обязательно, ссылающихся) файлов на складе с указанными аргументами."
 
 #. type: item
-#: doc/guix.texi:3600
+#: doc/guix.texi:3621
 #, no-wrap
 msgid "--requisites"
 msgstr "--requisites"
 
 #. type: itemx
-#: doc/guix.texi:3601 doc/guix.texi:5141
+#: doc/guix.texi:3622 doc/guix.texi:5151
 #, no-wrap
 msgid "-R"
 msgstr "-R"
 
 #. type: item
-#: doc/guix.texi:3602 doc/guix.texi:9781 doc/guix.texi:9809 doc/guix.texi:9877
+#: doc/guix.texi:3623 doc/guix.texi:9880 doc/guix.texi:9908 doc/guix.texi:9976
 #, no-wrap
 msgid "closure"
 msgstr "конвейер"
 
 #. type: table
-#: doc/guix.texi:3607
+#: doc/guix.texi:3628
 msgid "List the requisites of the store files passed as arguments.  Requisites include the store files themselves, their references, and the references of these, recursively.  In other words, the returned list is the @dfn{transitive closure} of the store files."
 msgstr "Вывести всё необходимое для файлов на складе, указанных в аргументах. Всё необходимое включает сами файлы на складе, их связи и связи их связей рекурсивно. Другими словами, выводимый список --- это @dfn{непосредственный конвейер} файлов на складе."
 
 #. type: table
-#: doc/guix.texi:3611
+#: doc/guix.texi:3632
 msgid "@xref{Invoking guix size}, for a tool to profile the size of the closure of an element.  @xref{Invoking guix graph}, for a tool to visualize the graph of references."
 msgstr "См. @xref{Invoking guix size} для информации об инструменте профилирования конвейера для элемента. См. @xref{Invoking guix graph} для информации об инструменте визуализации графа связей."
 
 #. type: item
-#: doc/guix.texi:3612
+#: doc/guix.texi:3633
 #, no-wrap
 msgid "--derivers"
 msgstr "--derivers"
 
 #. type: item
-#: doc/guix.texi:3613 doc/guix.texi:5336 doc/guix.texi:10013
+#: doc/guix.texi:3634 doc/guix.texi:5346 doc/guix.texi:10112
 #, no-wrap
 msgid "derivation"
 msgstr "деривация"
 
 #. type: table
-#: doc/guix.texi:3616
+#: doc/guix.texi:3637
 msgid "Return the derivation(s) leading to the given store items (@pxref{Derivations})."
 msgstr "Вернуть деривацию(-ии), производящие данные элементы склада (@pxref{Derivations})."
 
 #. type: table
-#: doc/guix.texi:3618
+#: doc/guix.texi:3639
 msgid "For example, this command:"
 msgstr "Например, эта команда:"
 
 #. type: example
-#: doc/guix.texi:3621
+#: doc/guix.texi:3642
 #, no-wrap
 msgid "guix gc --derivers `guix package -I ^emacs$ | cut -f4`\n"
 msgstr "guix gc --derivers `guix package -I ^emacs$ | cut -f4`\n"
 
 #. type: table
-#: doc/guix.texi:3626
+#: doc/guix.texi:3647
 msgid "returns the @file{.drv} file(s) leading to the @code{emacs} package installed in your profile."
 msgstr "возвращает файл(ы) @file{.drv}, которые произвели пакет @code{emacs}, установленный в вашем профиле."
 
 #. type: table
-#: doc/guix.texi:3630
+#: doc/guix.texi:3651
 msgid "Note that there may be zero matching @file{.drv} files, for instance because these files have been garbage-collected.  There can also be more than one matching @file{.drv} due to fixed-output derivations."
 msgstr "Отметим, что может быть не найдено ни одного файла @file{.drv}, например, потому что эти файлы были удалены сборщиком мусора. Также может быть более одного файла @file{.drv} из-за дериваций с фиксированным выходом."
 
 #. type: Plain text
-#: doc/guix.texi:3634
+#: doc/guix.texi:3655
 msgid "Lastly, the following options allow you to check the integrity of the store and to control disk usage."
 msgstr "Наконец, следующие опции позволяют проверить целостность склада и контролировать использование диска."
 
 #. type: item
-#: doc/guix.texi:3637
+#: doc/guix.texi:3658
 #, no-wrap
 msgid "--verify[=@var{options}]"
 msgstr "--verify[=@var{options}]"
 
 #. type: cindex
-#: doc/guix.texi:3638
+#: doc/guix.texi:3659
 #, no-wrap
 msgid "integrity, of the store"
 msgstr "целостность, склада"
 
 #. type: cindex
-#: doc/guix.texi:3639
+#: doc/guix.texi:3660
 #, no-wrap
 msgid "integrity checking"
 msgstr "проверка целостности"
 
 #. type: table
-#: doc/guix.texi:3641
+#: doc/guix.texi:3662
 msgid "Verify the integrity of the store."
 msgstr "Проверить целостность склада."
 
 #. type: table
-#: doc/guix.texi:3644
+#: doc/guix.texi:3665
 msgid "By default, make sure that all the store items marked as valid in the database of the daemon actually exist in @file{/gnu/store}."
 msgstr "По умолчанию убедиться, что все элементы склада, которые в базе данных демона помечены как действующие, на самом деле присутствуют в @file{/gnu/store}."
 
 #. type: table
-#: doc/guix.texi:3647
+#: doc/guix.texi:3668
 msgid "When provided, @var{options} must be a comma-separated list containing one or more of @code{contents} and @code{repair}."
 msgstr "Опции @var{options}, если они указаны, должны представлять собой список, разделённый запятыми, содержащий одно или более значений @code{contents} и @code{repair}."
 
 #. type: table
-#: doc/guix.texi:3653
+#: doc/guix.texi:3674
 msgid "When passing @option{--verify=contents}, the daemon computes the content hash of each store item and compares it against its hash in the database.  Hash mismatches are reported as data corruptions.  Because it traverses @emph{all the files in the store}, this command can take a long time, especially on systems with a slow disk drive."
 msgstr "Если задано @option{--verify=contents}, демон вычисляет хеш содержимого каждого элемента склада и сравнивает с его хешем в базе данных. Несовпадения хеша отображаются в отчёте как повреждение данных. Так как она проходит @emph{все файлы склада}, эта команда может занять много времени, особенно в системах с медленным диском."
 
 #. type: cindex
-#: doc/guix.texi:3654
+#: doc/guix.texi:3675
 #, no-wrap
 msgid "repairing the store"
 msgstr "восстановление склада"
 
 #. type: cindex
-#: doc/guix.texi:3655 doc/guix.texi:8595
+#: doc/guix.texi:3676 doc/guix.texi:8694
 #, no-wrap
 msgid "corruption, recovering from"
 msgstr "разрушение, его восстановление"
 
 #. type: table
-#: doc/guix.texi:3663
+#: doc/guix.texi:3684
 msgid "Using @option{--verify=repair} or @option{--verify=contents,repair} causes the daemon to try to repair corrupt store items by fetching substitutes for them (@pxref{Substitutes}).  Because repairing is not atomic, and thus potentially dangerous, it is available only to the system administrator.  A lightweight alternative, when you know exactly which items in the store are corrupt, is @command{guix build --repair} (@pxref{Invoking guix build})."
 msgstr "Использование @option{--verify=repair} или @option{--verify=contents,repair} указывает демону предпринять попытку восстановить разрушенные элементы склада, выбирая подстановки для них (@pxref{Substitutes}). Так как восстановление не атомарное, и поэтому потенциально опасно, оно доступно только системному администратору. Малозатратная альтернатива в случае, если вы знаете точно, какие элементы склада испорчены, --- это @command{guix build --repair} (@pxref{Invoking guix build})."
 
 #. type: item
-#: doc/guix.texi:3664
+#: doc/guix.texi:3685
 #, no-wrap
 msgid "--optimize"
 msgstr "--optimize"
 
 #. type: table
-#: doc/guix.texi:3668
+#: doc/guix.texi:3689
 msgid "Optimize the store by hard-linking identical files---this is @dfn{deduplication}."
 msgstr "Оптимизировать склад с помощью жёстких ссылок на идентичные файлы --- это @dfn{дедупликация}."
 
 #. type: table
-#: doc/guix.texi:3674
+#: doc/guix.texi:3695
 msgid "The daemon performs deduplication after each successful build or archive import, unless it was started with @code{--disable-deduplication} (@pxref{Invoking guix-daemon, @code{--disable-deduplication}}).  Thus, this option is primarily useful when the daemon was running with @code{--disable-deduplication}."
 msgstr "Демон выполняет дедупликацию после каждой успешной сборки или импорта архива, если конечно оно не было запущено с @code{--disable-deduplication} (@pxref{Invoking guix-daemon, @code{--disable-deduplication}}). Так что эта опция особенно важна, если демон запущено с @code{--disable-deduplication}."
 
 #. type: section
-#: doc/guix.texi:3678
+#: doc/guix.texi:3699
 #, no-wrap
 msgid "Invoking @command{guix pull}"
 msgstr "Вызов @command{guix pull}"
 
 #. type: cindex
-#: doc/guix.texi:3680
+#: doc/guix.texi:3701
 #, no-wrap
 msgid "upgrading Guix"
 msgstr "обновление версии Guix"
 
 #. type: cindex
-#: doc/guix.texi:3681
+#: doc/guix.texi:3702
 #, no-wrap
 msgid "updating Guix"
 msgstr "обновление Guix"
 
 #. type: command{#1}
-#: doc/guix.texi:3682
+#: doc/guix.texi:3703
 #, no-wrap
 msgid "guix pull"
 msgstr "guix pull"
 
 #. type: cindex
-#: doc/guix.texi:3683
+#: doc/guix.texi:3704
 #, no-wrap
 msgid "pull"
 msgstr "получение"
 
 #. type: Plain text
-#: doc/guix.texi:3691
+#: doc/guix.texi:3712
 msgid "Packages are installed or upgraded to the latest version available in the distribution currently available on your local machine.  To update that distribution, along with the Guix tools, you must run @command{guix pull}: the command downloads the latest Guix source code and package descriptions, and deploys it.  Source code is downloaded from a @uref{https://git-scm.com, Git} repository, by default the official GNU@tie{}Guix repository, though this can be customized."
 msgstr "Пакеты, которые были установлены или обновлены до последней версии, доступные в дистрибутиве, доступны и на вашей локальной машине. Для обновления этого дистрибутива инструментами Guix нужно запустить @command{guix pull}: команда скачивает последние исходные коды Guix, описания пакетов и разворачивает их. Исходный код скачивается из репозитория @uref{https://git-scm.com, Git}, репозитория GNU@tie{}Guix по умолчанию, хотя это можно поменять."
 
 #. type: Plain text
-#: doc/guix.texi:3694
+#: doc/guix.texi:3715
 msgid "Specifically, @command{guix pull} downloads code from the @dfn{channels} (@pxref{Channels}) specified by one of the followings, in this order:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:3698
+#: doc/guix.texi:3719
 msgid "the @option{--channels} option;"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:3700
+#: doc/guix.texi:3721
 msgid "the user's @file{~/.config/guix/channels.scm} file;"
-msgstr ""
+msgstr "пользовательский файл @file{~/.config/guix/channels.scm};"
 
 #. type: enumerate
-#: doc/guix.texi:3702
+#: doc/guix.texi:3723
 msgid "the system-wide @file{/etc/guix/channels.scm} file;"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:3705
+#: doc/guix.texi:3726
 msgid "the built-in default channels specified in the @code{%default-channels} variable."
-msgstr ""
+msgstr "встроенные по умолчанию каналы определены в переменной @code{%default-channels}."
 
 #. type: Plain text
-#: doc/guix.texi:3712
+#: doc/guix.texi:3733
 msgid "On completion, @command{guix package} will use packages and package versions from this just-retrieved copy of Guix.  Not only that, but all the Guix commands and Scheme modules will also be taken from that latest version.  New @command{guix} sub-commands added by the update also become available."
 msgstr "После выполнения этой команды @command{guix package} будет использовать пакеты и те их версии, которые имеются в только что полученной копии Guix. Эта последняя версия будет источником также всех команд Guix, модулей Scheme. Из этого обновления станет доступен набор команд @command{guix}."
 
 #. type: Plain text
-#: doc/guix.texi:3718
+#: doc/guix.texi:3739
 #, fuzzy
 #| msgid "Any user can update their Guix copy using @command{guix pull}, and the effect is limited to the user who run @command{guix pull}.  For instance, when user @code{root} runs @command{guix pull}, this has no effect on the version of Guix that user @code{alice} sees, and vice versa."
 msgid "Any user can update their Guix copy using @command{guix pull}, and the effect is limited to the user who ran @command{guix pull}.  For instance, when user @code{root} runs @command{guix pull}, this has no effect on the version of Guix that user @code{alice} sees, and vice versa."
 msgstr "Любой пользователь может обновить свою копию Guix, используя @command{guix pull}, эффект коснётся только пользователя, который запустил @command{guix pull}. Например, если пользователь @code{root} запускает @command{guix pull}, это не имеет эффекта на версию Guix, которую видит @code{alice} sees, и наоборот."
 
 #. type: Plain text
-#: doc/guix.texi:3724
+#: doc/guix.texi:3745
 msgid "The result of running @command{guix pull} is a @dfn{profile} available under @file{~/.config/guix/current} containing the latest Guix.  Thus, make sure to add it to the beginning of your search path so that you use the latest version, and similarly for the Info manual (@pxref{Documentation}):"
 msgstr "Результат запуска @command{guix pull} --- это профиль @dfn{profile}, доступный в @file{~/.config/guix/current}, содержащий последний Guix. Так что обязательно добавьте этот адрес первым в пути поиска, чтобы использовать последнюю версию, а также для руководства Info (@pxref{Documentation}):"
 
 #. type: example
-#: doc/guix.texi:3728
+#: doc/guix.texi:3749
 #, no-wrap
 msgid ""
 "export PATH=\"$HOME/.config/guix/current/bin:$PATH\"\n"
@@ -8569,12 +8726,12 @@ msgstr ""
 "export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:3732
+#: doc/guix.texi:3753
 msgid "The @code{--list-generations} or @code{-l} option lists past generations produced by @command{guix pull}, along with details about their provenance:"
 msgstr "Опция @code{--list-generations} или @code{-l} выводит список последних поколений, поставленных @command{guix pull}, вместе с деталями об их происхождении:"
 
 #. type: example
-#: doc/guix.texi:3740
+#: doc/guix.texi:3761
 #, no-wrap
 msgid ""
 "$ guix pull -l\n"
@@ -8594,7 +8751,7 @@ msgstr ""
 "\n"
 
 #. type: example
-#: doc/guix.texi:3750
+#: doc/guix.texi:3771
 #, no-wrap
 msgid ""
 "Generation 2\tJun 11 2018 11:02:49\n"
@@ -8620,7 +8777,7 @@ msgstr ""
 "\n"
 
 #. type: example
-#: doc/guix.texi:3758
+#: doc/guix.texi:3779
 #, no-wrap
 msgid ""
 "Generation 3\tJun 13 2018 23:31:07\t(current)\n"
@@ -8640,19 +8797,19 @@ msgstr ""
 "  69 packages upgraded: borg@@1.1.6, cheese@@3.28.0, @dots{}\n"
 
 #. type: Plain text
-#: doc/guix.texi:3762
+#: doc/guix.texi:3783
 msgid "@xref{Invoking guix describe, @command{guix describe}}, for other ways to describe the current status of Guix."
 msgstr "Смотрите @xref{Invoking guix describe, @command{guix describe}} для информации о других способах получить информацию о текущем статусе Guix."
 
 #. type: Plain text
-#: doc/guix.texi:3767
+#: doc/guix.texi:3788
 #, fuzzy
 #| msgid "This @code{~/.config/guix/current} profile works like any other profile created by @command{guix package} (@pxref{Invoking guix package}).  That is, you can list generations, roll back to the previous generation---i.e., the previous Guix---and so on:"
 msgid "This @code{~/.config/guix/current} profile works exactly like the profiles created by @command{guix package} (@pxref{Invoking guix package}). That is, you can list generations, roll back to the previous generation---i.e., the previous Guix---and so on:"
 msgstr "Этот профиль @code{~/.config/guix/current} работает, как любой другой профиль, созданный @command{guix package} (@pxref{Invoking guix package}). Так что можно вывести список поколений, откатиться до предыдущего поколения, то есть до предыдущего Guix, и так далее:"
 
 #. type: example
-#: doc/guix.texi:3773
+#: doc/guix.texi:3794
 #, fuzzy, no-wrap
 #| msgid ""
 #| "$ guix package -p ~/.config/guix/current --roll-back\n"
@@ -8671,12 +8828,12 @@ msgstr ""
 "deleting /var/guix/profiles/per-user/charlie/current-guix-1-link\n"
 
 #. type: Plain text
-#: doc/guix.texi:3777
+#: doc/guix.texi:3798
 msgid "You can also use @command{guix package} (@pxref{Invoking guix package})  to manage the profile by naming it explicitly:"
-msgstr ""
+msgstr "Вы также можете использовать @command{guix package} (@pxref{Invoking guix package}), чтобы управлять профилем, называя его явно: "
 
 #. type: example
-#: doc/guix.texi:3782
+#: doc/guix.texi:3803
 #, no-wrap
 msgid ""
 "$ guix package -p ~/.config/guix/current --roll-back\n"
@@ -8690,221 +8847,221 @@ msgstr ""
 "deleting /var/guix/profiles/per-user/charlie/current-guix-1-link\n"
 
 #. type: Plain text
-#: doc/guix.texi:3786
+#: doc/guix.texi:3807
 msgid "The @command{guix pull} command is usually invoked with no arguments, but it supports the following options:"
 msgstr "Команда @command{guix pull} обычно вызывается без аргументов, но поддерживает следующие опции:"
 
 #. type: item
-#: doc/guix.texi:3788 doc/guix.texi:4211
+#: doc/guix.texi:3809 doc/guix.texi:4232
 #, no-wrap
 msgid "--url=@var{url}"
 msgstr "--url=@var{url}"
 
 #. type: itemx
-#: doc/guix.texi:3789 doc/guix.texi:4212
+#: doc/guix.texi:3810 doc/guix.texi:4233
 #, no-wrap
 msgid "--commit=@var{commit}"
 msgstr "--commit=@var{commit}"
 
 #. type: itemx
-#: doc/guix.texi:3790 doc/guix.texi:4213
+#: doc/guix.texi:3811 doc/guix.texi:4234
 #, no-wrap
 msgid "--branch=@var{branch}"
 msgstr "--branch=@var{branch}"
 
 #. type: table
-#: doc/guix.texi:3794
+#: doc/guix.texi:3815
 msgid "Download code for the @code{guix} channel from the specified @var{url}, at the given @var{commit} (a valid Git commit ID represented as a hexadecimal string), or @var{branch}."
 msgstr "Скачать код канала @code{guix} из указанного @var{url}, относящийся к обозначенному коммиту @var{commit} (корректный ID коммита Git, представленный в виде шестнадцатеричной строки), или ветке @var{branch}."
 
 #. type: cindex
-#: doc/guix.texi:3795 doc/guix.texi:3898
+#: doc/guix.texi:3816 doc/guix.texi:3919
 #, no-wrap
 msgid "@file{channels.scm}, configuration file"
 msgstr "@file{channels.scm}, configuration file"
 
 #. type: cindex
-#: doc/guix.texi:3796 doc/guix.texi:3899
+#: doc/guix.texi:3817 doc/guix.texi:3920
 #, no-wrap
 msgid "configuration file for channels"
 msgstr "конфигурационный файл для каналов"
 
 #. type: table
-#: doc/guix.texi:3800
+#: doc/guix.texi:3821
 msgid "These options are provided for convenience, but you can also specify your configuration in the @file{~/.config/guix/channels.scm} file or using the @option{--channels} option (see below)."
 msgstr "Эти опции внедрены для удобства, но также можно задать конфигурационный файл @file{~/.config/guix/channels.scm} или использовать опцию @option{--channels} (смотрите ниже)."
 
 #. type: item
-#: doc/guix.texi:3801 doc/guix.texi:4218
+#: doc/guix.texi:3822 doc/guix.texi:4239
 #, no-wrap
 msgid "--channels=@var{file}"
 msgstr "--channels=@var{file}"
 
 #. type: itemx
-#: doc/guix.texi:3802 doc/guix.texi:4219
+#: doc/guix.texi:3823 doc/guix.texi:4240
 #, no-wrap
 msgid "-C @var{file}"
 msgstr "-C @var{file}"
 
 #. type: table
-#: doc/guix.texi:3808
+#: doc/guix.texi:3829
 #, fuzzy
 #| msgid "Read the list of channels from @var{file} instead of @file{~/.config/guix/channels.scm}.  @var{file} must contain Scheme code that evaluates to a list of channel objects.  @xref{Channels}, for more information."
 msgid "Read the list of channels from @var{file} instead of @file{~/.config/guix/channels.scm} or @file{/etc/guix/channels.scm}.  @var{file} must contain Scheme code that evaluates to a list of channel objects.  @xref{Channels}, for more information."
 msgstr "Считать список каналов из файла @var{file} вместо @file{~/.config/guix/channels.scm}. @var{file} должен содержать код Scheme, который определяет список объектов \"канал\". См.  @xref{Channels} для подробной информации."
 
 #. type: cindex
-#: doc/guix.texi:3809
+#: doc/guix.texi:3830
 #, fuzzy, no-wrap
 #| msgid "channels"
 msgid "channel news"
 msgstr "каналы"
 
 #. type: item
-#: doc/guix.texi:3810
+#: doc/guix.texi:3831
 #, no-wrap
 msgid "--news"
 msgstr "--news"
 
 #. type: itemx
-#: doc/guix.texi:3811 doc/guix.texi:4905 doc/guix.texi:26659
+#: doc/guix.texi:3832 doc/guix.texi:4926 doc/guix.texi:26922
 #, no-wrap
 msgid "-N"
 msgstr "-N"
 
 #. type: table
-#: doc/guix.texi:3815
+#: doc/guix.texi:3836
 msgid "Display the list of packages added or upgraded since the previous generation, as well as, occasionally, news written by channel authors for their users (@pxref{Channels, Writing Channel News})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3819
+#: doc/guix.texi:3840
 #, fuzzy
 #| msgid "This is the same information as displayed upon @command{guix pull} completion, but without ellipses; it is also similar to the output of @command{guix pull -l} for the last generation (see below)."
 msgid "The package information is the same as displayed upon @command{guix pull} completion, but without ellipses; it is also similar to the output of @command{guix pull -l} for the last generation (see below)."
 msgstr "Это та же информация, которая отображается по завершении @command{guix pull}, но без эллипсов. Это также совпадает с выводом @command{guix pull -l} для последнего поколения (смотрите ниже)."
 
 #. type: table
-#: doc/guix.texi:3826
+#: doc/guix.texi:3847
 msgid "List all the generations of @file{~/.config/guix/current} or, if @var{pattern} is provided, the subset of generations that match @var{pattern}.  The syntax of @var{pattern} is the same as with @code{guix package --list-generations} (@pxref{Invoking guix package})."
 msgstr "Вывести список всех поколений @file{~/.config/guix/current} или, если предоставлен паттерн @var{pattern}, подмножество поколений, которые соответствуют @var{pattern}. Синтаксис @var{pattern} --- такой же, как у @code{guix package --list-generations} (@pxref{Invoking guix package})."
 
 #. type: table
-#: doc/guix.texi:3833
+#: doc/guix.texi:3854
 #, fuzzy
 #| msgid "Roll back to the previous @dfn{generation} of the profile---i.e., undo the last transaction."
 msgid "Roll back to the previous @dfn{generation} of @file{~/.config/guix/current}---i.e., undo the last transaction."
 msgstr "Откатиться до предыдущего @dfn{поколения} профиля, то есть отменить последнюю транзакцию."
 
 #. type: table
-#: doc/guix.texi:3857
+#: doc/guix.texi:3878
 #, fuzzy
 #| msgid "If the current generation matches, it is @emph{not} deleted.  Also, the zeroth generation is never deleted."
 msgid "If the current generation matches, it is @emph{not} deleted."
 msgstr "Если текущее поколение попадает под условия паттерна, оно не будет удалено. А также нулевое поокление никогда не удаляется."
 
 #. type: table
-#: doc/guix.texi:3863
+#: doc/guix.texi:3884
 msgid "@xref{Invoking guix describe}, for a way to display information about the current generation only."
 msgstr "См. @xref{Invoking guix describe}, чтобы узнать, как вывести информацию только о текущем поколении."
 
 #. type: table
-#: doc/guix.texi:3867
+#: doc/guix.texi:3888
 msgid "Use @var{profile} instead of @file{~/.config/guix/current}."
 msgstr "Использовать профиль @var{profile} вместо @file{~/.config/guix/current}."
 
 #. type: item
-#: doc/guix.texi:3868 doc/guix.texi:8166
+#: doc/guix.texi:3889 doc/guix.texi:8260
 #, no-wrap
 msgid "--dry-run"
 msgstr "--dry-run"
 
 #. type: itemx
-#: doc/guix.texi:3869 doc/guix.texi:8167
+#: doc/guix.texi:3890 doc/guix.texi:8261
 #, no-wrap
 msgid "-n"
 msgstr "-n"
 
 #. type: table
-#: doc/guix.texi:3872
+#: doc/guix.texi:3893
 msgid "Show which channel commit(s) would be used and what would be built or substituted but do not actually do it."
 msgstr "Показать, какие коммиты будут использоваться, и что будет собрано или скачано в виде подстановок, но не выполнять эту работу."
 
 #. type: itemx
-#: doc/guix.texi:3874 doc/guix.texi:4888 doc/guix.texi:5239 doc/guix.texi:8537
-#: doc/guix.texi:9895 doc/guix.texi:10101 doc/guix.texi:10736
-#: doc/guix.texi:26607
+#: doc/guix.texi:3895 doc/guix.texi:4909 doc/guix.texi:5249 doc/guix.texi:8636
+#: doc/guix.texi:9994 doc/guix.texi:10200 doc/guix.texi:10838
+#: doc/guix.texi:26870
 #, no-wrap
 msgid "-s @var{system}"
 msgstr "-s @var{system}"
 
 #. type: table
-#: doc/guix.texi:3877 doc/guix.texi:5242
+#: doc/guix.texi:3898 doc/guix.texi:5252
 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host."
 msgstr "Предпринять попытку собрать систему @var{system}, т.е. @code{i686-linux}, вместо типа системы хоста сборки."
 
 #. type: item
-#: doc/guix.texi:3878 doc/guix.texi:10535
+#: doc/guix.texi:3899 doc/guix.texi:10634
 #, no-wrap
 msgid "--verbose"
 msgstr "--verbose"
 
 #. type: table
-#: doc/guix.texi:3880
+#: doc/guix.texi:3901
 msgid "Produce verbose output, writing build logs to the standard error output."
 msgstr "Производить вывод логов, отображая логи сборки в стандартный вывод ошибок."
 
 #. type: table
-#: doc/guix.texi:3884
+#: doc/guix.texi:3905
 msgid "Use the bootstrap Guile to build the latest Guix.  This option is only useful to Guix developers."
 msgstr "Использовать бутстрап Guile для сорки последнего Guix. Эта опция полезна только для разработчиков."
 
 #. type: Plain text
-#: doc/guix.texi:3890
+#: doc/guix.texi:3911
 msgid "The @dfn{channel} mechanism allows you to instruct @command{guix pull} which repository and branch to pull from, as well as @emph{additional} repositories containing package modules that should be deployed.  @xref{Channels}, for more information."
 msgstr "Механизм каналов @dfn{channel} позволяет указать @command{guix pull}, из какого репозитория или ветки скачивать, а также какие @emph{дополнительные} репозитории должны использоваться для развёртки. См. @xref{Channels} для подробной информации."
 
 #. type: Plain text
-#: doc/guix.texi:3893
+#: doc/guix.texi:3914
 msgid "In addition, @command{guix pull} supports all the common build options (@pxref{Common Build Options})."
 msgstr "В добавок @command{guix pull} поддерживает все стандартные опции сборки (@pxref{Common Build Options})."
 
 #. type: item
-#: doc/guix.texi:3897 doc/guix.texi:4433
+#: doc/guix.texi:3918 doc/guix.texi:4454
 #, no-wrap
 msgid "channels"
 msgstr "каналы"
 
 #. type: cindex
-#: doc/guix.texi:3900
+#: doc/guix.texi:3921
 #, no-wrap
 msgid "@command{guix pull}, configuration file"
 msgstr "@command{guix pull}, конфигурационный файл"
 
 #. type: cindex
-#: doc/guix.texi:3901
+#: doc/guix.texi:3922
 #, no-wrap
 msgid "configuration of @command{guix pull}"
 msgstr "конфигурация @command{guix pull}"
 
 #. type: Plain text
-#: doc/guix.texi:3910
+#: doc/guix.texi:3931
 msgid "Guix and its package collection are updated by running @command{guix pull} (@pxref{Invoking guix pull}).  By default @command{guix pull} downloads and deploys Guix itself from the official GNU@tie{}Guix repository.  This can be customized by defining @dfn{channels} in the @file{~/.config/guix/channels.scm} file.  A channel specifies a URL and branch of a Git repository to be deployed, and @command{guix pull} can be instructed to pull from one or more channels.  In other words, channels can be used to @emph{customize} and to @emph{extend} Guix, as we will see below."
 msgstr "Guix и его коллекция пакетов можно обновить запуском @command{guix pull} (@pxref{Invoking guix pull}). По умолчанию @command{guix pull} скачивает и разворачивает Guix из официального репозитория GNU@tie{}Guix. Это может быть изменено определением каналов @dfn{channels} в файле @file{~/.config/guix/channels.scm}. Канал обозначает URL или ветку репозитория Git для разворачивания. Также @command{guix pull} может быть настроена для скачивания из одного или более каналов. Другими словами, каналы могут использоваться для @emph{настройки} и для @emph{расширения} Guix, как это будет показано ниже."
 
 #. type: subsection
-#: doc/guix.texi:3911
+#: doc/guix.texi:3932
 #, no-wrap
 msgid "Using a Custom Guix Channel"
 msgstr "Использование отдельного канала Guix"
 
 #. type: Plain text
-#: doc/guix.texi:3918
+#: doc/guix.texi:3939
 msgid "The channel called @code{guix} specifies where Guix itself---its command-line tools as well as its package collection---should be downloaded.  For instance, suppose you want to update from your own copy of the Guix repository at @code{example.org}, and specifically the @code{super-hacks} branch, you can write in @code{~/.config/guix/channels.scm} this specification:"
 msgstr "Канал, названный @code{guix}, обозначает, откуда должен скачиваться сам Guix (его инструменты командной строки и коллекция пакетов). Например, предположим вы хотите обновиться из вашей собственной копии репозитория Guix на @code{example.org}, а именно из ветки @code{super-hacks}, тогда можно написать в @code{~/.config/guix/channels.scm} следующую спецификацию:"
 
 #. type: lisp
-#: doc/guix.texi:3925
+#: doc/guix.texi:3946
 #, no-wrap
 msgid ""
 ";; Tell 'guix pull' to use my own repo.\n"
@@ -8920,83 +9077,83 @@ msgstr ""
 "        (branch \"super-hacks\")))\n"
 
 #. type: Plain text
-#: doc/guix.texi:3930
+#: doc/guix.texi:3951
 msgid "From there on, @command{guix pull} will fetch code from the @code{super-hacks} branch of the repository at @code{example.org}."
 msgstr "При такой настройке @command{guix pull} будет скачивать код из ветки @code{super-hacks} репозитория в @code{example.org}."
 
 #. type: subsection
-#: doc/guix.texi:3931
+#: doc/guix.texi:3952
 #, no-wrap
 msgid "Specifying Additional Channels"
 msgstr "Указание дополнительных каналов"
 
 #. type: cindex
-#: doc/guix.texi:3933
+#: doc/guix.texi:3954
 #, no-wrap
 msgid "extending the package collection (channels)"
 msgstr "расширение коллекции пакетов (каналов)"
 
 #. type: cindex
-#: doc/guix.texi:3934
+#: doc/guix.texi:3955
 #, no-wrap
 msgid "personal packages (channels)"
 msgstr "собственные пакеты (каналы)"
 
 #. type: cindex
-#: doc/guix.texi:3935
+#: doc/guix.texi:3956
 #, no-wrap
 msgid "channels, for personal packages"
 msgstr "каналы, для собственных пакетов"
 
 #. type: Plain text
-#: doc/guix.texi:3943
+#: doc/guix.texi:3964
 msgid "You can also specify @emph{additional channels} to pull from.  Let's say you have a bunch of custom package variants or personal packages that you think would make little sense to contribute to the Guix project, but would like to have these packages transparently available to you at the command line.  You would first write modules containing those package definitions (@pxref{Package Modules}), maintain them in a Git repository, and then you and anyone else can use it as an additional channel to get packages from.  Neat, no?"
 msgstr "Можно также задать @emph{дополнительные каналы} для выборки оттуда. Ну, например, у вас ряд собственных вариантов пакетов или собственные пакеты, которые вы считаете не особо важным для отправки в проект Guix, но хотите, чтобы эти пакеты были доступны вам в командной строке прозрачно, без дополнительных действий. Вначале можно написать модули, содержащие определения этих пакетов (@pxref{Package Modules}), затем разместить их в репозитории Git, и тогда вы или кто-либо ещё сможете использовать их в качестве дополнтельного канала для получения пакетов. Красиво, да?"
 
 #. type: quotation
-#: doc/guix.texi:3947 doc/guix.texi:16041
+#: doc/guix.texi:3968 doc/guix.texi:16198
 #, no-wrap
 msgid "Warning"
 msgstr "Внимание"
 
 #. type: quotation
-#: doc/guix.texi:3951
+#: doc/guix.texi:3972
 msgid "Before you, dear user, shout---``woow this is @emph{soooo coool}!''---and publish your personal channel to the world, we would like to share a few words of caution:"
 msgstr "Прежде чем вы крикнете @emph{Ух-ты, это круто!} и опубликуете собственный канал, необходимо учесть некоторые предостережения:"
 
 #. type: itemize
-#: doc/guix.texi:3959
+#: doc/guix.texi:3980
 msgid "Before publishing a channel, please consider contributing your package definitions to Guix proper (@pxref{Contributing}).  Guix as a project is open to free software of all sorts, and packages in Guix proper are readily available to all Guix users and benefit from the project's quality assurance process."
 msgstr "Перед публикацией канала, пожалуйста, рассмотрите возможность поделиться вашими определениями пакетов со сборником Guix (@pxref{Contributing}). Guix, как проект, открыт свободному программному обеспечению любого назначения, и пакеты в сборнике Guix готовы и доступны для использования всеми пользователями Guix и прошли проверку качества."
 
 #. type: itemize
-#: doc/guix.texi:3968
+#: doc/guix.texi:3989
 msgid "When you maintain package definitions outside Guix, we, Guix developers, consider that @emph{the compatibility burden is on you}.  Remember that package modules and package definitions are just Scheme code that uses various programming interfaces (APIs).  We want to remain free to change these APIs to keep improving Guix, possibly in ways that break your channel.  We never change APIs gratuitously, but we will @emph{not} commit to freezing APIs either."
 msgstr "Когда вы выгружаете определение пакета вне Guix, мы, разработчики Guix, полагаем, что вопрос @emph{совместимости ложится на вас}. Учтите, что пакетные модули и определения пакетов --- это код Scheme, который используют различные программные интерфейсы (API). Мы хотим оставить возможность для себя изменять эти API, чтобы продолжить улучшать Guix. И это может привести к поломке вашего канала. Мы никогда не меняем API необоснованно, но всё же мы @emph{не} будем обновлять устаревшие, замороженные API."
 
 #. type: itemize
-#: doc/guix.texi:3972
+#: doc/guix.texi:3993
 msgid "Corollary: if you're using an external channel and that channel breaks, please @emph{report the issue to the channel authors}, not to the Guix project."
 msgstr "Вывод: если вы используете внешний канал, и этот канал ломается, пожалуйста, @emph{заявите об этой проблеме авторам каналв}, но не в проект Guix."
 
 #. type: quotation
-#: doc/guix.texi:3979
+#: doc/guix.texi:4000
 msgid "You've been warned! Having said this, we believe external channels are a practical way to exert your freedom to augment Guix' package collection and to share your improvements, which are basic tenets of @uref{https://www.gnu.org/philosophy/free-sw.html, free software}.  Please email us at @email{guix-devel@@gnu.org} if you'd like to discuss this."
 msgstr "Вы предупреждены! Обозначив это, мы верим, что внешние каналы --- это способ для вас проявлять свою свободу и вместе с тем расширять коллекцию пакетов Guix и делиться улучшениями, что является основными догматами @uref{https://www.gnu.org/philosophy/free-sw.ru.html, свободного программного обеспечения}. Пожалуйста, свяжитесь с нами по e-mail @email{guix-devel@@gnu.org}, если вы хотите обсудить это."
 
 #. type: Plain text
-#: doc/guix.texi:3984
+#: doc/guix.texi:4005
 msgid "To use a channel, write @code{~/.config/guix/channels.scm} to instruct @command{guix pull} to pull from it @emph{in addition} to the default Guix channel(s):"
 msgstr "Чтобы использовать канал, напишите @code{~/.config/guix/channels.scm}, чтобы обозначить @command{guix pull} скачивать оттуда @emph{в дополнение} к каналу(-ам) Guix по умолчанию:"
 
 #. type: vindex
-#: doc/guix.texi:3985
+#: doc/guix.texi:4006
 #, no-wrap
 msgid "%default-channels"
 msgstr "%default-channels"
 
 #. type: lisp
-#: doc/guix.texi:3992
+#: doc/guix.texi:4013
 #, no-wrap
 msgid ""
 ";; Add my personal packages to those Guix provides.\n"
@@ -9012,12 +9169,12 @@ msgstr ""
 "      %default-channels)\n"
 
 #. type: Plain text
-#: doc/guix.texi:4002
+#: doc/guix.texi:4023
 msgid "Note that the snippet above is (as always!)@: Scheme code; we use @code{cons} to add a channel the list of channels that the variable @code{%default-channels} is bound to (@pxref{Pairs, @code{cons} and lists,, guile, GNU Guile Reference Manual}).  With this file in place, @command{guix pull} builds not only Guix but also the package modules from your own repository.  The result in @file{~/.config/guix/current} is the union of Guix with your own package modules:"
 msgstr "Заметим, что сниппет выше (всегда!)@: код Scheme; мы используем @code{cons} для добавления канала в список каналов, то есть в переменную @code{%default-channels} (@pxref{Pairs, @code{cons} and lists,, guile, GNU Guile Reference Manual}). Если этот файл написан, @command{guix pull} производит сборку не только Guix, но и пакетных модулей из вашего репозитория. В результате в @file{~/.config/guix/current} содержится объединение Guix и ваших собственных пакетных модулей:"
 
 #. type: example
-#: doc/guix.texi:4017
+#: doc/guix.texi:4038
 #, no-wrap
 msgid ""
 "$ guix pull --list-generations\n"
@@ -9049,45 +9206,45 @@ msgstr ""
 "  4 packages upgraded: emacs-racket-mode@@0.0.2-2.1b78827, @dots{}\n"
 
 #. type: Plain text
-#: doc/guix.texi:4025
+#: doc/guix.texi:4046
 msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{my-personal-packages} channel.  Among the new and upgraded packages that are listed, some like @code{my-gimp} and @code{my-emacs-with-cool-features} might come from @code{my-personal-packages}, while others come from the Guix default channel."
 msgstr "Результат @command{guix pull} выше показывает, что поколение Generation@tie{}19 включает как репозиторий Guix, так и пакеты из канала @code{my-personal-packages}. Вместе с новыми и обновлёнными пакетами, которые присутствуют в списке, что-нибудь типа @code{my-gimp} и @code{my-emacs-with-cool-features} может прийти из @code{my-personal-packages}, когда остальные идут из канала Guix по умолчанию."
 
 #. type: Plain text
-#: doc/guix.texi:4036
+#: doc/guix.texi:4057
 msgid "To create a channel, create a Git repository containing your own package modules and make it available.  The repository can contain anything, but a useful channel will contain Guile modules that export packages.  Once you start using a channel, Guix will behave as if the root directory of that channel's Git repository has been added to the Guile load path (@pxref{Load Paths,,, guile, GNU Guile Reference Manual}).  For example, if your channel contains a file at @file{my-packages/my-tools.scm} that defines a Guile module, then the module will be available under the name @code{(my-packages my-tools)}, and you will be able to use it like any other module (@pxref{Modules,,, guile, GNU Guile Reference Manual})."
 msgstr "Чтобы создать канал, создайте репозиторий Git, содержащий ваши собственные пакетные модули, и сделайте его доступным. Репозиторий может содержать что-либо, но полезный канал будет содержать модули Guile, экспортирующие пакеты. Когда вы начали использовать канал, Guix будет работать, как будто корневая директория репозитория Git этого канала добавлена в путь загрузки Guile (@pxref{Load Paths,,, guile, GNU Guile Reference Manual}). Например, если ваш канал содержит файл @file{my-packages/my-tools.scm}, который определяет модуль Guile, тогда модуль будет доступен под именем @code{(my-packages my-tools)}, и вы сможете использовать его, как любой другой модуль (@pxref{Modules,,, guile, GNU Guile Reference Manual})."
 
 #. type: cindex
-#: doc/guix.texi:4037
+#: doc/guix.texi:4058
 #, no-wrap
 msgid "dependencies, channels"
 msgstr "зависимости, каналы"
 
 #. type: cindex
-#: doc/guix.texi:4038
+#: doc/guix.texi:4059
 #, no-wrap
 msgid "meta-data, channels"
 msgstr "метаданные, каналы"
 
 #. type: subsection
-#: doc/guix.texi:4039
+#: doc/guix.texi:4060
 #, no-wrap
 msgid "Declaring Channel Dependencies"
 msgstr "Объявление зависимостей канала"
 
 #. type: Plain text
-#: doc/guix.texi:4045
+#: doc/guix.texi:4066
 msgid "Channel authors may decide to augment a package collection provided by other channels.  They can declare their channel to be dependent on other channels in a meta-data file @file{.guix-channel}, which is to be placed in the root of the channel repository."
 msgstr "Авторы канала могут решить расширить коллекцию пакетов пакетами, которые поставляются другими каналами. Они могут объявить, что их канал зависит от других каналов, в файле метаданных @file{.guix-channel}, который нужно разместить в корне репозитория канала."
 
 #. type: Plain text
-#: doc/guix.texi:4047
+#: doc/guix.texi:4068
 msgid "The meta-data file should contain a simple S-expression like this:"
 msgstr "Файл метаданных должен содержать простое выражение S-expression как это:"
 
 #. type: lisp
-#: doc/guix.texi:4059
+#: doc/guix.texi:4080
 #, no-wrap
 msgid ""
 "(channel\n"
@@ -9113,35 +9270,35 @@ msgstr ""
 "   (branch \"testing\"))))\n"
 
 #. type: Plain text
-#: doc/guix.texi:4065
+#: doc/guix.texi:4086
 msgid "In the above example this channel is declared to depend on two other channels, which will both be fetched automatically.  The modules provided by the channel will be compiled in an environment where the modules of all these declared channels are available."
 msgstr "В примере выше объявлен канал, который зависит от двух других каналов, из которых оба будут скачаны автоматически. Модули, предоставляемые каналом, будут скомпилированы в окружении, в котором доступны модули всех этих каналов."
 
 #. type: Plain text
-#: doc/guix.texi:4069
+#: doc/guix.texi:4090
 msgid "For the sake of reliability and maintainability, you should avoid dependencies on channels that you don't control, and you should aim to keep the number of dependencies to a minimum."
 msgstr "В целях воспроизводимости и сопровождения вы должны избегать зависимостей от каналов, которые вы не контролируете, и вы должны стремиться минимизировать число зависимостей."
 
 #. type: cindex
-#: doc/guix.texi:4070
+#: doc/guix.texi:4091
 #, no-wrap
 msgid "subdirectory, channels"
-msgstr ""
+msgstr "подкаталог, каналы"
 
 #. type: subsection
-#: doc/guix.texi:4071
+#: doc/guix.texi:4092
 #, fuzzy, no-wrap
 #| msgid "Package Modules"
 msgid "Package Modules in a Sub-directory"
 msgstr "Пакетные модули"
 
 #. type: Plain text
-#: doc/guix.texi:4076
+#: doc/guix.texi:4097
 msgid "As a channel author, you may want to keep your channel modules in a sub-directory.  If your modules are in the sub-directory @file{guix}, you must add a meta-data file @file{.guix-channel} that contains:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:4081
+#: doc/guix.texi:4102
 #, no-wrap
 msgid ""
 "(channel\n"
@@ -9150,36 +9307,36 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4083
+#: doc/guix.texi:4104
 #, fuzzy, no-wrap
 #| msgid "dependencies, channels"
 msgid "news, for channels"
 msgstr "зависимости, каналы"
 
 #. type: subsection
-#: doc/guix.texi:4084
+#: doc/guix.texi:4105
 #, fuzzy, no-wrap
 #| msgid "pinning, channels"
 msgid "Writing Channel News"
 msgstr "связывание, каналов"
 
 #. type: Plain text
-#: doc/guix.texi:4089
+#: doc/guix.texi:4110
 msgid "Channel authors may occasionally want to communicate to their users information about important changes in the channel.  You'd send them all an email, but that's not convenient."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4094
+#: doc/guix.texi:4115
 msgid "Instead, channels can provide a @dfn{news file}; when the channel users run @command{guix pull}, that news file is automatically read and @command{guix pull --news} can display the announcements that correspond to the new commits that have been pulled, if any."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4097
+#: doc/guix.texi:4118
 msgid "To do that, channel authors must first declare the name of the news file in their @file{.guix-channel} file:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:4102
+#: doc/guix.texi:4123
 #, no-wrap
 msgid ""
 "(channel\n"
@@ -9188,12 +9345,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4106
+#: doc/guix.texi:4127
 msgid "The news file itself, @file{etc/news.txt} in this example, must look something like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:4119
+#: doc/guix.texi:4140
 #, no-wrap
 msgid ""
 "(channel-news\n"
@@ -9210,62 +9367,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4125
+#: doc/guix.texi:4146
 msgid "The file consists of a list of @dfn{news entries}.  Each entry is associated with a commit or tag: it describes changes made in this commit, possibly in preceding commits as well.  Users see entries only the first time they obtain the commit the entry refers to."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4131
+#: doc/guix.texi:4152
 msgid "The @code{title} field should be a one-line summary while @code{body} can be arbitrarily long, and both can contain Texinfo markup (@pxref{Overview,,, texinfo, GNU Texinfo}).  Both the title and body are a list of language tag/message tuples, which allows @command{guix pull} to display news in the language that corresponds to the user's locale."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4137
+#: doc/guix.texi:4158
 msgid "If you want to translate news using a gettext-based workflow, you can extract translatable strings with @command{xgettext} (@pxref{xgettext Invocation,,, gettext, GNU Gettext Utilities}).  For example, assuming you write news entries in English first, the command below creates a PO file containing the strings to translate:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4140
+#: doc/guix.texi:4161
 #, no-wrap
 msgid "xgettext -o news.po -l scheme -ken etc/news.scm\n"
-msgstr ""
+msgstr "xgettext -o news.po -l scheme -ken etc/news.scm\n"
 
 #. type: Plain text
-#: doc/guix.texi:4144
+#: doc/guix.texi:4165
 msgid "To sum up, yes, you could use your channel as a blog.  But beware, this is @emph{not quite} what your users might expect."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:4145
+#: doc/guix.texi:4166
 #, no-wrap
 msgid "Replicating Guix"
 msgstr "Копирование Guix"
 
 #. type: cindex
-#: doc/guix.texi:4147 doc/guix.texi:4189
+#: doc/guix.texi:4168 doc/guix.texi:4210
 #, no-wrap
 msgid "pinning, channels"
 msgstr "связывание, каналы"
 
 #. type: cindex
-#: doc/guix.texi:4148 doc/guix.texi:4190 doc/guix.texi:4372
+#: doc/guix.texi:4169 doc/guix.texi:4211 doc/guix.texi:4393
 #, no-wrap
 msgid "replicating Guix"
 msgstr "копирование Guix"
 
 #. type: cindex
-#: doc/guix.texi:4149 doc/guix.texi:4191
+#: doc/guix.texi:4170 doc/guix.texi:4212
 #, no-wrap
 msgid "reproducibility, of Guix"
 msgstr "воспроизводимость, Guix"
 
 #. type: Plain text
-#: doc/guix.texi:4154
+#: doc/guix.texi:4175
 msgid "The @command{guix pull --list-generations} output above shows precisely which commits were used to build this instance of Guix.  We can thus replicate it, say, on another machine, by providing a channel specification in @file{~/.config/guix/channels.scm} that is ``pinned'' to these commits:"
 msgstr "Результат @command{guix pull --list-generations} выше показывает точно, какие коммиты были использованы для сборки данной инстанции Guix. Так что мы можем повторить её, скажем, на другой машине, предоставив объявление канала в @file{~/.config/guix/channels.scm}, которое завязано на этих коммитах:"
 
 #. type: lisp
-#: doc/guix.texi:4165
+#: doc/guix.texi:4186
 #, fuzzy, no-wrap
 #| msgid ""
 #| ";; Deploy specific commits of my channels of interest.\n"
@@ -9299,135 +9456,135 @@ msgstr ""
 "       (branch \"dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb\")))\n"
 
 #. type: Plain text
-#: doc/guix.texi:4172
+#: doc/guix.texi:4193
 #, fuzzy
 #| msgid "The @command{guix describe --format=channels} command can even generate this list of channels directly (@pxref{Invoking guix describe})."
 msgid "The @command{guix describe --format=channels} command can even generate this list of channels directly (@pxref{Invoking guix describe}).  The resulting file can be used with the -C options of @command{guix pull} (@pxref{Invoking guix pull}) or @command{guix time-machine} (@pxref{Invoking guix time-machine})."
 msgstr "Команда @command{guix describe --format=channels} даже может непосредственно воспроизвести этот список каналов (@pxref{Invoking guix describe})."
 
 #. type: Plain text
-#: doc/guix.texi:4179
+#: doc/guix.texi:4200
 msgid "At this point the two machines run the @emph{exact same Guix}, with access to the @emph{exact same packages}.  The output of @command{guix build gimp} on one machine will be exactly the same, bit for bit, as the output of the same command on the other machine.  It also means both machines have access to all the source code of Guix and, transitively, to all the source code of every package it defines."
 msgstr "И тогда две машины будут работать с @emph{полностью одинаковым Guix}, имея доступ к @emph{абсолютно одинаковым пакетам}. Результат @command{guix build gimp} на одной машине будет совершенно таким же, бит к биту, как результат этой команды на другой машине. Это также означает, что обе машины имеют доступ ко всем исходным кодам Guix, следовательно, ко всем исходным кодам каждого пакета, определённого в Guix."
 
 #. type: Plain text
-#: doc/guix.texi:4184
+#: doc/guix.texi:4205
 msgid "This gives you super powers, allowing you to track the provenance of binary artifacts with very fine grain, and to reproduce software environments at will---some sort of ``meta reproducibility'' capabilities, if you will.  @xref{Inferiors}, for another way to take advantage of these super powers."
 msgstr "Это даёт вам супервозможности, позволяя вам отслеживать и управлять происхождением артефактов бинарников с точной детализацией, также повторять программные окружения --- это воспроизводимость высокого уровня. Смотрите @xref{Inferiors}, чтобы узнать другие преимущества таких супервозможностей."
 
 #. type: section
-#: doc/guix.texi:4186
+#: doc/guix.texi:4207
 #, no-wrap
 msgid "Invoking @command{guix time-machine}"
 msgstr "Запуск @command{guix time-machine}"
 
 #. type: command{#1}
-#: doc/guix.texi:4188
+#: doc/guix.texi:4209
 #, no-wrap
 msgid "guix time-machine"
 msgstr "guix time-machine"
 
 #. type: Plain text
-#: doc/guix.texi:4199
+#: doc/guix.texi:4220
 msgid "The @command{guix time-machine} command provides access to other revisions of Guix, for example to install older versions of packages, or to reproduce a computation in an identical environment.  The revision of Guix to be used is defined by a commit or by a channel description file created by @command{guix describe} (@pxref{Invoking guix describe})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4201 doc/guix.texi:4660 doc/guix.texi:8086 doc/guix.texi:8823
-#: doc/guix.texi:8890 doc/guix.texi:9747 doc/guix.texi:10154
-#: doc/guix.texi:10493 doc/guix.texi:10582 doc/guix.texi:10621
-#: doc/guix.texi:10718
+#: doc/guix.texi:4222 doc/guix.texi:4681 doc/guix.texi:8180 doc/guix.texi:8922
+#: doc/guix.texi:8989 doc/guix.texi:9846 doc/guix.texi:10253
+#: doc/guix.texi:10592 doc/guix.texi:10681 doc/guix.texi:10720
+#: doc/guix.texi:10817
 msgid "The general syntax is:"
 msgstr "Основной синтаксис:"
 
 #. type: example
-#: doc/guix.texi:4204
+#: doc/guix.texi:4225
 #, no-wrap
 msgid "guix time-machine @var{options}@dots{} -- @var{command} @var {arg}@dots{}\n"
 msgstr "guix time-machine @var{options}@dots{} -- @var{command} @var {arg}@dots{}\n"
 
 #. type: Plain text
-#: doc/guix.texi:4209
-msgid "where @var{command} and @var{arg}@dots{} are passed unmodified to the @command{guix} command if the specified revision.  The @var{options} that define this revision are the same as for @command{guix pull} (@pxref{Invoking guix pull}):"
+#: doc/guix.texi:4230
+msgid "where @var{command} and @var{arg}@dots{} are passed unmodified to the @command{guix} command of the specified revision.  The @var{options} that define this revision are the same as for @command{guix pull} (@pxref{Invoking guix pull}):"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4217
+#: doc/guix.texi:4238
 #, fuzzy
 #| msgid "Download code for the @code{guix} channel from the specified @var{url}, at the given @var{commit} (a valid Git commit ID represented as a hexadecimal string), or @var{branch}."
 msgid "Use the @code{guix} channel from the specified @var{url}, at the given @var{commit} (a valid Git commit ID represented as a hexadecimal string), or @var{branch}."
 msgstr "Скачать код канала @code{guix} из указанного @var{url}, относящийся к обозначенному коммиту @var{commit} (корректный ID коммита Git, представленный в виде шестнадцатеричной строки), или ветке @var{branch}."
 
 #. type: table
-#: doc/guix.texi:4223
+#: doc/guix.texi:4244
 #, fuzzy
 #| msgid "Read the list of channels from @var{file} instead of @file{~/.config/guix/channels.scm}.  @var{file} must contain Scheme code that evaluates to a list of channel objects.  @xref{Channels}, for more information."
 msgid "Read the list of channels from @var{file}.  @var{file} must contain Scheme code that evaluates to a list of channel objects.  @xref{Channels} for more information."
 msgstr "Считать список каналов из файла @var{file} вместо @file{~/.config/guix/channels.scm}. @var{file} должен содержать код Scheme, который определяет список объектов \"канал\". См.  @xref{Channels} для подробной информации."
 
 #. type: Plain text
-#: doc/guix.texi:4227
+#: doc/guix.texi:4248
 msgid "As for @command{guix pull}, the absence of any options means that the the latest commit on the master branch will be used. The command"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4230
+#: doc/guix.texi:4251
 #, no-wrap
 msgid "guix time-machine -- build hello\n"
 msgstr "guix time-machine -- build hello\n"
 
 #. type: Plain text
-#: doc/guix.texi:4235
-msgid "will thus build the package @code{hello} as defined in the master branch, which is in general a newer revison of Guix than you have installed.  Time travel works in both directions!"
-msgstr ""
+#: doc/guix.texi:4256
+msgid "will thus build the package @code{hello} as defined in the master branch, which is in general a newer revision of Guix than you have installed.  Time travel works in both directions!"
+msgstr "таким образом, мы соберем пакет @code{hello}, как определено в основной ветке, которая, как правило, является более новой версией Guix, чем вы установили. Путешествие во времени работает в обоих направлениях!"
 
 #. type: Plain text
-#: doc/guix.texi:4239
+#: doc/guix.texi:4260
 #, fuzzy
 #| msgid "If the specified packages are not built yet, @command{guix archive} automatically builds them.  The build process may be controlled with the common build options (@pxref{Common Build Options})."
 msgid "Note that @command{guix time-machine} can trigger builds of channels and their dependencies, and these are controlled by the standard build options (@pxref{Common Build Options})."
 msgstr "Если указанные пакеты ещё не собраны, @command{guix archive} автоматически соберёт их. Процесс сборки может контролироваться обычными опциями сборки (@pxref{Common Build Options})."
 
 #. type: quotation
-#: doc/guix.texi:4247
+#: doc/guix.texi:4268
 msgid "The functionality described here is a ``technology preview'' as of version @value{VERSION}.  As such, the interface is subject to change."
 msgstr "Функциональность, описанная здесь, --- это обзор технологии версии @value{VERSION}. Интерфейс может меняться."
 
 #. type: cindex
-#: doc/guix.texi:4249 doc/guix.texi:8000
+#: doc/guix.texi:4270 doc/guix.texi:8094
 #, no-wrap
 msgid "inferiors"
 msgstr "ранние версии"
 
 #. type: cindex
-#: doc/guix.texi:4250
+#: doc/guix.texi:4271
 #, no-wrap
 msgid "composition of Guix revisions"
 msgstr "составление ревизий Guix"
 
 #. type: Plain text
-#: doc/guix.texi:4255
+#: doc/guix.texi:4276
 msgid "Sometimes you might need to mix packages from the revision of Guix you're currently running with packages available in a different revision of Guix.  Guix @dfn{inferiors} allow you to achieve that by composing different Guix revisions in arbitrary ways."
 msgstr "Иногда вам может понадобиться перемешивать пакеты из ревизии Guix, которая работает в настоящий момент, с пакетами, доступными в другой ревизии Guix. Основания Guix @dfn{inferiors} позволяют вам получить это, составляя различные ревизии Guix произвольным образом."
 
 #. type: cindex
-#: doc/guix.texi:4256 doc/guix.texi:4321
+#: doc/guix.texi:4277 doc/guix.texi:4342
 #, no-wrap
 msgid "inferior packages"
 msgstr "пакеты ранних версий"
 
 #. type: Plain text
-#: doc/guix.texi:4262
+#: doc/guix.texi:4283
 msgid "Technically, an ``inferior'' is essentially a separate Guix process connected to your main Guix process through a REPL (@pxref{Invoking guix repl}).  The @code{(guix inferior)} module allows you to create inferiors and to communicate with them.  It also provides a high-level interface to browse and manipulate the packages that an inferior provides---@dfn{inferior packages}."
 msgstr "Технически работа с ранними версиями --- это в целом отдельный процесс Guix, связанный с главным процессом Guix через REPL (@pxref{Invoking guix repl}). Модуль @code{(guix inferior)} позволяет запускать ранние версии и взаимодействовать с ними. Он также предоставляет высокоуровневый интерфейс для обзора и управления пакетами, которые поставляет ранняя версия --- @dfn{ранние версии пакетов}."
 
 #. type: Plain text
-#: doc/guix.texi:4272
+#: doc/guix.texi:4293
 msgid "When combined with channels (@pxref{Channels}), inferiors provide a simple way to interact with a separate revision of Guix.  For example, let's assume you want to install in your profile the current @code{guile} package, along with the @code{guile-json} as it existed in an older revision of Guix---perhaps because the newer @code{guile-json} has an incompatible API and you want to run your code against the old API@.  To do that, you could write a manifest for use by @code{guix package --manifest} (@pxref{Invoking guix package}); in that manifest, you would create an inferior for that old Guix revision you care about, and you would look up the @code{guile-json} package in the inferior:"
 msgstr "При сочетании с каналами (@pxref{Channels}) ранние версии преоставляют простой способ взаимодействовать с отдельными ревизиями Guix. Например, предположим, вы хотите установить в ваш профиль текущий пакет @code{guile} вместе с тем @code{guile-json}, который был определён в предыдущей ревизии Guix (может быть, потому что новый @code{guile-json} имеет несовместимый API, и вы хотите запустить ваш код со старым API). Чтобы это сделать, можно написать манифест для использования с @code{guix package --manifest} (@pxref{Invoking guix package}). В этом манифесте вы создадите описание ранней версии той предыдущей ревизии Guix, которая вас интересует, в которой вы ищете пакет @code{guile-json} ранней версии:"
 
 #. type: lisp
-#: doc/guix.texi:4276
+#: doc/guix.texi:4297
 #, no-wrap
 msgid ""
 "(use-modules (guix inferior) (guix channels)\n"
@@ -9439,7 +9596,7 @@ msgstr ""
 "\n"
 
 #. type: lisp
-#: doc/guix.texi:4285
+#: doc/guix.texi:4306
 #, no-wrap
 msgid ""
 "(define channels\n"
@@ -9463,7 +9620,7 @@ msgstr ""
 "\n"
 
 #. type: lisp
-#: doc/guix.texi:4289
+#: doc/guix.texi:4310
 #, no-wrap
 msgid ""
 "(define inferior\n"
@@ -9477,7 +9634,7 @@ msgstr ""
 "\n"
 
 #. type: lisp
-#: doc/guix.texi:4295
+#: doc/guix.texi:4316
 #, no-wrap
 msgid ""
 ";; Now create a manifest with the current \"guile\" package\n"
@@ -9493,186 +9650,186 @@ msgstr ""
 "       (specification->package \"guile\")))\n"
 
 #. type: Plain text
-#: doc/guix.texi:4300
+#: doc/guix.texi:4321
 msgid "On its first run, @command{guix package --manifest} might have to build the channel you specified before it can create the inferior; subsequent runs will be much faster because the Guix revision will be cached."
 msgstr "Далее запуск @command{guix package --manifest} может вызвать сборку канала, который вы обозначили ранее, и в результате это задействует раннюю версию. Последовательные запуски будут быстрее, потому что ревизия Guix будет кеширована."
 
 #. type: Plain text
-#: doc/guix.texi:4303
+#: doc/guix.texi:4324
 msgid "The @code{(guix inferior)} module provides the following procedures to open an inferior:"
 msgstr "Модуль @code{(guix inferior)} предоставляет следующие процедуры для работы с ранними версиями:"
 
 #. type: deffn
-#: doc/guix.texi:4304
+#: doc/guix.texi:4325
 #, no-wrap
 msgid "{Scheme Procedure} inferior-for-channels @var{channels} @"
 msgstr "{Процедура Scheme} inferior-for-channels @var{channels} @"
 
 #. type: deffn
-#: doc/guix.texi:4309
+#: doc/guix.texi:4330
 msgid "[#:cache-directory] [#:ttl] Return an inferior for @var{channels}, a list of channels.  Use the cache at @var{cache-directory}, where entries can be reclaimed after @var{ttl} seconds.  This procedure opens a new connection to the build daemon."
 msgstr "[#:cache-directory] [#:ttl] Возвращает раннюю версию для списка каналов @var{channels}.  Использует кеш в @var{cache-directory}, где компоненты могут восстанавливаться через @var{ttl} секунд. Эта процедура открывает новое соединение с демоном сборки."
 
 #. type: deffn
-#: doc/guix.texi:4312
+#: doc/guix.texi:4333
 msgid "As a side effect, this procedure may build or substitute binaries for @var{channels}, which can take time."
 msgstr "Как побочный эффект, эта процедура может собирать или скачивать подстановки бинарников для @var{channels}, что может занять время."
 
 #. type: deffn
-#: doc/guix.texi:4314
+#: doc/guix.texi:4335
 #, no-wrap
 msgid "{Scheme Procedure} open-inferior @var{directory} @"
 msgstr "{Процедура Scheme} open-inferior @var{directory} @"
 
 #. type: deffn
-#: doc/guix.texi:4319
+#: doc/guix.texi:4340
 msgid "[#:command \"bin/guix\"] Open the inferior Guix in @var{directory}, running @code{@var{directory}/@var{command} repl} or equivalent.  Return @code{#f} if the inferior could not be launched."
 msgstr "[#:command \"bin/guix\"] Открывает раннюю версию Guix в @var{directory}, запустив repl @code{@var{directory}/@var{command}} или эквивалент. Возвращает @code{#f}, если ранняя версия не может быть запущена."
 
 #. type: Plain text
-#: doc/guix.texi:4324
+#: doc/guix.texi:4345
 msgid "The procedures listed below allow you to obtain and manipulate inferior packages."
 msgstr "Процедуры, приведённые ниже, обеспечивают работу и управление ранними версиями пакетов."
 
 #. type: deffn
-#: doc/guix.texi:4325
+#: doc/guix.texi:4346
 #, no-wrap
 msgid "{Scheme Procedure} inferior-packages @var{inferior}"
 msgstr "{Процедура Scheme} inferior-packages @var{inferior}"
 
 #. type: deffn
-#: doc/guix.texi:4327
+#: doc/guix.texi:4348
 msgid "Return the list of packages known to @var{inferior}."
 msgstr "Возвращает список пакетов, относящихся к ранней версии @var{inferior}."
 
 #. type: deffn
-#: doc/guix.texi:4329
+#: doc/guix.texi:4350
 #, no-wrap
 msgid "{Scheme Procedure} lookup-inferior-packages @var{inferior} @var{name} @"
 msgstr "{Процедура Scheme} lookup-inferior-packages @var{inferior} @var{name} @"
 
 #. type: deffn
-#: doc/guix.texi:4334
+#: doc/guix.texi:4355
 msgid "[@var{version}] Return the sorted list of inferior packages matching @var{name} in @var{inferior}, with highest version numbers first.  If @var{version} is true, return only packages with a version number prefixed by @var{version}."
 msgstr "[@var{version}] Возвращает сортированный список пакетов ранней версии  @var{inferior}, содержащих имя @var{name}, поздняя версия - вначале. Если версия @var{version} задана, возвращает только пакеты с номером версии, начинающейся с @var{version}."
 
 #. type: deffn
-#: doc/guix.texi:4336
+#: doc/guix.texi:4357
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package? @var{obj}"
 msgstr "{Процедура Scheme} inferior-package? @var{obj}"
 
 #. type: deffn
-#: doc/guix.texi:4338
+#: doc/guix.texi:4359
 msgid "Return true if @var{obj} is an inferior package."
 msgstr "Возвращает true, если объект @var{obj} --- это пакет ранней версии."
 
 #. type: deffn
-#: doc/guix.texi:4340
+#: doc/guix.texi:4361
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-name @var{package}"
 msgstr "{Процедура Scheme} inferior-package-name @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4341
+#: doc/guix.texi:4362
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-version @var{package}"
 msgstr "{Процедура Scheme} inferior-package-version @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4342
+#: doc/guix.texi:4363
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-synopsis @var{package}"
 msgstr "{Процедура Scheme} inferior-package-synopsis @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4343
+#: doc/guix.texi:4364
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-description @var{package}"
 msgstr "{Процедура Scheme} inferior-package-description @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4344
+#: doc/guix.texi:4365
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-home-page @var{package}"
 msgstr "{Процедура Scheme} inferior-package-home-page @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4345
+#: doc/guix.texi:4366
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-location @var{package}"
 msgstr "{Процедура Scheme} inferior-package-location @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4346
+#: doc/guix.texi:4367
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-inputs @var{package}"
 msgstr "{Процедура Scheme} inferior-package-inputs @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4347
+#: doc/guix.texi:4368
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-native-inputs @var{package}"
 msgstr "{Процедура Scheme} inferior-package-native-inputs @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4348
+#: doc/guix.texi:4369
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-propagated-inputs @var{package}"
 msgstr "{Процедура Scheme} inferior-package-propagated-inputs @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4349
+#: doc/guix.texi:4370
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-transitive-propagated-inputs @var{package}"
 msgstr "{Процедура Scheme} inferior-package-transitive-propagated-inputs @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4350
+#: doc/guix.texi:4371
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-native-search-paths @var{package}"
 msgstr "{Процедура Scheme} inferior-package-native-search-paths @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4351
+#: doc/guix.texi:4372
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-transitive-native-search-paths @var{package}"
 msgstr "{Процедура Scheme} inferior-package-transitive-native-search-paths @var{package}"
 
 #. type: deffnx
-#: doc/guix.texi:4352
+#: doc/guix.texi:4373
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-search-paths @var{package}"
 msgstr "{Процедура Scheme} inferior-package-search-paths @var{package}"
 
 #. type: deffn
-#: doc/guix.texi:4357
+#: doc/guix.texi:4378
 msgid "These procedures are the counterpart of package record accessors (@pxref{package Reference}).  Most of them work by querying the inferior @var{package} comes from, so the inferior must still be live when you call these procedures."
 msgstr "Эти процедуры являются двойниками метода доступа к записям пакетов (@pxref{package Reference}). Большинство из них работают с запросами для ранней версии, из которой происходит @var{package}, так что ранняя версия должна оставаться живой, когда вы вызываете эти процедуры."
 
 #. type: Plain text
-#: doc/guix.texi:4367
+#: doc/guix.texi:4388
 msgid "Inferior packages can be used transparently like any other package or file-like object in G-expressions (@pxref{G-Expressions}).  They are also transparently handled by the @code{packages->manifest} procedure, which is commonly use in manifests (@pxref{Invoking guix package, the @option{--manifest} option of @command{guix package}}).  Thus you can insert an inferior package pretty much anywhere you would insert a regular package: in manifests, in the @code{packages} field of your @code{operating-system} declaration, and so on."
 msgstr "Пакеты ранних версий могут использоваться прозрачно, как любой другой пакет или объект типа файл в выражении G-expressions (@pxref{G-Expressions}). Они также прозрачно используются в процедуре @code{packages->manifest}, которая обычно используется в манифестах (@pxref{Invoking guix package, the @option{--manifest} option of @command{guix package}}). Так можно вставлять пакет ранней версии в принципе куда угодно, как если вставлять обычный пакет: в манифесты, в поле @code{packages} вашего объявления @code{operating-system} и т.д."
 
 #. type: section
-#: doc/guix.texi:4369
+#: doc/guix.texi:4390
 #, no-wrap
 msgid "Invoking @command{guix describe}"
 msgstr "Вызов @command{guix describe}"
 
 #. type: Plain text
-#: doc/guix.texi:4380
+#: doc/guix.texi:4401
 msgid "Often you may want to answer questions like: ``Which revision of Guix am I using?'' or ``Which channels am I using?'' This is useful information in many situations: if you want to @emph{replicate} an environment on a different machine or user account, if you want to report a bug or to determine what change in the channels you are using caused it, or if you want to record your system state for reproducibility purposes.  The @command{guix describe} command answers these questions."
 msgstr "Часто может возникать вопрос: \"Какую ревизию Guix я использую?\" - Или: \"Какие каналы я использую?\" Это полезна информация во многих ситуациях: если вы хотите @emph{повторить} окружение на другой машине или в другом пользовательском аккаунте, если вы хотите составить отчёт об ошибке, чтобы определить, какие изменения в канале, который вы используете, вызвали ошибку, или если вы хотите записать состояние вашей системы в целях воспроизводимости. Команда @command{guix describe} отвечает на эти вопросы."
 
 #. type: Plain text
-#: doc/guix.texi:4384
+#: doc/guix.texi:4405
 msgid "When run from a @command{guix pull}ed @command{guix}, @command{guix describe} displays the channel(s) that it was built from, including their repository URL and commit IDs (@pxref{Channels}):"
 msgstr "В случае запуска после @command{guix pull} команда @command{guix describe} отображает канал(ы), из которых производилась сборка, включая URL и репозиториев и ID коммитов (@pxref{Channels}):"
 
 #. type: example
-#: doc/guix.texi:4392
+#: doc/guix.texi:4413
 #, no-wrap
 msgid ""
 "$ guix describe\n"
@@ -9690,17 +9847,17 @@ msgstr ""
 "    commit: e0fa68c7718fffd33d81af415279d6ddb518f727\n"
 
 #. type: Plain text
-#: doc/guix.texi:4401
+#: doc/guix.texi:4422
 msgid "If you're familiar with the Git version control system, this is similar in spirit to @command{git describe}; the output is also similar to that of @command{guix pull --list-generations}, but limited to the current generation (@pxref{Invoking guix pull, the @option{--list-generations} option}).  Because the Git commit ID shown above unambiguously refers to a snapshot of Guix, this information is all it takes to describe the revision of Guix you're using, and also to replicate it."
 msgstr "Если вы знакомы с системой контроля версиями Git, эта команда по сути похожа на @command{git describe}; выход тот же, что в @command{guix pull --list-generations}, но ограничен текущим поколением (@pxref{Invoking guix pull, the @option{--list-generations} option}).  Так как ID коммита Git выше ссылается однозначно на снимок Guix, эта информация --- всё, что нужно для описания используемой ревизии Guix и повторения её."
 
 #. type: Plain text
-#: doc/guix.texi:4404
+#: doc/guix.texi:4425
 msgid "To make it easier to replicate Guix, @command{guix describe} can also be asked to return a list of channels instead of the human-readable description above:"
 msgstr "Чтобы проще повторить Guix, @command{guix describe} также может вызываться для вывода списка каналов вместо читаемого описания выше:"
 
 #. type: example
-#: doc/guix.texi:4412
+#: doc/guix.texi:4433
 #, no-wrap
 msgid ""
 "$ guix describe -f channels\n"
@@ -9718,160 +9875,160 @@ msgstr ""
 "          \"e0fa68c7718fffd33d81af415279d6ddb518f727\")))\n"
 
 #. type: Plain text
-#: doc/guix.texi:4421
+#: doc/guix.texi:4442
 msgid "You can save this to a file and feed it to @command{guix pull -C} on some other machine or at a later point in time, which will instantiate @emph{this exact Guix revision} (@pxref{Invoking guix pull, the @option{-C} option}).  From there on, since you're able to deploy the same revision of Guix, you can just as well @emph{replicate a complete software environment}.  We humbly think that this is @emph{awesome}, and we hope you'll like it too!"
 msgstr "Можно сохранить это в файл и подать на вход @command{guix pull -C} на любой другой машине или через время, чтобы инициализировать @emph{эту конкретную ревизию Guix} (@pxref{Invoking guix pull, the @option{-C} option}). Теперь, когда можно развернуть подобную ревизию Guix, вы можете также @emph{полностью повторить программное окружение}. Мы скромно полагаем, это @emph{чудесно}. Надеемся, вам это тоже понравится!"
 
 #. type: Plain text
-#: doc/guix.texi:4424
+#: doc/guix.texi:4445
 msgid "The details of the options supported by @command{guix describe} are as follows:"
 msgstr "Подробнее об опциях, поддерживаемых @command{guix describe}:"
 
 #. type: item
-#: doc/guix.texi:4426 doc/guix.texi:5100
+#: doc/guix.texi:4447 doc/guix.texi:5110
 #, no-wrap
 msgid "--format=@var{format}"
 msgstr "--format=@var{format}"
 
 #. type: itemx
-#: doc/guix.texi:4427 doc/guix.texi:5101
+#: doc/guix.texi:4448 doc/guix.texi:5111
 #, no-wrap
 msgid "-f @var{format}"
 msgstr "-f @var{format}"
 
 #. type: table
-#: doc/guix.texi:4429
+#: doc/guix.texi:4450
 msgid "Produce output in the specified @var{format}, one of:"
 msgstr "Произвести вывод в указанном формате @var{format}, одном из:"
 
 #. type: item
-#: doc/guix.texi:4431
+#: doc/guix.texi:4452
 #, no-wrap
 msgid "human"
 msgstr "human"
 
 #. type: table
-#: doc/guix.texi:4433
+#: doc/guix.texi:4454
 msgid "produce human-readable output;"
 msgstr "произвести вывод для чтения человеком;"
 
 #. type: table
-#: doc/guix.texi:4437
+#: doc/guix.texi:4458
 msgid "produce a list of channel specifications that can be passed to @command{guix pull -C} or installed as @file{~/.config/guix/channels.scm} (@pxref{Invoking guix pull});"
 msgstr "произвести список спецификаций каналов, который может использоваться в @command{guix pull -C} или вставлен в файл @file{~/.config/guix/channels.scm} (@pxref{Invoking guix pull});"
 
 #. type: item
-#: doc/guix.texi:4437 doc/guix.texi:9071
+#: doc/guix.texi:4458 doc/guix.texi:9170
 #, no-wrap
 msgid "json"
 msgstr "json"
 
 #. type: cindex
-#: doc/guix.texi:4438
+#: doc/guix.texi:4459
 #, no-wrap
 msgid "JSON"
 msgstr "JSON"
 
 #. type: table
-#: doc/guix.texi:4440
+#: doc/guix.texi:4461
 msgid "produce a list of channel specifications in JSON format;"
 msgstr "произвести список спецификаций каналов в формате JSON;"
 
 #. type: item
-#: doc/guix.texi:4440
+#: doc/guix.texi:4461
 #, no-wrap
 msgid "recutils"
 msgstr "recutils"
 
 #. type: table
-#: doc/guix.texi:4442
+#: doc/guix.texi:4463
 msgid "produce a list of channel specifications in Recutils format."
 msgstr "произвести список спецификаций каналов в формате Recutils."
 
 #. type: table
-#: doc/guix.texi:4447
+#: doc/guix.texi:4468
 msgid "Display information about @var{profile}."
 msgstr "Вывести информацию о профиле @var{profile}."
 
 #. type: section
-#: doc/guix.texi:4450
+#: doc/guix.texi:4471
 #, no-wrap
 msgid "Invoking @command{guix archive}"
 msgstr "Вызов @command{guix archive}"
 
 #. type: command{#1}
-#: doc/guix.texi:4452
+#: doc/guix.texi:4473
 #, no-wrap
 msgid "guix archive"
 msgstr "guix archive"
 
 #. type: cindex
-#: doc/guix.texi:4453
+#: doc/guix.texi:4474
 #, no-wrap
 msgid "archive"
 msgstr "архив"
 
 #. type: Plain text
-#: doc/guix.texi:4459
+#: doc/guix.texi:4480
 msgid "The @command{guix archive} command allows users to @dfn{export} files from the store into a single archive, and to later @dfn{import} them on a machine that runs Guix.  In particular, it allows store files to be transferred from one machine to the store on another machine."
 msgstr "Команда @command{guix archive} даёт возможность пользователям @dfn{экспортировать} файлы со склада в простой архив и затем @dfn{импортировать} их на машину с работающим Guix. В частности, это позволяет передавать файлы склада одной машины на склад другой машины."
 
 #. type: quotation
-#: doc/guix.texi:4463
+#: doc/guix.texi:4484
 msgid "If you're looking for a way to produce archives in a format suitable for tools other than Guix, @pxref{Invoking guix pack}."
 msgstr "Если вы ищете способ производить архивы в формате, который подходит для инструментов, отличных от Guix, смотрите @pxref{Invoking guix pack}."
 
 #. type: cindex
-#: doc/guix.texi:4465
+#: doc/guix.texi:4486
 #, no-wrap
 msgid "exporting store items"
 msgstr "экспорт элементов склада"
 
 #. type: Plain text
-#: doc/guix.texi:4467
+#: doc/guix.texi:4488
 msgid "To export store files as an archive to standard output, run:"
 msgstr "Чтобы экспортировать файлы склада в архив в стандартный вывод, выполните:"
 
 #. type: example
-#: doc/guix.texi:4470
+#: doc/guix.texi:4491
 #, no-wrap
 msgid "guix archive --export @var{options} @var{specifications}...\n"
 msgstr "guix archive --export @var{options} @var{specifications}...\n"
 
 #. type: Plain text
-#: doc/guix.texi:4477
+#: doc/guix.texi:4498
 msgid "@var{specifications} may be either store file names or package specifications, as for @command{guix package} (@pxref{Invoking guix package}).  For instance, the following command creates an archive containing the @code{gui} output of the @code{git} package and the main output of @code{emacs}:"
 msgstr "Спецификации @var{specifications} могут быть либо именами файлов или пакетами, как для команде @command{guix package} (@pxref{Invoking guix package}). Например, следующая команда создаёт архив, содержащий выход @code{gui} пакета @code{git} и главный выход @code{emacs}:"
 
 #. type: example
-#: doc/guix.texi:4480
+#: doc/guix.texi:4501
 #, no-wrap
 msgid "guix archive --export git:gui /gnu/store/...-emacs-24.3 > great.nar\n"
 msgstr "guix archive --export git:gui /gnu/store/...-emacs-24.3 > great.nar\n"
 
 #. type: Plain text
-#: doc/guix.texi:4485
+#: doc/guix.texi:4506
 msgid "If the specified packages are not built yet, @command{guix archive} automatically builds them.  The build process may be controlled with the common build options (@pxref{Common Build Options})."
 msgstr "Если указанные пакеты ещё не собраны, @command{guix archive} автоматически соберёт их. Процесс сборки может контролироваться обычными опциями сборки (@pxref{Common Build Options})."
 
 #. type: Plain text
-#: doc/guix.texi:4488
+#: doc/guix.texi:4509
 msgid "To transfer the @code{emacs} package to a machine connected over SSH, one would run:"
 msgstr "Чтобы передать пакет @code{emacs} на машину, соединённую по SSH, нужно следующее:"
 
 #. type: example
-#: doc/guix.texi:4491
+#: doc/guix.texi:4512
 #, no-wrap
 msgid "guix archive --export -r emacs | ssh the-machine guix archive --import\n"
 msgstr "guix archive --export -r emacs | ssh the-machine guix archive --import\n"
 
 #. type: Plain text
-#: doc/guix.texi:4496
+#: doc/guix.texi:4517
 msgid "Similarly, a complete user profile may be transferred from one machine to another like this:"
 msgstr "Точно также для передачи всего профиля пользователя из одной машины на другую, выполните:"
 
 #. type: example
-#: doc/guix.texi:4500
+#: doc/guix.texi:4521
 #, fuzzy, no-wrap
 #| msgid ""
 #| "guix archive --export -r $(readlink -f ~/.guix-profile) | \\\n"
@@ -9884,165 +10041,165 @@ msgstr ""
 "  ssh the-machine guix-archive --import\n"
 
 #. type: Plain text
-#: doc/guix.texi:4510
+#: doc/guix.texi:4531
 msgid "However, note that, in both examples, all of @code{emacs} and the profile as well as all of their dependencies are transferred (due to @code{-r}), regardless of what is already available in the store on the target machine.  The @code{--missing} option can help figure out which items are missing from the target store.  The @command{guix copy} command simplifies and optimizes this whole process, so this is probably what you should use in this case (@pxref{Invoking guix copy})."
 msgstr "Однако заметим, что в обоих примерах, передаются весь @code{emacs} и профиль вместе с их зависимости (ввиду @code{-r}), не учитывая, что доступно на складе целевой машины. Опция @code{--missing} помогает определить отсутствующие элементы на целевом складе. Команда @command{guix copy} упрощает и оптимизирует весь этот процесс, так что в данном случае она решает проблему (@pxref{Invoking guix copy})."
 
 #. type: cindex
-#: doc/guix.texi:4511
+#: doc/guix.texi:4532
 #, no-wrap
 msgid "nar, archive format"
 msgstr "nar, формат архива"
 
 #. type: cindex
-#: doc/guix.texi:4512
+#: doc/guix.texi:4533
 #, no-wrap
 msgid "normalized archive (nar)"
 msgstr "нормализованный архив (nar)"
 
 #. type: Plain text
-#: doc/guix.texi:4522
+#: doc/guix.texi:4543
 msgid "Archives are stored in the ``normalized archive'' or ``nar'' format, which is comparable in spirit to `tar', but with differences that make it more appropriate for our purposes.  First, rather than recording all Unix metadata for each file, the nar format only mentions the file type (regular, directory, or symbolic link); Unix permissions and owner/group are dismissed.  Second, the order in which directory entries are stored always follows the order of file names according to the C locale collation order.  This makes archive production fully deterministic."
 msgstr "Архивы сохраняются в нормализованном виде, или в формате nar, который по сути совместим с tar, но с отличиями, которые делают его более подходящим для наших целей. Во-первых, вместо записи всех метаданных Unix для каждого файла, формат nar упоминает только формат файла (обычный, директория, символическая ссылка); права доступа Unix и владелец/группа не учитываются. Во-вторых, порядок, в котором сохраняются компоненты директории, всегда соответствуют порядку имён файлов в соответствии с порядком сортировки локали C. Это делает производство архива полностью детерминистическим."
 
 #. type: Plain text
-#: doc/guix.texi:4528
+#: doc/guix.texi:4549
 msgid "When exporting, the daemon digitally signs the contents of the archive, and that digital signature is appended.  When importing, the daemon verifies the signature and rejects the import in case of an invalid signature or if the signing key is not authorized."
 msgstr "При экспортировании демон подписывает цифровой подписью содержимое архива, и эта цифровая подпись прикрепляется. При импорте демон проверяет подпись и отменяет импорт в случае недействительной подписи, или если ключ подписи не авторизован."
 
 #. type: Plain text
-#: doc/guix.texi:4530
+#: doc/guix.texi:4551
 msgid "The main options are:"
 msgstr "Основные опции:"
 
 #. type: item
-#: doc/guix.texi:4532
+#: doc/guix.texi:4553
 #, no-wrap
 msgid "--export"
 msgstr "--export"
 
 #. type: table
-#: doc/guix.texi:4535
+#: doc/guix.texi:4556
 msgid "Export the specified store files or packages (see below.)  Write the resulting archive to the standard output."
 msgstr "Экспортировать указанные файлы склада или пакеты (смотрите ниже). Писать результирующий архив в стандартный вывод."
 
 #. type: table
-#: doc/guix.texi:4538
+#: doc/guix.texi:4559
 msgid "Dependencies are @emph{not} included in the output, unless @code{--recursive} is passed."
 msgstr "Зависимости @emph{не} включаются в выход, если не задана опция  @code{--recursive}."
 
 #. type: itemx
-#: doc/guix.texi:4539 doc/guix.texi:8846 doc/guix.texi:8948 doc/guix.texi:8973
-#: doc/guix.texi:9176 doc/guix.texi:9217 doc/guix.texi:9264 doc/guix.texi:9289
+#: doc/guix.texi:4560 doc/guix.texi:8945 doc/guix.texi:9047 doc/guix.texi:9072
+#: doc/guix.texi:9275 doc/guix.texi:9316 doc/guix.texi:9363 doc/guix.texi:9388
 #, no-wrap
 msgid "-r"
 msgstr "-r"
 
 #. type: item
-#: doc/guix.texi:4540 doc/guix.texi:8845 doc/guix.texi:8947 doc/guix.texi:8972
-#: doc/guix.texi:9175 doc/guix.texi:9216 doc/guix.texi:9263 doc/guix.texi:9288
-#: doc/guix.texi:9340
+#: doc/guix.texi:4561 doc/guix.texi:8944 doc/guix.texi:9046 doc/guix.texi:9071
+#: doc/guix.texi:9274 doc/guix.texi:9315 doc/guix.texi:9362 doc/guix.texi:9387
+#: doc/guix.texi:9439
 #, no-wrap
 msgid "--recursive"
 msgstr "--recursive"
 
 #. type: table
-#: doc/guix.texi:4545
+#: doc/guix.texi:4566
 msgid "When combined with @code{--export}, this instructs @command{guix archive} to include dependencies of the given items in the archive.  Thus, the resulting archive is self-contained: it contains the closure of the exported store items."
 msgstr "При сочетании с @code{--export} это указывает @command{guix archive} включать в архив зависимости обозначенных элементов. Так результирующий архив будет \"сам в себе\": содержит полный конвейер экспортированных элементов склада."
 
 #. type: item
-#: doc/guix.texi:4546
+#: doc/guix.texi:4567
 #, no-wrap
 msgid "--import"
 msgstr "--import"
 
 #. type: table
-#: doc/guix.texi:4551
+#: doc/guix.texi:4572
 msgid "Read an archive from the standard input, and import the files listed therein into the store.  Abort if the archive has an invalid digital signature, or if it is signed by a public key not among the authorized keys (see @code{--authorize} below.)"
 msgstr "Читать архив из стандартного ввода и импортировать файлы, поставляемые им, на склад. Отклонить, если архив имеет недействительную цифровую подпись, или если он подписан публичным ключом, который не находится в списке авторизованных ключей (смотрите @code{--authorize} ниже)."
 
 #. type: item
-#: doc/guix.texi:4552
+#: doc/guix.texi:4573
 #, no-wrap
 msgid "--missing"
 msgstr "--missing"
 
 #. type: table
-#: doc/guix.texi:4556
+#: doc/guix.texi:4577
 msgid "Read a list of store file names from the standard input, one per line, and write on the standard output the subset of these files missing from the store."
 msgstr "Читать список имён файлов склада из стандартного ввода, одна линия - один файл, и писать в стандартный вывод подмножество этих файлов, отсутствующих на складе."
 
 #. type: item
-#: doc/guix.texi:4557
+#: doc/guix.texi:4578
 #, no-wrap
 msgid "--generate-key[=@var{parameters}]"
 msgstr "--generate-key[=@var{parameters}]"
 
 #. type: cindex
-#: doc/guix.texi:4558
+#: doc/guix.texi:4579
 #, no-wrap
 msgid "signing, archives"
 msgstr "подпись, архивов"
 
 #. type: table
-#: doc/guix.texi:4563
+#: doc/guix.texi:4584
 msgid "Generate a new key pair for the daemon.  This is a prerequisite before archives can be exported with @code{--export}.  Note that this operation usually takes time, because it needs to gather enough entropy to generate the key pair."
 msgstr "Генерировать новую ключ-пару для демона. Это необходимо получить перед тем, как экспортировать архивы опцией @code{--export}. Отметим, что эта операция обычно занимает время, так как необходимо собрать много энтропии для ключ-пары."
 
 #. type: table
-#: doc/guix.texi:4573
+#: doc/guix.texi:4594
 msgid "The generated key pair is typically stored under @file{/etc/guix}, in @file{signing-key.pub} (public key) and @file{signing-key.sec} (private key, which must be kept secret.)  When @var{parameters} is omitted, an ECDSA key using the Ed25519 curve is generated, or, for Libgcrypt versions before 1.6.0, it is a 4096-bit RSA key.  Alternatively, @var{parameters} can specify @code{genkey} parameters suitable for Libgcrypt (@pxref{General public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt Reference Manual})."
 msgstr "Сгенерированная ключ-пара обычно сохраняется под @file{/etc/guix}, в файлы @file{signing-key.pub} (публичный ключ) и @file{signing-key.sec} (прватный ключ, который должен оставаться в секрете). Если параметры @var{parameters} пропущены, генерируется ключ ECDSA, используя кривую Ed25519, или для Libgcrypt версии ранее 1.6.0 --- это 4096-битный ключ RSA. Альтернативно в параметрах @var{parameters} можно указать @code{genkey}, соответствующие Libgcrypt (@pxref{General public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt Reference Manual})."
 
 #. type: item
-#: doc/guix.texi:4574
+#: doc/guix.texi:4595
 #, no-wrap
 msgid "--authorize"
 msgstr "--authorize"
 
 #. type: cindex
-#: doc/guix.texi:4575
+#: doc/guix.texi:4596
 #, no-wrap
 msgid "authorizing, archives"
 msgstr "авторизация, архивов"
 
 #. type: table
-#: doc/guix.texi:4579
+#: doc/guix.texi:4600
 msgid "Authorize imports signed by the public key passed on standard input.  The public key must be in ``s-expression advanced format''---i.e., the same format as the @file{signing-key.pub} file."
 msgstr "Авторизовать импорт, подписанный публичным ключом, поступивший на стандартный ввод. Публичный ключ должен быть в формате s-expression, то есть в таком же формате, как файл @file{signing-key.pub}."
 
 #. type: table
-#: doc/guix.texi:4586
+#: doc/guix.texi:4607
 #, fuzzy
 #| msgid "The list of authorized keys is kept in the human-editable file @file{/etc/guix/acl}.  The file contains @url{http://people.csail.mit.edu/rivest/Sexp.txt, ``advanced-format s-expressions''} and is structured as an access-control list in the @url{http://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure (SPKI)}."
 msgid "The list of authorized keys is kept in the human-editable file @file{/etc/guix/acl}.  The file contains @url{https://people.csail.mit.edu/rivest/Sexp.txt, ``advanced-format s-expressions''} and is structured as an access-control list in the @url{https://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure (SPKI)}."
 msgstr "Список авторизованных ключей хранится в файле @file{/etc/guix/acl}, доступном для редактирования человеком. Файл содержит @url{http://people.csail.mit.edu/rivest/Sexp.txt, s-expression расширенного формата}, и он структурирован в виде списка контроля доступа в @url{http://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure (SPKI)}."
 
 #. type: item
-#: doc/guix.texi:4587
+#: doc/guix.texi:4608
 #, no-wrap
 msgid "--extract=@var{directory}"
 msgstr "--extract=@var{directory}"
 
 #. type: itemx
-#: doc/guix.texi:4588
+#: doc/guix.texi:4609
 #, no-wrap
 msgid "-x @var{directory}"
 msgstr "-x @var{directory}"
 
 #. type: table
-#: doc/guix.texi:4592
+#: doc/guix.texi:4613
 msgid "Read a single-item archive as served by substitute servers (@pxref{Substitutes}) and extract it to @var{directory}.  This is a low-level operation needed in only very narrow use cases; see below."
 msgstr "Читать архив, представляющий один элемент, в качестве поставленного серверами подстановки (@pxref{Substitutes}) и извлечь его в директорию @var{directory}. Это низкоуровневая операция, необходимая только в очень редких случаях, смотрите ниже."
 
 #. type: table
-#: doc/guix.texi:4595
+#: doc/guix.texi:4616
 msgid "For example, the following command extracts the substitute for Emacs served by @code{@value{SUBSTITUTE-SERVER}} to @file{/tmp/emacs}:"
 msgstr "Например, следующая команда распаковывает подстановку Emacs, поставленную @code{@value{SUBSTITUTE-SERVER}} в @file{/tmp/emacs}:"
 
 #. type: example
-#: doc/guix.texi:4600
+#: doc/guix.texi:4621
 #, no-wrap
 msgid ""
 "$ wget -O - \\\n"
@@ -10054,37 +10211,37 @@ msgstr ""
 "  | bunzip2 | guix archive -x /tmp/emacs\n"
 
 #. type: table
-#: doc/guix.texi:4607
+#: doc/guix.texi:4628
 msgid "Single-item archives are different from multiple-item archives produced by @command{guix archive --export}; they contain a single store item, and they do @emph{not} embed a signature.  Thus this operation does @emph{no} signature verification and its output should be considered unsafe."
 msgstr "Архивы, представляющие один элемент, отличаются от архивов, содержащих множество элементов, производимых @command{guix archive --export}. Они содержат один элемент склада, но они @emph{не} включают подпись. Так что эта операция @emph{не} использует верификацию, и его выход должен рассматриваться как небезопасный."
 
 #. type: table
-#: doc/guix.texi:4610
+#: doc/guix.texi:4631
 msgid "The primary purpose of this operation is to facilitate inspection of archive contents coming from possibly untrusted substitute servers."
 msgstr "Основная цель этой операции --- упростить просмотр содержимого архива, происходящего, возможно, из недоверенных серверов подстановок."
 
 #. type: item
-#: doc/guix.texi:4611
+#: doc/guix.texi:4632
 #, fuzzy, no-wrap
 #| msgid "--list-dead"
 msgid "--list"
 msgstr "--list-dead"
 
 #. type: itemx
-#: doc/guix.texi:4612 doc/guix.texi:9163 doc/guix.texi:9210
+#: doc/guix.texi:4633 doc/guix.texi:9262 doc/guix.texi:9309
 #, no-wrap
 msgid "-t"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4616
+#: doc/guix.texi:4637
 #, fuzzy
 #| msgid "Read a single-item archive as served by substitute servers (@pxref{Substitutes}) and extract it to @var{directory}.  This is a low-level operation needed in only very narrow use cases; see below."
 msgid "Read a single-item archive as served by substitute servers (@pxref{Substitutes}) and print the list of files it contains, as in this example:"
 msgstr "Читать архив, представляющий один элемент, в качестве поставленного серверами подстановки (@pxref{Substitutes}) и извлечь его в директорию @var{directory}. Это низкоуровневая операция, необходимая только в очень редких случаях, смотрите ниже."
 
 #. type: example
-#: doc/guix.texi:4621
+#: doc/guix.texi:4642
 #, fuzzy, no-wrap
 #| msgid ""
 #| "$ wget -O - \\\n"
@@ -10100,91 +10257,91 @@ msgstr ""
 "  | bunzip2 | guix archive -x /tmp/emacs\n"
 
 #. type: cindex
-#: doc/guix.texi:4630
+#: doc/guix.texi:4651
 #, no-wrap
 msgid "software development"
 msgstr "разработка программного обеспечения"
 
 #. type: Plain text
-#: doc/guix.texi:4634
+#: doc/guix.texi:4655
 msgid "If you are a software developer, Guix provides tools that you should find helpful---independently of the language you're developing in.  This is what this chapter is about."
 msgstr "Если вы являетесь разработчиком программного обеспечения, Guix предоставляет инструменты, которые вы можете найти полезными, независимо от языка разработки. Об этом данный раздел."
 
 #. type: Plain text
-#: doc/guix.texi:4640
+#: doc/guix.texi:4661
 msgid "The @command{guix environment} command provides a convenient way to set up @dfn{development environments} containing all the dependencies and tools necessary to work on the software package of your choice.  The @command{guix pack} command allows you to create @dfn{application bundles} that can be easily distributed to users who do not run Guix."
 msgstr "Команда @command{guix environment} предоставляет удобный способ установить @dfn{окружение разработки} на ваш выбор, содержащее все зависимости и инструменты, необходимые для работы с пакетом программы. Команда @command{guix pack} позволяет создавать @dfn{наборы приложений}, которые могут легко распространяться для пользователей, которые не используют Guix."
 
 #. type: section
-#: doc/guix.texi:4647
+#: doc/guix.texi:4668
 #, no-wrap
 msgid "Invoking @command{guix environment}"
 msgstr "Вызов @command{guix environment}"
 
 #. type: cindex
-#: doc/guix.texi:4649
+#: doc/guix.texi:4670
 #, no-wrap
 msgid "reproducible build environments"
 msgstr "воспроизводимые окружения сборки"
 
 #. type: cindex
-#: doc/guix.texi:4650
+#: doc/guix.texi:4671
 #, no-wrap
 msgid "development environments"
 msgstr "окружения разработки"
 
 #. type: command{#1}
-#: doc/guix.texi:4651
+#: doc/guix.texi:4672
 #, no-wrap
 msgid "guix environment"
 msgstr "guix environment"
 
 #. type: cindex
-#: doc/guix.texi:4652
+#: doc/guix.texi:4673
 #, no-wrap
 msgid "environment, package build environment"
 msgstr "окружение, окружение сборки пакета"
 
 #. type: Plain text
-#: doc/guix.texi:4658
+#: doc/guix.texi:4679
 msgid "The purpose of @command{guix environment} is to assist hackers in creating reproducible development environments without polluting their package profile.  The @command{guix environment} tool takes one or more packages, builds all of their inputs, and creates a shell environment to use them."
 msgstr "Цель @command{guix environment} --- помощь программистам в создании окружения разработки, которое можно повторять, без влияния на профили пакетов. Инструмент @command{guix environment} принимает один или более пакетов, собирает все входные данные для них и создаёт окружение оболочки для их использования."
 
 #. type: example
-#: doc/guix.texi:4663
+#: doc/guix.texi:4684
 #, no-wrap
 msgid "guix environment @var{options} @var{package}@dots{}\n"
 msgstr "guix environment @var{options} @var{package}@dots{}\n"
 
 #. type: Plain text
-#: doc/guix.texi:4667
+#: doc/guix.texi:4688
 msgid "The following example spawns a new shell set up for the development of GNU@tie{}Guile:"
 msgstr "Следующий пример порождает новую оболочку, установленную для разработки GNU@tie{}Guile:"
 
 #. type: example
-#: doc/guix.texi:4670
+#: doc/guix.texi:4691
 #, no-wrap
 msgid "guix environment guile\n"
 msgstr "guix environment guile\n"
 
 #. type: Plain text
-#: doc/guix.texi:4687
+#: doc/guix.texi:4708
 msgid "If the needed dependencies are not built yet, @command{guix environment} automatically builds them.  The environment of the new shell is an augmented version of the environment that @command{guix environment} was run in.  It contains the necessary search paths for building the given package added to the existing environment variables.  To create a ``pure'' environment, in which the original environment variables have been unset, use the @code{--pure} option@footnote{Users sometimes wrongfully augment environment variables such as @code{PATH} in their @file{~/.bashrc} file.  As a consequence, when @code{guix environment} launches it, Bash may read @file{~/.bashrc}, thereby introducing ``impurities'' in these environment variables.  It is an error to define such environment variables in @file{.bashrc}; instead, they should be defined in @file{.bash_profile}, which is sourced only by log-in shells.  @xref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}, for details on Bash start-up files.}."
 msgstr "Если необходимые зависимости ещё не собраны, @command{guix environment} автоматически собирает их. Окружение новой оболочки является приращённой версией окружения, которое создаётся командой @command{guix environment}. Оно создаёт необходимые пути поиска для сборки данного пакета и добавляет их к существующим переменным окружения. Чтобы создать \"чистое\" окружение, в котором исходные переменные окружения не установлены, используйте опцию @code{--pure} option@footnote{Пользователи обычно некорректно расширяют переменные окружения, как например, @code{PATH}, в их файлах @file{~/.bashrc}. Как следствие, @code{guix environment} запускает их, Bash может читать @file{~/.bashrc}, производя таким образом \"нечистоту\" в этих переменных окружения. Ошибочно определять такие переменные окружения в @file{.bashrc}; вместо этого они должны быть определены в @file{.bash_profile}, который вызывается оболочками только при авторизации. Смотрите @xref{Bash Startup Files,,, bash, The GNU Bash Reference Manual} для подробной информации о файлах Bash, вызываемых при входе.}."
 
 #. type: vindex
-#: doc/guix.texi:4688
+#: doc/guix.texi:4709
 #, no-wrap
 msgid "GUIX_ENVIRONMENT"
 msgstr "GUIX_ENVIRONMENT"
 
 #. type: Plain text
-#: doc/guix.texi:4694
+#: doc/guix.texi:4715
 msgid "@command{guix environment} defines the @code{GUIX_ENVIRONMENT} variable in the shell it spawns; its value is the file name of the profile of this environment.  This allows users to, say, define a specific prompt for development environments in their @file{.bashrc} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):"
 msgstr "@command{guix environment} определяет переменную @code{GUIX_ENVIRONMENT} в оболочке, которую создаёт; её значением является имя файла профиля этого окружения. Это позволяет пользователям, скажем, определить специфичные значения окружений разработки в @file{.bashrc} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):"
 
 #. type: example
-#: doc/guix.texi:4700
+#: doc/guix.texi:4721
 #, no-wrap
 msgid ""
 "if [ -n \"$GUIX_ENVIRONMENT\" ]\n"
@@ -10198,286 +10355,287 @@ msgstr ""
 "fi\n"
 
 #. type: Plain text
-#: doc/guix.texi:4704
+#: doc/guix.texi:4725
 msgid "...@: or to browse the profile:"
 msgstr "...@: или просмотеть профиль:"
 
 #. type: example
-#: doc/guix.texi:4707
+#: doc/guix.texi:4728
 #, no-wrap
 msgid "$ ls \"$GUIX_ENVIRONMENT/bin\"\n"
 msgstr "$ ls \"$GUIX_ENVIRONMENT/bin\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:4713
+#: doc/guix.texi:4734
 msgid "Additionally, more than one package may be specified, in which case the union of the inputs for the given packages are used.  For example, the command below spawns a shell where all of the dependencies of both Guile and Emacs are available:"
 msgstr "Дополним, что может быть указано более одного пакета, в таком случае используется объединённые входные данные для указанных пакетов. Например, команда ниже порождает оболочку, в котором доступны все зависимости, как Guile, так и Emacs:"
 
 #. type: example
-#: doc/guix.texi:4716
+#: doc/guix.texi:4737
 #, no-wrap
 msgid "guix environment guile emacs\n"
 msgstr "guix environment guile emacs\n"
 
 #. type: Plain text
-#: doc/guix.texi:4721
+#: doc/guix.texi:4742
 msgid "Sometimes an interactive shell session is not desired.  An arbitrary command may be invoked by placing the @code{--} token to separate the command from the rest of the arguments:"
 msgstr "Иногда интерактивная сессия оболочки не нужна. Можно вызвать произвольную команду при указании токена @code{--}, который отделяет команду от остальных аргументов:"
 
 #. type: example
-#: doc/guix.texi:4724
+#: doc/guix.texi:4745
 #, no-wrap
 msgid "guix environment guile -- make -j4\n"
 msgstr "guix environment guile -- make -j4\n"
 
 #. type: Plain text
-#: doc/guix.texi:4730
+#: doc/guix.texi:4751
 msgid "In other situations, it is more convenient to specify the list of packages needed in the environment.  For example, the following command runs @command{python} from an environment containing Python@tie{}2.7 and NumPy:"
 msgstr "В других ситуациях удобнее указать список паетов, необходимых для окружения. Например, следующая команда запускает @command{python} из окружения, содержащего Python@tie{}2.7 и NumPy:"
 
 #. type: example
-#: doc/guix.texi:4733
+#: doc/guix.texi:4754
 #, no-wrap
 msgid "guix environment --ad-hoc python2-numpy python-2.7 -- python\n"
 msgstr "guix environment --ad-hoc python2-numpy python-2.7 -- python\n"
 
 #. type: Plain text
-#: doc/guix.texi:4744
+#: doc/guix.texi:4765
 msgid "Furthermore, one might want the dependencies of a package and also some additional packages that are not build-time or runtime dependencies, but are useful when developing nonetheless.  Because of this, the @code{--ad-hoc} flag is positional.  Packages appearing before @code{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment.  Packages appearing after are interpreted as packages that will be added to the environment directly.  For example, the following command creates a Guix development environment that additionally includes Git and strace:"
 msgstr "Более того, возможно, вам потребуются зависимости пакета, а также некоторые дополнительные пакеты, которые не являются зависимостями процесса сборки или процесса исполнения (работы), но важны при разработке. Для этого и указан флаш @code{--ad-hoc}. Пакеты, обозначенные до @code{--ad-hoc} интерпретируются как пакеты, чьи зависимости будут добавлены в окружение. Пакеты, которые обозначены после @code{--ad-hoc}, интерпретируются как пакеты, которые будут добавлены в окружение непосредственно. Например, следующая команда создаёт окружение разработки Guix, которая в дополнение включает Git и strace:"
 
 #. type: example
-#: doc/guix.texi:4747
-#, no-wrap
-msgid "guix environment guix --ad-hoc git strace\n"
+#: doc/guix.texi:4768
+#, fuzzy, no-wrap
+#| msgid "guix environment guix --ad-hoc git strace\n"
+msgid "guix environment --pure guix --ad-hoc git strace\n"
 msgstr "guix environment guix --ad-hoc git strace\n"
 
 #. type: Plain text
-#: doc/guix.texi:4756
+#: doc/guix.texi:4777
 msgid "Sometimes it is desirable to isolate the environment as much as possible, for maximal purity and reproducibility.  In particular, when using Guix on a host distro that is not Guix System, it is desirable to prevent access to @file{/usr/bin} and other system-wide resources from the development environment.  For example, the following command spawns a Guile REPL in a ``container'' where only the store and the current working directory are mounted:"
 msgstr "Иногда возникает необходимость изолировать окружение настолько, насколькоо возможно, для максимальной чистоты и воспроизводимости. В частности, при использовании Guix на дистрибутиве, отличном от системы Guix, желательно предотвращать доступ из окружения разработки к @file{/usr/bin} и другим ресурсам системы. Например, следующая команда порождает Guile REPL в \"контейнере\", в котором монтированы только склад и текущая рабочая директория:"
 
 #. type: example
-#: doc/guix.texi:4759
+#: doc/guix.texi:4780
 #, no-wrap
 msgid "guix environment --ad-hoc --container guile -- guile\n"
 msgstr "guix environment --ad-hoc --container guile -- guile\n"
 
 #. type: quotation
-#: doc/guix.texi:4763
+#: doc/guix.texi:4784
 msgid "The @code{--container} option requires Linux-libre 3.19 or newer."
 msgstr "Опция @code{--container} требует Linux-libre 3.19 или новее."
 
 #. type: Plain text
-#: doc/guix.texi:4766
+#: doc/guix.texi:4787
 msgid "The available options are summarized below."
 msgstr "Доступные опции резюмированы ниже."
 
 #. type: item
-#: doc/guix.texi:4768 doc/guix.texi:5283 doc/guix.texi:8606
-#: doc/guix.texi:26663
+#: doc/guix.texi:4789 doc/guix.texi:5293 doc/guix.texi:8705
+#: doc/guix.texi:26926
 #, no-wrap
 msgid "--root=@var{file}"
 msgstr "--root=@var{file}"
 
 #. type: itemx
-#: doc/guix.texi:4769 doc/guix.texi:5284 doc/guix.texi:8607
-#: doc/guix.texi:26664
+#: doc/guix.texi:4790 doc/guix.texi:5294 doc/guix.texi:8706
+#: doc/guix.texi:26927
 #, no-wrap
 msgid "-r @var{file}"
 msgstr "-r @var{file}"
 
 #. type: cindex
-#: doc/guix.texi:4770
+#: doc/guix.texi:4791
 #, no-wrap
 msgid "persistent environment"
 msgstr "постоянное окружение"
 
 #. type: cindex
-#: doc/guix.texi:4771
+#: doc/guix.texi:4792
 #, no-wrap
 msgid "garbage collector root, for environments"
 msgstr "корень сборщика мусора, для окружений"
 
 #. type: table
-#: doc/guix.texi:4774
+#: doc/guix.texi:4795
 msgid "Make @var{file} a symlink to the profile for this environment, and register it as a garbage collector root."
 msgstr "Создать символическую ссылку @var{file} на профиль этого окружения и зарегистрировать её как корень сборщика мусора."
 
 #. type: table
-#: doc/guix.texi:4777
+#: doc/guix.texi:4798
 msgid "This is useful if you want to protect your environment from garbage collection, to make it ``persistent''."
 msgstr "Это полезно, если вы хотите защитить своё окружение от сборщика мусора, сделать его \"постоянным\"."
 
 #. type: table
-#: doc/guix.texi:4783
+#: doc/guix.texi:4804
 msgid "When this option is omitted, the environment is protected from garbage collection only for the duration of the @command{guix environment} session.  This means that next time you recreate the same environment, you could have to rebuild or re-download packages.  @xref{Invoking guix gc}, for more on GC roots."
 msgstr "Если эта опция пропущена, окружеие защищено от сборщика мусора только на время сессии @command{guix environment}. Это означает, что в следующий раз, когда вы создадите такое же окружение, вам потребуется пересобирать и скачивать пакеты заново. @xref{Invoking guix gc}, for more on GC roots."
 
 #. type: item
-#: doc/guix.texi:4784 doc/guix.texi:5216 doc/guix.texi:8459 doc/guix.texi:9385
-#: doc/guix.texi:10090 doc/guix.texi:26598
+#: doc/guix.texi:4805 doc/guix.texi:5226 doc/guix.texi:8558 doc/guix.texi:9484
+#: doc/guix.texi:10189 doc/guix.texi:26861
 #, no-wrap
 msgid "--expression=@var{expr}"
 msgstr "--expression=@var{expr}"
 
 #. type: itemx
-#: doc/guix.texi:4785 doc/guix.texi:5217 doc/guix.texi:8460 doc/guix.texi:9386
-#: doc/guix.texi:10091 doc/guix.texi:26599
+#: doc/guix.texi:4806 doc/guix.texi:5227 doc/guix.texi:8559 doc/guix.texi:9485
+#: doc/guix.texi:10190 doc/guix.texi:26862
 #, no-wrap
 msgid "-e @var{expr}"
 msgstr "-e @var{expr}"
 
 #. type: table
-#: doc/guix.texi:4788
+#: doc/guix.texi:4809
 msgid "Create an environment for the package or list of packages that @var{expr} evaluates to."
 msgstr "Создать окружение для пакета или списка пакетов, которые соответствуют выражению @var{expr}."
 
 #. type: table
-#: doc/guix.texi:4790
+#: doc/guix.texi:4811
 msgid "For example, running:"
 msgstr "Например, запуск:"
 
 #. type: example
-#: doc/guix.texi:4793
+#: doc/guix.texi:4814
 #, no-wrap
 msgid "guix environment -e '(@@ (gnu packages maths) petsc-openmpi)'\n"
 msgstr "guix environment -e '(@@ (gnu packages maths) petsc-openmpi)'\n"
 
 #. type: table
-#: doc/guix.texi:4797
+#: doc/guix.texi:4818
 msgid "starts a shell with the environment for this specific variant of the PETSc package."
 msgstr "запускает оболочку с окружением для этого специфического варианта пакета PETSc."
 
 #. type: table
-#: doc/guix.texi:4799
+#: doc/guix.texi:4820
 msgid "Running:"
 msgstr "Запуск:"
 
 #. type: example
-#: doc/guix.texi:4802
+#: doc/guix.texi:4823
 #, no-wrap
 msgid "guix environment --ad-hoc -e '(@@ (gnu) %base-packages)'\n"
 msgstr "guix environment --ad-hoc -e '(@@ (gnu) %base-packages)'\n"
 
 #. type: table
-#: doc/guix.texi:4805
+#: doc/guix.texi:4826
 msgid "starts a shell with all the base system packages available."
 msgstr "стартует оболочку со всеми доступными базовыми пакетами."
 
 #. type: table
-#: doc/guix.texi:4808
+#: doc/guix.texi:4829
 msgid "The above commands only use the default output of the given packages.  To select other outputs, two element tuples can be specified:"
 msgstr "Команды выше используют только выход по умолчанию обозначенных пакетов. Чтобы выбрать другие выходы, можно указать два элемента кортежей:"
 
 #. type: example
-#: doc/guix.texi:4811
+#: doc/guix.texi:4832
 #, no-wrap
 msgid "guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) \"include\")'\n"
 msgstr "guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) \"include\")'\n"
 
 #. type: item
-#: doc/guix.texi:4813
+#: doc/guix.texi:4834
 #, no-wrap
 msgid "--load=@var{file}"
 msgstr "--load=@var{file}"
 
 #. type: itemx
-#: doc/guix.texi:4814
+#: doc/guix.texi:4835
 #, no-wrap
 msgid "-l @var{file}"
 msgstr "-l @var{file}"
 
 #. type: table
-#: doc/guix.texi:4817
+#: doc/guix.texi:4838
 msgid "Create an environment for the package or list of packages that the code within @var{file} evaluates to."
 msgstr "Создать окружение для пакета или списка пакетов, код которых задан в файле @var{file}."
 
 #. type: lisp
-#: doc/guix.texi:4823
+#: doc/guix.texi:4844
 #, no-wrap
 msgid "@verbatiminclude environment-gdb.scm\n"
 msgstr "@verbatiminclude environment-gdb.scm\n"
 
 #. type: table
-#: doc/guix.texi:4830
+#: doc/guix.texi:4851
 #, fuzzy
 #| msgid "Create an environment for the packages contained in the manifest object returned by the Scheme code in @var{file}."
 msgid "Create an environment for the packages contained in the manifest object returned by the Scheme code in @var{file}.  This option can be repeated several times, in which case the manifests are concatenated."
 msgstr "Создать окружение для пакетов, содержащихся в объекте манифеста, возвращаемого кодом Scheme в файле @var{file}."
 
 #. type: table
-#: doc/guix.texi:4834
+#: doc/guix.texi:4855
 msgid "This is similar to the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same manifest files."
 msgstr "Это то же, что опция с таким же именем в @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) и использует такие же файлы манифестов."
 
 #. type: item
-#: doc/guix.texi:4835
+#: doc/guix.texi:4856
 #, no-wrap
 msgid "--ad-hoc"
 msgstr "--ad-hoc"
 
 #. type: table
-#: doc/guix.texi:4840
+#: doc/guix.texi:4861
 msgid "Include all specified packages in the resulting environment, as if an @i{ad hoc} package were defined with them as inputs.  This option is useful for quickly creating an environment without having to write a package expression to contain the desired inputs."
 msgstr "Включить все указанные пакеты в результирующее окружение, если бы целевой (лат. @i{ad hoc}) пакет имел бы их как входные данные. Эта опция полезна для быстрого создания окружения без необходимости писать выражение типа пакет, содержащее желаемые входные данные."
 
 #. type: table
-#: doc/guix.texi:4842
+#: doc/guix.texi:4863
 msgid "For instance, the command:"
 msgstr "Например, команда:"
 
 #. type: example
-#: doc/guix.texi:4845
+#: doc/guix.texi:4866
 #, no-wrap
 msgid "guix environment --ad-hoc guile guile-sdl -- guile\n"
 msgstr "guix environment --ad-hoc guile guile-sdl -- guile\n"
 
 #. type: table
-#: doc/guix.texi:4849
+#: doc/guix.texi:4870
 msgid "runs @command{guile} in an environment where Guile and Guile-SDL are available."
 msgstr "запускает @command{guile} в окружении, в котором доступны Guile и Guile-SDL."
 
 #. type: table
-#: doc/guix.texi:4854
+#: doc/guix.texi:4875
 msgid "Note that this example implicitly asks for the default output of @code{guile} and @code{guile-sdl}, but it is possible to ask for a specific output---e.g., @code{glib:bin} asks for the @code{bin} output of @code{glib} (@pxref{Packages with Multiple Outputs})."
 msgstr "Отметим, что этот пример явно запрашивает выходы @code{guile} и  @code{guile-sdl} по умолчанию, но возможно запросить специфичный выход, то есть @code{glib:bin} запрашивает выход @code{bin} из @code{glib} (@pxref{Packages with Multiple Outputs})."
 
 #. type: table
-#: doc/guix.texi:4860
+#: doc/guix.texi:4881
 msgid "This option may be composed with the default behavior of @command{guix environment}.  Packages appearing before @code{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment, the default behavior.  Packages appearing after are interpreted as packages that will be added to the environment directly."
 msgstr "Эта опция может сочетаться с поведением по умолчанию @command{guix environment}. Пакеты, которые появляются до @code{--ad-hoc} интерпретируются как пакеты, чьи зависимости будут добавлены в окружение (поведение по умолчанию). Пакеты, которые появляются после этой опции, интерпретируются как пакеты, которые будут добавлены в окружение непосредственно."
 
 #. type: item
-#: doc/guix.texi:4861
+#: doc/guix.texi:4882
 #, no-wrap
 msgid "--pure"
 msgstr "--pure"
 
 #. type: table
-#: doc/guix.texi:4865
+#: doc/guix.texi:4886
 msgid "Unset existing environment variables when building the new environment, except those specified with @option{--preserve} (see below.)  This has the effect of creating an environment in which search paths only contain package inputs."
 msgstr "Сброс существующих переменных окружения при сборке нового окружения, кроме обозначенных в опции @option{--preserve} (смотрите ниже). Эффект этой опции --- создание окружения, в котором пути поиска содержат только входные данные пакета."
 
 #. type: item
-#: doc/guix.texi:4866
+#: doc/guix.texi:4887
 #, no-wrap
 msgid "--preserve=@var{regexp}"
 msgstr "--preserve=@var{regexp}"
 
 #. type: itemx
-#: doc/guix.texi:4867
+#: doc/guix.texi:4888
 #, no-wrap
 msgid "-E @var{regexp}"
 msgstr "-E @var{regexp}"
 
 #. type: table
-#: doc/guix.texi:4872
+#: doc/guix.texi:4893
 msgid "When used alongside @option{--pure}, preserve the environment variables matching @var{regexp}---in other words, put them on a ``white list'' of environment variables that must be preserved.  This option can be repeated several times."
 msgstr "При использовании вместе с @option{--pure}, оставить содержимое переменных окружения, соответствующих выражению @var{regexp} --- другими словами, включить их в \"белый список\" переменных окружения, которые не должны обнуляться. Эту опцию можно повторять несколько раз."
 
 #. type: example
-#: doc/guix.texi:4876
+#: doc/guix.texi:4897
 #, no-wrap
 msgid ""
 "guix environment --pure --preserve=^SLURM --ad-hoc openmpi @dots{} \\\n"
@@ -10487,111 +10645,111 @@ msgstr ""
 "  -- mpirun @dots{}\n"
 
 #. type: table
-#: doc/guix.texi:4882
+#: doc/guix.texi:4903
 msgid "This example runs @command{mpirun} in a context where the only environment variables defined are @code{PATH}, environment variables whose name starts with @code{SLURM}, as well as the usual ``precious'' variables (@code{HOME}, @code{USER}, etc.)"
 msgstr "Этот пример запускает @command{mpirun} в контексте, в котором определены только следующие переменные окружения: @code{PATH}, переменные окружения, чьи имена начинаются с @code{SLURM}, а также обычные \"дорогие\" переменные (@code{HOME}, @code{USER}, и т.д.)"
 
 #. type: item
-#: doc/guix.texi:4883
+#: doc/guix.texi:4904
 #, no-wrap
 msgid "--search-paths"
 msgstr "--search-paths"
 
 #. type: table
-#: doc/guix.texi:4886
+#: doc/guix.texi:4907
 msgid "Display the environment variable definitions that make up the environment."
 msgstr "Отобразить определения переменных окружения, которые составляют окружение."
 
 #. type: table
-#: doc/guix.texi:4890
+#: doc/guix.texi:4911
 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}."
 msgstr "Попытаться собрать систему @var{system}, то есть @code{i686-linux}."
 
 #. type: item
-#: doc/guix.texi:4891
+#: doc/guix.texi:4912
 #, no-wrap
 msgid "--container"
 msgstr "--container"
 
 #. type: itemx
-#: doc/guix.texi:4892
+#: doc/guix.texi:4913
 #, no-wrap
 msgid "-C"
 msgstr "-C"
 
 #. type: item
-#: doc/guix.texi:4893 doc/guix.texi:10607 doc/guix.texi:26566
+#: doc/guix.texi:4914 doc/guix.texi:10706 doc/guix.texi:26829
 #, no-wrap
 msgid "container"
 msgstr "контейнер"
 
 #. type: table
-#: doc/guix.texi:4899
+#: doc/guix.texi:4920
 msgid "Run @var{command} within an isolated container.  The current working directory outside the container is mapped inside the container.  Additionally, unless overridden with @code{--user}, a dummy home directory is created that matches the current user's home directory, and @file{/etc/passwd} is configured accordingly."
 msgstr "Запустить @var{command} в изолированном контейнере. Текущая рабочая директория за пределами контейнера отображается внутри контейнера. В дополнение, если это не переопределено опцией @code{--user}, тогда настраивается фиктивная домашняя директория, которая совпадает с домашней директорией текущего пользователя, а также соответствующий файл @file{/etc/passwd}."
 
 #. type: table
-#: doc/guix.texi:4903
+#: doc/guix.texi:4924
 msgid "The spawned process runs as the current user outside the container.  Inside the container, it has the same UID and GID as the current user, unless @option{--user} is passed (see below.)"
 msgstr "Порождаемый процесс снаружи предстаёт как запущенный от текущего пользователя. Внутри контейнера он имеет такие же UID и GID, что и текущий пользователь, если не обозначена @option{--user} (смотрите ниже)."
 
 #. type: item
-#: doc/guix.texi:4904 doc/guix.texi:26658
+#: doc/guix.texi:4925 doc/guix.texi:26921
 #, no-wrap
 msgid "--network"
 msgstr "--network"
 
 #. type: table
-#: doc/guix.texi:4909
+#: doc/guix.texi:4930
 msgid "For containers, share the network namespace with the host system.  Containers created without this flag only have access to the loopback device."
 msgstr "Разделять пространство сетевых имён контейнера с хостящей системой. Контейнеры, созданные без этого флага, могут только иметь доступ к петлевому устройству."
 
 #. type: item
-#: doc/guix.texi:4910
+#: doc/guix.texi:4931
 #, no-wrap
 msgid "--link-profile"
 msgstr "--link-profile"
 
 #. type: itemx
-#: doc/guix.texi:4911
+#: doc/guix.texi:4932
 #, no-wrap
 msgid "-P"
 msgstr "-P"
 
 #. type: table
-#: doc/guix.texi:4918
+#: doc/guix.texi:4939
 msgid "For containers, link the environment profile to @file{~/.guix-profile} within the container.  This is equivalent to running the command @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile} within the container.  Linking will fail and abort the environment if the directory already exists, which will certainly be the case if @command{guix environment} was invoked in the user's home directory."
 msgstr "Связать профиль окружения контейнера с @file{~/.guix-profile} внутри контейнера. Это эквивалент запуска команды @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile} внутри контейнера. Связывание завершится ошибкой и отменит создание окружения, если директория уже существует, что, конечно, будет происходить, если @command{guix environment} вызвана в домашней директории пользователя."
 
 #. type: table
-#: doc/guix.texi:4925
+#: doc/guix.texi:4946
 msgid "Certain packages are configured to look in @code{~/.guix-profile} for configuration files and data;@footnote{For example, the @code{fontconfig} package inspects @file{~/.guix-profile/share/fonts} for additional fonts.} @code{--link-profile} allows these programs to behave as expected within the environment."
 msgstr "Определённые пакеты сконфигурированы, чтобы смотреть конфигурационные файлы и данные в @code{~/.guix-profile};@footnote{Например, пакет @code{fontconfig} просматривает @file{~/.guix-profile/share/fonts} для дополнительных шрифтов.} @code{--link-profile} позволяет этим программам вести себя ожидаемо внутри окружения."
 
 #. type: item
-#: doc/guix.texi:4926 doc/guix.texi:10222
+#: doc/guix.texi:4947 doc/guix.texi:10321
 #, no-wrap
 msgid "--user=@var{user}"
 msgstr "--user=@var{user}"
 
 #. type: itemx
-#: doc/guix.texi:4927 doc/guix.texi:10223
+#: doc/guix.texi:4948 doc/guix.texi:10322
 #, no-wrap
 msgid "-u @var{user}"
 msgstr "-u @var{user}"
 
 #. type: table
-#: doc/guix.texi:4934
+#: doc/guix.texi:4955
 msgid "For containers, use the username @var{user} in place of the current user.  The generated @file{/etc/passwd} entry within the container will contain the name @var{user}, the home directory will be @file{/home/@var{user}}, and no user GECOS data will be copied.  Furthermore, the UID and GID inside the container are 1000.  @var{user} need not exist on the system."
 msgstr "Использовать в контейнере имя пользователя @var{user} вместо текущего пользователя. Созданная внутри контейнера запись @file{/etc/passwd} будет содержать имя @var{user}, домашняя директория будет @file{/home/@var{user}}, но не будут копированы пользовательские данные GECOS. Более того, внутри контейнера UID и GID будут 1000.  @var{user} не обязательно должен существовать в системе."
 
 #. type: table
-#: doc/guix.texi:4939
+#: doc/guix.texi:4960
 msgid "Additionally, any shared or exposed path (see @code{--share} and @code{--expose} respectively) whose target is within the current user's home directory will be remapped relative to @file{/home/USER}; this includes the automatic mapping of the current working directory."
 msgstr "В дополнение, любой разделяемый или расширяемый путь (смотрите @code{--share} и @code{--expose} соответственно), чьи цели находятся в домашней директории пользователя, будут отображены соответственно в @file{/home/USER}; это включает автоматическое отображение текущей рабочей директории."
 
 #. type: example
-#: doc/guix.texi:4946
+#: doc/guix.texi:4967
 #, no-wrap
 msgid ""
 "# will expose paths as /home/foo/wd, /home/foo/test, and /home/foo/target\n"
@@ -10607,122 +10765,108 @@ msgstr ""
 "     --expose=/tmp/target=$HOME/target\n"
 
 #. type: table
-#: doc/guix.texi:4951
+#: doc/guix.texi:4972
 msgid "While this will limit the leaking of user identity through home paths and each of the user fields, this is only one useful component of a broader privacy/anonymity solution---not one in and of itself."
 msgstr "Это ограничит утечку данных идентификации пользователя через домашние пути и каждое из полей пользователя. Это один единственный компонент расширенного решения приватности/анонимности --- ничто не войдёт, ничто не выйдет."
 
 #. type: item
-#: doc/guix.texi:4952
+#: doc/guix.texi:4973
 #, no-wrap
 msgid "--no-cwd"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4959
+#: doc/guix.texi:4980
 msgid "For containers, the default behavior is to share the current working directory with the isolated container and immediately change to that directory within the container.  If this is undesirable, @code{--no-cwd} will cause the current working directory to @emph{not} be automatically shared and will change to the user's home directory within the container instead.  See also @code{--user}."
 msgstr "Для контейнеров стандартным поведением является разделение текущего рабочего каталога с изолированным контейнером и немедленное переключение на этот каталог в контейнере. Если это нежелательно, @code{--no-cwd} приведет к автоматическому доступу к текущему рабочему каталогу @emph{not}, который изменится на домашний каталог пользователя в контейнере. Смотрите также @code{--user}."
 
 #. type: item
-#: doc/guix.texi:4960
+#: doc/guix.texi:4981
 #, no-wrap
 msgid "--expose=@var{source}[=@var{target}]"
 msgstr "--expose=@var{source}[=@var{target}]"
 
+#. type: itemx
+#: doc/guix.texi:4982
+#, no-wrap
+msgid "--share=@var{source}[=@var{target}]"
+msgstr "--share=@var{source}[=@var{target}]"
+
 #. type: table
-#: doc/guix.texi:4965
-msgid "For containers, expose the file system @var{source} from the host system as the read-only file system @var{target} within the container.  If @var{target} is not specified, @var{source} is used as the target mount point in the container."
+#: doc/guix.texi:4988
+#, fuzzy
+#| msgid "For containers, expose the file system @var{source} from the host system as the read-only file system @var{target} within the container.  If @var{target} is not specified, @var{source} is used as the target mount point in the container."
+msgid "For containers, @code{--expose} (resp. @code{--share}) exposes the file system @var{source} from the host system as the read-only (resp. writable) file system @var{target} within the container.  If @var{target} is not specified, @var{source} is used as the target mount point in the container."
 msgstr "Расширить файловую систему контейнера источником @var{source} из хостящей системы в качестве файловой системы только для чтения с целью @var{target} внутри контейнера.  Если цель @var{target} не задана, источник @var{source} используется как целевая точка монтирования в контейнере."
 
 #. type: table
-#: doc/guix.texi:4969
+#: doc/guix.texi:4992
 msgid "The example below spawns a Guile REPL in a container in which the user's home directory is accessible read-only via the @file{/exchange} directory:"
 msgstr "Пример ниже порождает Guile REPL в контейнере, в котором домашняя директория пользователя доступна только для чтения через директорию @file{/exchange}:"
 
 #. type: example
-#: doc/guix.texi:4972
+#: doc/guix.texi:4995
 #, no-wrap
 msgid "guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile\n"
 msgstr "guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile\n"
 
-#. type: item
-#: doc/guix.texi:4974
-#, no-wrap
-msgid "--share=@var{source}[=@var{target}]"
-msgstr "--share=@var{source}[=@var{target}]"
-
-#. type: table
-#: doc/guix.texi:4979
-msgid "For containers, share the file system @var{source} from the host system as the writable file system @var{target} within the container.  If @var{target} is not specified, @var{source} is used as the target mount point in the container."
-msgstr "Разделять в контейнере файловую систему @var{source} хостящей системы как файловую систему, доступную для записи, с целью @var{target} внутри контейнера. Если цель @var{target} не задана, источник @var{source} используется в качестве целевой точки монтирования в контейнере."
-
-#. type: table
-#: doc/guix.texi:4983
-msgid "The example below spawns a Guile REPL in a container in which the user's home directory is accessible for both reading and writing via the @file{/exchange} directory:"
-msgstr "Пример ниже порождает Guile REPL в контейнере, в котором домашняя директория пользователя доступна для чтения и записи через директорию @file{/exchange}:"
-
-#. type: example
-#: doc/guix.texi:4986
-#, no-wrap
-msgid "guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile\n"
-msgstr "guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile\n"
-
 #. type: Plain text
-#: doc/guix.texi:4993
+#: doc/guix.texi:5003
 msgid "@command{guix environment} also supports all of the common build options that @command{guix build} supports (@pxref{Common Build Options}) as well as package transformation options (@pxref{Package Transformation Options})."
 msgstr "@command{guix environment} также поддерживает все обычные опции сборки, которые поддерживает команда @command{guix build} (@pxref{Common Build Options}), а также опции трансформации пакета (@pxref{Package Transformation Options})."
 
 #. type: section
-#: doc/guix.texi:4995
+#: doc/guix.texi:5005
 #, no-wrap
 msgid "Invoking @command{guix pack}"
 msgstr "Вызов @command{guix pack}"
 
 #. type: Plain text
-#: doc/guix.texi:5001
+#: doc/guix.texi:5011
 msgid "Occasionally you want to pass software to people who are not (yet!)  lucky enough to be using Guix.  You'd tell them to run @command{guix package -i @var{something}}, but that's not possible in this case.  This is where @command{guix pack} comes in."
 msgstr "Иногда бывает необходимо передать программу людям, которые (ещё!) не являются счастливыми обладателями Guix. Вы могли бы им рекомендовать заустить @command{guix package -i @var{something}}, но в данном случае это не подхлдит. Тогда @command{guix pack} решает вопрос."
 
 #. type: quotation
-#: doc/guix.texi:5006
+#: doc/guix.texi:5016
 msgid "If you are looking for ways to exchange binaries among machines that already run Guix, @pxref{Invoking guix copy}, @ref{Invoking guix publish}, and @ref{Invoking guix archive}."
 msgstr "Если вы ищете способ обмена бинарниками между машинами, работающими с Guix, @pxref{Invoking guix copy}, @ref{Invoking guix publish} и @ref{Invoking guix archive}."
 
 #. type: cindex
-#: doc/guix.texi:5008
+#: doc/guix.texi:5018
 #, no-wrap
 msgid "pack"
 msgstr "упаковка"
 
 #. type: cindex
-#: doc/guix.texi:5009
+#: doc/guix.texi:5019
 #, no-wrap
 msgid "bundle"
 msgstr "набор"
 
 #. type: cindex
-#: doc/guix.texi:5010
+#: doc/guix.texi:5020
 #, no-wrap
 msgid "application bundle"
 msgstr "набор приложений"
 
 #. type: cindex
-#: doc/guix.texi:5011
+#: doc/guix.texi:5021
 #, no-wrap
 msgid "software bundle"
 msgstr "набор приложений"
 
 #. type: Plain text
-#: doc/guix.texi:5020
+#: doc/guix.texi:5030
 msgid "The @command{guix pack} command creates a shrink-wrapped @dfn{pack} or @dfn{software bundle}: it creates a tarball or some other archive containing the binaries of the software you're interested in, and all its dependencies.  The resulting archive can be used on any machine that does not have Guix, and people can run the exact same binaries as those you have with Guix.  The pack itself is created in a bit-reproducible fashion, so anyone can verify that it really contains the build results that you pretend to be shipping."
 msgstr "Команда @command{guix pack} создаёт обёрнутый @dfn{набор} или @dfn{программный набор}: она создаёт архив tarball или другой архив, содержащий исполняемые файлы программного обеспечения, которое вас интересует, а также все его зависимости. Результирующий архив может использоваться на любой машине, которая не имеет Guix, а люди могут запустить совершенно такие же бинарники, как у вас в Guix. Набор создаётся со свойством воспроизводимости до бита, так что любой может проверить, что он действительно содержит результаты сборок, которые вы поставляете."
 
 #. type: Plain text
-#: doc/guix.texi:5023
+#: doc/guix.texi:5033
 msgid "For example, to create a bundle containing Guile, Emacs, Geiser, and all their dependencies, you can run:"
 msgstr "Например, чтобы создать набор, содержащий Guile, Emacs, Geiser и все их зависимости, можно запустить:"
 
 #. type: example
-#: doc/guix.texi:5028
+#: doc/guix.texi:5038
 #, no-wrap
 msgid ""
 "$ guix pack guile emacs geiser\n"
@@ -10734,64 +10878,64 @@ msgstr ""
 "/gnu/store/@dots{}-pack.tar.gz\n"
 
 #. type: Plain text
-#: doc/guix.texi:5036
+#: doc/guix.texi:5046
 msgid "The result here is a tarball containing a @file{/gnu/store} directory with all the relevant packages.  The resulting tarball contains a @dfn{profile} with the three packages of interest; the profile is the same as would be created by @command{guix package -i}.  It is this mechanism that is used to create Guix's own standalone binary tarball (@pxref{Binary Installation})."
 msgstr "Результатом будет архив tarball, содержащий директорию @file{/gnu/store} со всеми соответствующими пакетами. Результирующий архив содержат @dfn{профиль} с тремя запрошенными пакетами; профиль представляет то же самое, что можно создать командой @command{guix package -i}. Это механизм, который используется, собственно, для создания автономного (standalone) бинарного архива Guix (@pxref{Binary Installation})."
 
 #. type: Plain text
-#: doc/guix.texi:5041
+#: doc/guix.texi:5051
 msgid "Users of this pack would have to run @file{/gnu/store/@dots{}-profile/bin/guile} to run Guile, which you may find inconvenient.  To work around it, you can create, say, a @file{/opt/gnu/bin} symlink to the profile:"
 msgstr "Пользователи этого пакета должны запускать @file{/gnu/store/@dots{}-profile/bin/guile} для запуска Guile, что может быть не удобно. Чтобы исправить это, можно создать, например, символическую ссылку @file{/opt/gnu/bin} на профиль:"
 
 #. type: example
-#: doc/guix.texi:5044
+#: doc/guix.texi:5054
 #, no-wrap
 msgid "guix pack -S /opt/gnu/bin=bin guile emacs geiser\n"
 msgstr "guix pack -S /opt/gnu/bin=bin guile emacs geiser\n"
 
 #. type: Plain text
-#: doc/guix.texi:5048
+#: doc/guix.texi:5058
 msgid "That way, users can happily type @file{/opt/gnu/bin/guile} and enjoy."
 msgstr "Так пользователи смогут благополучно напечатать @file{/opt/gnu/bin/guile}, и всё хорошо."
 
 #. type: cindex
-#: doc/guix.texi:5049
+#: doc/guix.texi:5059
 #, no-wrap
 msgid "relocatable binaries, with @command{guix pack}"
 msgstr "перемещаемые бинарники, с @command{guix pack}"
 
 #. type: Plain text
-#: doc/guix.texi:5057
+#: doc/guix.texi:5067
 msgid "What if the recipient of your pack does not have root privileges on their machine, and thus cannot unpack it in the root file system? In that case, you will want to use the @code{--relocatable} option (see below).  This option produces @dfn{relocatable binaries}, meaning they they can be placed anywhere in the file system hierarchy: in the example above, users can unpack your tarball in their home directory and directly run @file{./opt/gnu/bin/guile}."
 msgstr "Что если получатель вашего пакета не имеет привилегий root на своей машине, и поэтому не может распаковать его в корне файловой системы? В таком случае вам стоит использовать опцию @code{--relocatable} (смотрите ниже). Эта опция производит @dfn{перемещаемые бинарники}, в том плане, что они могут размещаться где угодно в иерархии файловой системы: в примере выше пользователи могут распаковать ваш архив в свои домашние директории и напрямую запустить @file{./opt/gnu/bin/guile}."
 
 #. type: cindex
-#: doc/guix.texi:5058
+#: doc/guix.texi:5068
 #, no-wrap
 msgid "Docker, build an image with guix pack"
 msgstr "Docker, сборка образа с помощью guix pack"
 
 #. type: Plain text
-#: doc/guix.texi:5061
+#: doc/guix.texi:5071
 msgid "Alternatively, you can produce a pack in the Docker image format using the following command:"
 msgstr "В качестве альтернативы можно производить пакет в формате образа Docker, используя следующую команду:"
 
 #. type: example
-#: doc/guix.texi:5064
+#: doc/guix.texi:5074
 #, fuzzy, no-wrap
 #| msgid "guix pack -f docker guile emacs geiser\n"
 msgid "guix pack -f docker -S /bin=bin guile guile-readline\n"
 msgstr "guix pack -f docker guile emacs geiser\n"
 
 #. type: Plain text
-#: doc/guix.texi:5069
+#: doc/guix.texi:5079
 #, fuzzy
 #| msgid "The result is a tarball that can be passed to the @command{docker load} command.  See the @uref{https://docs.docker.com/engine/reference/commandline/load/, Docker documentation} for more information."
 msgid "The result is a tarball that can be passed to the @command{docker load} command, followed by @code{docker run}:"
 msgstr "Результатом будет архив, который можно передать команде @command{docker load}. Смотрите @uref{https://docs.docker.com/engine/reference/commandline/load/, документацию Docker} для подробной информации."
 
 #. type: example
-#: doc/guix.texi:5073
+#: doc/guix.texi:5083
 #, no-wrap
 msgid ""
 "docker load < @var{file}\n"
@@ -10799,150 +10943,150 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5080
+#: doc/guix.texi:5090
 #, fuzzy
 #| msgid "The result is a tarball that can be passed to the @command{docker load} command.  See the @uref{https://docs.docker.com/engine/reference/commandline/load/, Docker documentation} for more information."
 msgid "where @var{file} is the image returned by @var{guix pack}, and @code{guile-guile-readline} is its ``image tag''.  See the @uref{https://docs.docker.com/engine/reference/commandline/load/, Docker documentation} for more information."
 msgstr "Результатом будет архив, который можно передать команде @command{docker load}. Смотрите @uref{https://docs.docker.com/engine/reference/commandline/load/, документацию Docker} для подробной информации."
 
 #. type: cindex
-#: doc/guix.texi:5081
+#: doc/guix.texi:5091
 #, no-wrap
 msgid "Singularity, build an image with guix pack"
 msgstr "Singularity, сборка образа с помощью guix pack"
 
 #. type: cindex
-#: doc/guix.texi:5082
+#: doc/guix.texi:5092
 #, no-wrap
 msgid "SquashFS, build an image with guix pack"
 msgstr "SquashFS, сборка образа с помощью guix pack"
 
 #. type: Plain text
-#: doc/guix.texi:5085
+#: doc/guix.texi:5095
 msgid "Yet another option is to produce a SquashFS image with the following command:"
 msgstr "Ещё одна опция производит образ SquashFS следующей командой:"
 
 #. type: example
-#: doc/guix.texi:5088
+#: doc/guix.texi:5098
 #, fuzzy, no-wrap
 #| msgid "guix pack -f squashfs guile emacs geiser\n"
 msgid "guix pack -f squashfs bash guile emacs geiser\n"
 msgstr "guix pack -f squashfs guile emacs geiser\n"
 
 #. type: Plain text
-#: doc/guix.texi:5096
+#: doc/guix.texi:5106
 #, fuzzy
 #| msgid "The result is a SquashFS file system image that can either be mounted or directly be used as a file system container image with the @uref{http://singularity.lbl.gov, Singularity container execution environment}, using commands like @command{singularity shell} or @command{singularity exec}."
 msgid "The result is a SquashFS file system image that can either be mounted or directly be used as a file system container image with the @uref{https://singularity.lbl.gov, Singularity container execution environment}, using commands like @command{singularity shell} or @command{singularity exec}."
 msgstr "Результатом будет образ файловой системы SquashFS, который может  непосредственно монтироваться как образ, содержащий контейнер файловой системы, с помощью  @uref{http://singularity.lbl.gov, контейнерного окружения Singularity}, используя команды типа @command{singularity shell} или @command{singularity exec}."
 
 #. type: Plain text
-#: doc/guix.texi:5098
+#: doc/guix.texi:5108
 msgid "Several command-line options allow you to customize your pack:"
 msgstr "Несколько опций командной строки позволяют вам переделывать ваш пакет:"
 
 #. type: table
-#: doc/guix.texi:5103
+#: doc/guix.texi:5113
 msgid "Produce a pack in the given @var{format}."
 msgstr "Произвести пакет в указанном формате @var{format}."
 
 #. type: table
-#: doc/guix.texi:5105
+#: doc/guix.texi:5115
 msgid "The available formats are:"
 msgstr "Возможные форматы:"
 
 #. type: item
-#: doc/guix.texi:5107
+#: doc/guix.texi:5117
 #, no-wrap
 msgid "tarball"
 msgstr "tarball"
 
 #. type: table
-#: doc/guix.texi:5110
+#: doc/guix.texi:5120
 msgid "This is the default format.  It produces a tarball containing all the specified binaries and symlinks."
 msgstr "Это формат по умолчанию. Он производит архив tarball, содержащий все заданные бинарники и символические ссылки."
 
 #. type: item
-#: doc/guix.texi:5111
+#: doc/guix.texi:5121
 #, no-wrap
 msgid "docker"
 msgstr "docker"
 
 #. type: table
-#: doc/guix.texi:5117
+#: doc/guix.texi:5127
 #, fuzzy
 #| msgid "This produces a tarball that follows the @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, Docker Image Specification}."
 msgid "This produces a tarball that follows the @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, Docker Image Specification}.  The ``repository name'' as it appears in the output of the @command{docker images} command is computed from package names passed on the command line or in the manifest file."
 msgstr "Это производит архив, соответствующий @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, спецификации образа Docker}."
 
 #. type: item
-#: doc/guix.texi:5118
+#: doc/guix.texi:5128
 #, no-wrap
 msgid "squashfs"
 msgstr "squashfs"
 
 #. type: table
-#: doc/guix.texi:5122
+#: doc/guix.texi:5132
 msgid "This produces a SquashFS image containing all the specified binaries and symlinks, as well as empty mount points for virtual file systems like procfs."
 msgstr "Это создает образ SquashFS, содержащий все указанные двоичные файлы и символические ссылки, а также пустые точки монтирования для виртуальных файловых систем, таких как procfs."
 
 #. type: quotation
-#: doc/guix.texi:5128
+#: doc/guix.texi:5138
 msgid "Singularity @emph{requires} you to provide @file{/bin/sh} in the image.  For that reason, @command{guix pack -f squashfs} always implies @code{-S /bin=bin}.  Thus, your @command{guix pack} invocation must always start with something like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5131
+#: doc/guix.texi:5141
 #, fuzzy, no-wrap
 #| msgid "guix pack -f squashfs guile emacs geiser\n"
 msgid "guix pack -f squashfs bash @dots{}\n"
 msgstr "guix pack -f squashfs guile emacs geiser\n"
 
 #. type: quotation
-#: doc/guix.texi:5136
+#: doc/guix.texi:5146
 msgid "If you forget the @code{bash} (or similar) package, @command{singularity run} and @command{singularity exec} will fail with an unhelpful ``no such file or directory'' message."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5139
+#: doc/guix.texi:5149
 #, no-wrap
 msgid "relocatable binaries"
 msgstr "перемещаемые двоичные файлы"
 
 #. type: item
-#: doc/guix.texi:5140
+#: doc/guix.texi:5150
 #, no-wrap
 msgid "--relocatable"
 msgstr "--relocatable"
 
 #. type: table
-#: doc/guix.texi:5144
+#: doc/guix.texi:5154
 msgid "Produce @dfn{relocatable binaries}---i.e., binaries that can be placed anywhere in the file system hierarchy and run from there."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5152
+#: doc/guix.texi:5162
 msgid "When this option is passed once, the resulting binaries require support for @dfn{user namespaces} in the kernel Linux; when passed @emph{twice}@footnote{Here's a trick to memorize it: @code{-RR}, which adds PRoot support, can be thought of as the abbreviation of ``Really Relocatable''.  Neat, isn't it?}, relocatable binaries fall to back to PRoot if user namespaces are unavailable, and essentially work anywhere---see below for the implications."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5154
+#: doc/guix.texi:5164
 msgid "For example, if you create a pack containing Bash with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5157
+#: doc/guix.texi:5167
 #, no-wrap
 msgid "guix pack -RR -S /mybin=bin bash\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5162
+#: doc/guix.texi:5172
 msgid "...@: you can copy that pack to a machine that lacks Guix, and from your home directory as a normal user, run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5166
+#: doc/guix.texi:5176
 #, no-wrap
 msgid ""
 "tar xf pack.tar.gz\n"
@@ -10950,62 +11094,62 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5174
+#: doc/guix.texi:5184
 msgid "In that shell, if you type @code{ls /gnu/store}, you'll notice that @file{/gnu/store} shows up and contains all the dependencies of @code{bash}, even though the machine actually lacks @file{/gnu/store} altogether! That is probably the simplest way to deploy Guix-built software on a non-Guix machine."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:5180
+#: doc/guix.texi:5190
 msgid "By default, relocatable binaries rely on the @dfn{user namespace} feature of the kernel Linux, which allows unprivileged users to mount or change root.  Old versions of Linux did not support it, and some GNU/Linux distributions turn it off."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:5185
+#: doc/guix.texi:5195
 msgid "To produce relocatable binaries that work even in the absence of user namespaces, pass @option{--relocatable} or @option{-R} @emph{twice}.  In that case, binaries will try user namespace support and fall back to PRoot if user namespaces are not supported."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:5191
+#: doc/guix.texi:5201
 msgid "The @uref{https://proot-me.github.io/, PRoot} program provides the necessary support for file system virtualization.  It achieves that by using the @code{ptrace} system call on the running program.  This approach has the advantage to work without requiring special kernel support, but it incurs run-time overhead every time a system call is made."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5193
+#: doc/guix.texi:5203
 #, no-wrap
 msgid "entry point, for Docker images"
 msgstr "точка входа, для Docker образов"
 
 #. type: item
-#: doc/guix.texi:5194
+#: doc/guix.texi:5204
 #, fuzzy, no-wrap
 #| msgid "--commit=@var{commit}"
 msgid "--entry-point=@var{command}"
 msgstr "--commit=@var{commit}"
 
 #. type: table
-#: doc/guix.texi:5199
+#: doc/guix.texi:5209
 msgid "Use @var{command} as the @dfn{entry point} of the resulting pack, if the pack format supports it---currently @code{docker} and @code{squashfs} (Singularity)  support it.  @var{command} must be relative to the profile contained in the pack."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5203
+#: doc/guix.texi:5213
 msgid "The entry point specifies the command that tools like @code{docker run} or @code{singularity run} automatically start by default.  For example, you can do:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5206
+#: doc/guix.texi:5216
 #, fuzzy, no-wrap
 #| msgid "guix pack -f docker guile emacs geiser\n"
 msgid "guix pack -f docker --entry-point=bin/guile guile\n"
 msgstr "guix pack -f docker guile emacs geiser\n"
 
 #. type: table
-#: doc/guix.texi:5210
+#: doc/guix.texi:5220
 msgid "The resulting pack can easily be loaded and @code{docker run} with no extra arguments will spawn @code{bin/guile}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5214
+#: doc/guix.texi:5224
 #, no-wrap
 msgid ""
 "docker load -i pack.tar.gz\n"
@@ -11013,256 +11157,256 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5219 doc/guix.texi:9388 doc/guix.texi:10093
+#: doc/guix.texi:5229 doc/guix.texi:9487 doc/guix.texi:10192
 msgid "Consider the package @var{expr} evaluates to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5223
+#: doc/guix.texi:5233
 msgid "This has the same purpose as the same-named option in @command{guix build} (@pxref{Additional Build Options, @code{--expression} in @command{guix build}})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5229
+#: doc/guix.texi:5239
 #, fuzzy
 #| msgid "Create an environment for the packages contained in the manifest object returned by the Scheme code in @var{file}."
 msgid "Use the packages contained in the manifest object returned by the Scheme code in @var{file}.  This option can be repeated several times, in which case the manifests are concatenated."
 msgstr "Создать окружение для пакетов, содержащихся в объекте манифеста, возвращаемого кодом Scheme в файле @var{file}."
 
 #. type: table
-#: doc/guix.texi:5237
+#: doc/guix.texi:5247
 msgid "This has a similar purpose as the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same manifest files.  It allows you to define a collection of packages once and use it both for creating profiles and for creating archives for use on machines that do not have Guix installed.  Note that you can specify @emph{either} a manifest file @emph{or} a list of packages, but not both."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5243 doc/guix.texi:8570
+#: doc/guix.texi:5253 doc/guix.texi:8669
 #, no-wrap
 msgid "--target=@var{triplet}"
 msgstr "--target=@var{triplet}"
 
 #. type: cindex
-#: doc/guix.texi:5244 doc/guix.texi:5600 doc/guix.texi:8571
+#: doc/guix.texi:5254 doc/guix.texi:5610 doc/guix.texi:8670
 #, no-wrap
 msgid "cross-compilation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5248
+#: doc/guix.texi:5258
 msgid "Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying target triplets, GNU configuration triplets,, autoconf, Autoconf})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5249
+#: doc/guix.texi:5259
 #, no-wrap
 msgid "--compression=@var{tool}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5250
+#: doc/guix.texi:5260
 #, no-wrap
 msgid "-C @var{tool}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5253
+#: doc/guix.texi:5263
 msgid "Compress the resulting tarball using @var{tool}---one of @code{gzip}, @code{bzip2}, @code{xz}, @code{lzip}, or @code{none} for no compression."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5254
+#: doc/guix.texi:5264
 #, no-wrap
 msgid "--symlink=@var{spec}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5255
+#: doc/guix.texi:5265
 #, no-wrap
 msgid "-S @var{spec}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5258
+#: doc/guix.texi:5268
 msgid "Add the symlinks specified by @var{spec} to the pack.  This option can appear several times."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5262
+#: doc/guix.texi:5272
 msgid "@var{spec} has the form @code{@var{source}=@var{target}}, where @var{source} is the symlink that will be created and @var{target} is the symlink target."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5265
+#: doc/guix.texi:5275
 msgid "For instance, @code{-S /opt/gnu/bin=bin} creates a @file{/opt/gnu/bin} symlink pointing to the @file{bin} sub-directory of the profile."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5266 doc/guix.texi:26617
+#: doc/guix.texi:5276 doc/guix.texi:26880
 #, no-wrap
 msgid "--save-provenance"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5270
+#: doc/guix.texi:5280
 msgid "Save provenance information for the packages passed on the command line.  Provenance information includes the URL and commit of the channels in use (@pxref{Channels})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5276
+#: doc/guix.texi:5286
 msgid "Provenance information is saved in the @file{/gnu/store/@dots{}-profile/manifest} file in the pack, along with the usual package metadata---the name and version of each package, their propagated inputs, and so on.  It is useful information to the recipient of the pack, who then knows how the pack was (supposedly) obtained."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5282
+#: doc/guix.texi:5292
 msgid "This option is not enabled by default because, like timestamps, provenance information contributes nothing to the build process.  In other words, there is an infinity of channel URLs and commit IDs that can lead to the same pack.  Recording such ``silent'' metadata in the output thus potentially breaks the source-to-binary bitwise reproducibility property."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5285
+#: doc/guix.texi:5295
 #, fuzzy, no-wrap
 #| msgid "garbage collector roots"
 msgid "garbage collector root, for packs"
 msgstr "корни сборщика мусора"
 
 #. type: table
-#: doc/guix.texi:5288
+#: doc/guix.texi:5298
 #, fuzzy
 #| msgid "Make @var{file} a symlink to the profile for this environment, and register it as a garbage collector root."
 msgid "Make @var{file} a symlink to the resulting pack, and register it as a garbage collector root."
 msgstr "Создать символическую ссылку @var{file} на профиль этого окружения и зарегистрировать её как корень сборщика мусора."
 
 #. type: item
-#: doc/guix.texi:5289
+#: doc/guix.texi:5299
 #, no-wrap
 msgid "--localstatedir"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5290
+#: doc/guix.texi:5300
 #, no-wrap
 msgid "--profile-name=@var{name}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5295
+#: doc/guix.texi:5305
 msgid "Include the ``local state directory'', @file{/var/guix}, in the resulting pack, and notably the @file{/var/guix/profiles/per-user/root/@var{name}} profile---by default @var{name} is @code{guix-profile}, which corresponds to @file{~root/.guix-profile}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5301
+#: doc/guix.texi:5311
 msgid "@file{/var/guix} contains the store database (@pxref{The Store}) as well as garbage-collector roots (@pxref{Invoking guix gc}).  Providing it in the pack means that the store is ``complete'' and manageable by Guix; not providing it pack means that the store is ``dead'': items cannot be added to it or removed from it after extraction of the pack."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5304
+#: doc/guix.texi:5314
 msgid "One use case for this is the Guix self-contained binary tarball (@pxref{Binary Installation})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5305 doc/guix.texi:26611
+#: doc/guix.texi:5315 doc/guix.texi:26874
 #, no-wrap
 msgid "--derivation"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5306 doc/guix.texi:8602 doc/guix.texi:26612
+#: doc/guix.texi:5316 doc/guix.texi:8701 doc/guix.texi:26875
 #, no-wrap
 msgid "-d"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5308
+#: doc/guix.texi:5318
 msgid "Print the name of the derivation that builds the pack."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5312
+#: doc/guix.texi:5322
 msgid "Use the bootstrap binaries to build the pack.  This option is only useful to Guix developers."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5317
+#: doc/guix.texi:5327
 msgid "In addition, @command{guix pack} supports all the common build options (@pxref{Common Build Options}) and all the package transformation options (@pxref{Package Transformation Options})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5329
+#: doc/guix.texi:5339
 msgid "GNU Guix provides several Scheme programming interfaces (APIs) to define, build, and query packages.  The first interface allows users to write high-level package definitions.  These definitions refer to familiar packaging concepts, such as the name and version of a package, its build system, and its dependencies.  These definitions can then be turned into concrete build actions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5335
+#: doc/guix.texi:5345
 msgid "Build actions are performed by the Guix daemon, on behalf of users.  In a standard setup, the daemon has write access to the store---the @file{/gnu/store} directory---whereas users do not.  The recommended setup also has the daemon perform builds in chroots, under a specific build users, to minimize interference with the rest of the system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5344
+#: doc/guix.texi:5354
 msgid "Lower-level APIs are available to interact with the daemon and the store.  To instruct the daemon to perform a build action, users actually provide it with a @dfn{derivation}.  A derivation is a low-level representation of the build actions to be taken, and the environment in which they should occur---derivations are to package definitions what assembly is to C programs.  The term ``derivation'' comes from the fact that build results @emph{derive} from them."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5347
+#: doc/guix.texi:5357
 msgid "This chapter describes all these APIs in turn, starting from high-level package definitions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5373
+#: doc/guix.texi:5383
 msgid "From a programming viewpoint, the package definitions of the GNU distribution are provided by Guile modules in the @code{(gnu packages @dots{})} name space@footnote{Note that packages under the @code{(gnu packages @dots{})} module name space are not necessarily ``GNU packages''.  This module naming scheme follows the usual Guile module naming convention: @code{gnu} means that these modules are distributed as part of the GNU system, and @code{packages} identifies modules that define packages.} (@pxref{Modules, Guile modules,, guile, GNU Guile Reference Manual}).  For instance, the @code{(gnu packages emacs)} module exports a variable named @code{emacs}, which is bound to a @code{} object (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5380
+#: doc/guix.texi:5390
 msgid "The @code{(gnu packages @dots{})} module name space is automatically scanned for packages by the command-line tools.  For instance, when running @code{guix install emacs}, all the @code{(gnu packages @dots{})} modules are scanned until one that exports a package object whose name is @code{emacs} is found.  This package search facility is implemented in the @code{(gnu packages)} module."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5382
+#: doc/guix.texi:5392
 #, no-wrap
 msgid "package module search path"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5391
+#: doc/guix.texi:5401
 msgid "Users can store package definitions in modules with different names---e.g., @code{(my-packages emacs)}@footnote{Note that the file name and module name must match.  For instance, the @code{(my-packages emacs)} module must be stored in a @file{my-packages/emacs.scm} file relative to the load path specified with @option{--load-path} or @code{GUIX_PACKAGE_PATH}.  @xref{Modules and the File System,,, guile, GNU Guile Reference Manual}, for details.}.  There are two ways to make these package definitions visible to the user interfaces:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:5398
+#: doc/guix.texi:5408
 msgid "By adding the directory containing your package modules to the search path with the @code{-L} flag of @command{guix package} and other commands (@pxref{Common Build Options}), or by setting the @code{GUIX_PACKAGE_PATH} environment variable described below."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:5404
+#: doc/guix.texi:5414
 msgid "By defining a @dfn{channel} and configuring @command{guix pull} so that it pulls from it.  A channel is essentially a Git repository containing package modules.  @xref{Channels}, for more information on how to define and use channels."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5407
+#: doc/guix.texi:5417
 msgid "@code{GUIX_PACKAGE_PATH} works similarly to other search path variables:"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5408
+#: doc/guix.texi:5418
 #, no-wrap
 msgid "{Environment Variable} GUIX_PACKAGE_PATH"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5412
+#: doc/guix.texi:5422
 msgid "This is a colon-separated list of directories to search for additional package modules.  Directories listed in this variable take precedence over the own modules of the distribution."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5420
+#: doc/guix.texi:5430
 msgid "The distribution is fully @dfn{bootstrapped} and @dfn{self-contained}: each package is built based solely on other packages in the distribution.  The root of this dependency graph is a small set of @dfn{bootstrap binaries}, provided by the @code{(gnu packages bootstrap)} module.  For more information on bootstrapping, @pxref{Bootstrapping}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5428
+#: doc/guix.texi:5438
 msgid "The high-level interface to package definitions is implemented in the @code{(guix packages)} and @code{(guix build-system)} modules.  As an example, the package definition, or @dfn{recipe}, for the GNU Hello package looks like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:5436
+#: doc/guix.texi:5446
 #, no-wrap
 msgid ""
 "(define-module (gnu packages hello)\n"
@@ -11275,7 +11419,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:5455
+#: doc/guix.texi:5465
 #, no-wrap
 msgid ""
 "(define-public hello\n"
@@ -11299,277 +11443,277 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5465
+#: doc/guix.texi:5475
 msgid "Without being a Scheme expert, the reader may have guessed the meaning of the various fields here.  This expression binds the variable @code{hello} to a @code{} object, which is essentially a record (@pxref{SRFI-9, Scheme records,, guile, GNU Guile Reference Manual}).  This package object can be inspected using procedures found in the @code{(guix packages)} module; for instance, @code{(package-name hello)} returns---surprise!---@code{\"hello\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5469
+#: doc/guix.texi:5479
 msgid "With luck, you may be able to import part or all of the definition of the package you are interested in from another repository, using the @code{guix import} command (@pxref{Invoking guix import})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5475
+#: doc/guix.texi:5485
 msgid "In the example above, @var{hello} is defined in a module of its own, @code{(gnu packages hello)}.  Technically, this is not strictly necessary, but it is convenient to do so: all the packages defined in modules under @code{(gnu packages @dots{})} are automatically known to the command-line tools (@pxref{Package Modules})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5477
+#: doc/guix.texi:5487
 msgid "There are a few points worth noting in the above package definition:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5484
+#: doc/guix.texi:5494
 msgid "The @code{source} field of the package is an @code{} object (@pxref{origin Reference}, for the complete reference).  Here, the @code{url-fetch} method from @code{(guix download)} is used, meaning that the source is a file to be downloaded over FTP or HTTP."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5487
+#: doc/guix.texi:5497
 msgid "The @code{mirror://gnu} prefix instructs @code{url-fetch} to use one of the GNU mirrors defined in @code{(guix download)}."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5494
+#: doc/guix.texi:5504
 msgid "The @code{sha256} field specifies the expected SHA256 hash of the file being downloaded.  It is mandatory, and allows Guix to check the integrity of the file.  The @code{(base32 @dots{})} form introduces the base32 representation of the hash.  You can obtain this information with @code{guix download} (@pxref{Invoking guix download}) and @code{guix hash} (@pxref{Invoking guix hash})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5495
+#: doc/guix.texi:5505
 #, no-wrap
 msgid "patches"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5499
+#: doc/guix.texi:5509
 msgid "When needed, the @code{origin} form can also have a @code{patches} field listing patches to be applied, and a @code{snippet} field giving a Scheme expression to modify the source code."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5501
+#: doc/guix.texi:5511
 #, no-wrap
 msgid "GNU Build System"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5507
+#: doc/guix.texi:5517
 msgid "The @code{build-system} field specifies the procedure to build the package (@pxref{Build Systems}).  Here, @var{gnu-build-system} represents the familiar GNU Build System, where packages may be configured, built, and installed with the usual @code{./configure && make && make check && make install} command sequence."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5513
+#: doc/guix.texi:5523
 msgid "The @code{arguments} field specifies options for the build system (@pxref{Build Systems}).  Here it is interpreted by @var{gnu-build-system} as a request run @file{configure} with the @code{--enable-silent-rules} flag."
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5514 doc/guix.texi:5517
+#: doc/guix.texi:5524 doc/guix.texi:5527
 #, no-wrap
 msgid "quote"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5515
+#: doc/guix.texi:5525
 #, no-wrap
 msgid "quoting"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5516
+#: doc/guix.texi:5526
 #, no-wrap
 msgid "'"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5525
+#: doc/guix.texi:5535
 msgid "What about these quote (@code{'}) characters? They are Scheme syntax to introduce a literal list; @code{'} is synonymous with @code{quote}.  @xref{Expression Syntax, quoting,, guile, GNU Guile Reference Manual}, for details.  Here the value of the @code{arguments} field is a list of arguments passed to the build system down the road, as with @code{apply} (@pxref{Fly Evaluation, @code{apply},, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5531
+#: doc/guix.texi:5541
 msgid "The hash-colon (@code{#:}) sequence defines a Scheme @dfn{keyword} (@pxref{Keywords,,, guile, GNU Guile Reference Manual}), and @code{#:configure-flags} is a keyword used to pass a keyword argument to the build system (@pxref{Coding With Keywords,,, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5537
+#: doc/guix.texi:5547
 msgid "The @code{inputs} field specifies inputs to the build process---i.e., build-time or run-time dependencies of the package.  Here, we define an input called @code{\"gawk\"} whose value is that of the @var{gawk} variable; @var{gawk} is itself bound to a @code{} object."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5538
+#: doc/guix.texi:5548
 #, no-wrap
 msgid "backquote (quasiquote)"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5539
+#: doc/guix.texi:5549
 #, no-wrap
 msgid "`"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5540
+#: doc/guix.texi:5550
 #, no-wrap
 msgid "quasiquote"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5541
+#: doc/guix.texi:5551
 #, no-wrap
 msgid "comma (unquote)"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5542
+#: doc/guix.texi:5552
 #, no-wrap
 msgid ","
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5543
+#: doc/guix.texi:5553
 #, no-wrap
 msgid "unquote"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5544
+#: doc/guix.texi:5554
 #, no-wrap
 msgid ",@@"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5545
+#: doc/guix.texi:5555
 #, no-wrap
 msgid "unquote-splicing"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5551
+#: doc/guix.texi:5561
 msgid "Again, @code{`} (a backquote, synonymous with @code{quasiquote}) allows us to introduce a literal list in the @code{inputs} field, while @code{,} (a comma, synonymous with @code{unquote}) allows us to insert a value in that list (@pxref{Expression Syntax, unquote,, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5555
+#: doc/guix.texi:5565
 msgid "Note that GCC, Coreutils, Bash, and other essential tools do not need to be specified as inputs here.  Instead, @var{gnu-build-system} takes care of ensuring that they are present (@pxref{Build Systems})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5559
+#: doc/guix.texi:5569
 msgid "However, any other dependencies need to be specified in the @code{inputs} field.  Any dependency not specified here will simply be unavailable to the build process, possibly leading to a build failure."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5562
+#: doc/guix.texi:5572
 msgid "@xref{package Reference}, for a full description of possible fields."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5573
+#: doc/guix.texi:5583
 msgid "Once a package definition is in place, the package may actually be built using the @code{guix build} command-line tool (@pxref{Invoking guix build}), troubleshooting any build failures you encounter (@pxref{Debugging Build Failures}).  You can easily jump back to the package definition using the @command{guix edit} command (@pxref{Invoking guix edit}).  @xref{Packaging Guidelines}, for more information on how to test package definitions, and @ref{Invoking guix lint}, for information on how to check a definition for style conformance."
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:5573
+#: doc/guix.texi:5583
 #, no-wrap
 msgid "GUIX_PACKAGE_PATH"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5577
+#: doc/guix.texi:5587
 msgid "Lastly, @pxref{Channels}, for information on how to extend the distribution by adding your own package definitions in a ``channel''."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5581
+#: doc/guix.texi:5591
 msgid "Finally, updating the package definition to a new upstream version can be partly automated by the @command{guix refresh} command (@pxref{Invoking guix refresh})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5587
+#: doc/guix.texi:5597
 msgid "Behind the scenes, a derivation corresponding to the @code{} object is first computed by the @code{package-derivation} procedure.  That derivation is stored in a @code{.drv} file under @file{/gnu/store}.  The build actions it prescribes may then be realized by using the @code{build-derivations} procedure (@pxref{The Store})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5588
+#: doc/guix.texi:5598
 #, no-wrap
 msgid "{Scheme Procedure} package-derivation @var{store} @var{package} [@var{system}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5591
+#: doc/guix.texi:5601
 msgid "Return the @code{} object of @var{package} for @var{system} (@pxref{Derivations})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5597
+#: doc/guix.texi:5607
 msgid "@var{package} must be a valid @code{} object, and @var{system} must be a string denoting the target system type---e.g., @code{\"x86_64-linux\"} for an x86_64 Linux-based GNU system.  @var{store} must be a connection to the daemon, which operates on the store (@pxref{The Store})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5603
+#: doc/guix.texi:5613
 msgid "Similarly, it is possible to compute a derivation that cross-builds a package for some other system:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5604
+#: doc/guix.texi:5614
 #, no-wrap
 msgid "{Scheme Procedure} package-cross-derivation @var{store} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5608
+#: doc/guix.texi:5618
 msgid "@var{package} @var{target} [@var{system}] Return the @code{} object of @var{package} cross-built from @var{system} to @var{target}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5612
+#: doc/guix.texi:5622
 msgid "@var{target} must be a valid GNU triplet denoting the target hardware and operating system, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying Target Triplets,,, autoconf, Autoconf})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5614
+#: doc/guix.texi:5624
 #, no-wrap
 msgid "package transformations"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5615
+#: doc/guix.texi:5625
 #, no-wrap
 msgid "input rewriting"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5616
+#: doc/guix.texi:5626
 #, no-wrap
 msgid "dependency tree rewriting"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5620
+#: doc/guix.texi:5630
 msgid "Packages can be manipulated in arbitrary ways.  An example of a useful transformation is @dfn{input rewriting}, whereby the dependency tree of a package is rewritten by replacing specific inputs by others:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5621
+#: doc/guix.texi:5631
 #, no-wrap
 msgid "{Scheme Procedure} package-input-rewriting @var{replacements} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5628
+#: doc/guix.texi:5638
 msgid "[@var{rewrite-name}] Return a procedure that, when passed a package, replaces its direct and indirect dependencies (but not its implicit inputs) according to @var{replacements}.  @var{replacements} is a list of package pairs; the first element of each pair is the package to replace, and the second one is the replacement."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5631
+#: doc/guix.texi:5641
 msgid "Optionally, @var{rewrite-name} is a one-argument procedure that takes the name of a package and returns its new name after rewrite."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5635
+#: doc/guix.texi:5645
 msgid "Consider this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:5641
+#: doc/guix.texi:5651
 #, no-wrap
 msgid ""
 "(define libressl-instead-of-openssl\n"
@@ -11580,7 +11724,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:5644
+#: doc/guix.texi:5654
 #, no-wrap
 msgid ""
 "(define git-with-libressl\n"
@@ -11588,33 +11732,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5652
+#: doc/guix.texi:5662
 msgid "Here we first define a rewriting procedure that replaces @var{openssl} with @var{libressl}.  Then we use it to define a @dfn{variant} of the @var{git} package that uses @var{libressl} instead of @var{openssl}.  This is exactly what the @option{--with-input} command-line option does (@pxref{Package Transformation Options, @option{--with-input}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5655
+#: doc/guix.texi:5665
 msgid "The following variant of @code{package-input-rewriting} can match packages to be replaced by name rather than by identity."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5656
+#: doc/guix.texi:5666
 #, no-wrap
 msgid "{Scheme Procedure} package-input-rewriting/spec @var{replacements}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5662
+#: doc/guix.texi:5672
 msgid "Return a procedure that, given a package, applies the given @var{replacements} to all the package graph (excluding implicit inputs).  @var{replacements} is a list of spec/procedures pair; each spec is a package specification such as @code{\"gcc\"} or @code{\"guile@@2\"}, and each procedure takes a matching package and returns a replacement for that package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5665
+#: doc/guix.texi:5675
 msgid "The example above could be rewritten this way:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:5670
+#: doc/guix.texi:5680
 #, no-wrap
 msgid ""
 "(define libressl-instead-of-openssl\n"
@@ -11623,129 +11767,129 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5675
+#: doc/guix.texi:5685
 msgid "The key difference here is that, this time, packages are matched by spec and not by identity.  In other words, any package in the graph that is called @code{openssl} will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5679
+#: doc/guix.texi:5689
 msgid "A more generic procedure to rewrite a package dependency graph is @code{package-mapping}: it supports arbitrary changes to nodes in the graph."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5680
+#: doc/guix.texi:5690
 #, no-wrap
 msgid "{Scheme Procedure} package-mapping @var{proc} [@var{cut?}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5684
+#: doc/guix.texi:5694
 msgid "Return a procedure that, given a package, applies @var{proc} to all the packages depended on and returns the resulting package.  The procedure stops recursion when @var{cut?} returns true for a given package."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:5693
+#: doc/guix.texi:5703
 #, no-wrap
 msgid "@code{package} Reference"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5697
+#: doc/guix.texi:5707
 msgid "This section summarizes all the options available in @code{package} declarations (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:5698
+#: doc/guix.texi:5708
 #, no-wrap
 msgid "{Data Type} package"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:5700
+#: doc/guix.texi:5710
 msgid "This is the data type representing a package recipe."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5704
+#: doc/guix.texi:5714
 msgid "The name of the package, as a string."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5705
+#: doc/guix.texi:5715
 #, no-wrap
 msgid "version"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5707
+#: doc/guix.texi:5717
 msgid "The version of the package, as a string."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5708 doc/guix.texi:9647 doc/guix.texi:11524
-#: doc/guix.texi:11962
+#: doc/guix.texi:5718 doc/guix.texi:9746 doc/guix.texi:11636
+#: doc/guix.texi:12077
 #, no-wrap
 msgid "source"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5715
+#: doc/guix.texi:5725
 msgid "An object telling how the source code for the package should be acquired.  Most of the time, this is an @code{origin} object, which denotes a file fetched from the Internet (@pxref{origin Reference}).  It can also be any other ``file-like'' object such as a @code{local-file}, which denotes a file from the local file system (@pxref{G-Expressions, @code{local-file}})."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5716
+#: doc/guix.texi:5726
 #, no-wrap
 msgid "build-system"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5719
+#: doc/guix.texi:5729
 msgid "The build system that should be used to build the package (@pxref{Build Systems})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5720 doc/guix.texi:13729
+#: doc/guix.texi:5730 doc/guix.texi:13886
 #, no-wrap
 msgid "@code{arguments} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5723
+#: doc/guix.texi:5733
 msgid "The arguments that should be passed to the build system.  This is a list, typically containing sequential keyword-value pairs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5724
+#: doc/guix.texi:5734
 #, no-wrap
 msgid "@code{inputs} (default: @code{'()})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5725
+#: doc/guix.texi:5735
 #, no-wrap
 msgid "@code{native-inputs} (default: @code{'()})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5726
+#: doc/guix.texi:5736
 #, no-wrap
 msgid "@code{propagated-inputs} (default: @code{'()})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5727
+#: doc/guix.texi:5737
 #, no-wrap
 msgid "inputs, of packages"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5735
+#: doc/guix.texi:5745
 msgid "These fields list dependencies of the package.  Each one is a list of tuples, where each tuple has a label for the input (a string) as its first element, a package, origin, or derivation as its second element, and optionally the name of the output thereof that should be used, which defaults to @code{\"out\"} (@pxref{Packages with Multiple Outputs}, for more on package outputs).  For example, the list below specifies three inputs:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:5740
+#: doc/guix.texi:5750
 #, no-wrap
 msgid ""
 "`((\"libffi\" ,libffi)\n"
@@ -11754,170 +11898,170 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5742
+#: doc/guix.texi:5752
 #, no-wrap
 msgid "cross compilation, package dependencies"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5748
+#: doc/guix.texi:5758
 msgid "The distinction between @code{native-inputs} and @code{inputs} is necessary when considering cross-compilation.  When cross-compiling, dependencies listed in @code{inputs} are built for the @emph{target} architecture; conversely, dependencies listed in @code{native-inputs} are built for the architecture of the @emph{build} machine."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5753
+#: doc/guix.texi:5763
 msgid "@code{native-inputs} is typically used to list tools needed at build time, but not at run time, such as Autoconf, Automake, pkg-config, Gettext, or Bison.  @command{guix lint} can report likely mistakes in this area (@pxref{Invoking guix lint})."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:5760
+#: doc/guix.texi:5770
 msgid "package-propagated-inputs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5760
+#: doc/guix.texi:5770
 msgid "Lastly, @code{propagated-inputs} is similar to @code{inputs}, but the specified packages will be automatically installed alongside the package they belong to (@pxref{package-cmd-propagated-inputs, @command{guix package}}, for information on how @command{guix package} deals with propagated inputs.)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5764
+#: doc/guix.texi:5774
 msgid "For example this is necessary when a C/C++ library needs headers of another library to compile, or when a pkg-config file refers to another one @i{via} its @code{Requires} field."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5771
+#: doc/guix.texi:5781
 msgid "Another example where @code{propagated-inputs} is useful is for languages that lack a facility to record the run-time search path akin to the @code{RUNPATH} of ELF files; this includes Guile, Python, Perl, and more.  To ensure that libraries written in those languages can find library code they depend on at run time, run-time dependencies must be listed in @code{propagated-inputs} rather than @code{inputs}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5772
+#: doc/guix.texi:5782
 #, no-wrap
 msgid "@code{outputs} (default: @code{'(\"out\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5775
+#: doc/guix.texi:5785
 msgid "The list of output names of the package.  @xref{Packages with Multiple Outputs}, for typical uses of additional outputs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5776
+#: doc/guix.texi:5786
 #, no-wrap
 msgid "@code{native-search-paths} (default: @code{'()})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5777
+#: doc/guix.texi:5787
 #, no-wrap
 msgid "@code{search-paths} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5780
+#: doc/guix.texi:5790
 msgid "A list of @code{search-path-specification} objects describing search-path environment variables honored by the package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5781
+#: doc/guix.texi:5791
 #, no-wrap
 msgid "@code{replacement} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5785
+#: doc/guix.texi:5795
 msgid "This must be either @code{#f} or a package object that will be used as a @dfn{replacement} for this package.  @xref{Security Updates, grafts}, for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5786 doc/guix.texi:9639
+#: doc/guix.texi:5796 doc/guix.texi:9738
 #, no-wrap
 msgid "synopsis"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5788
+#: doc/guix.texi:5798
 msgid "A one-line description of the package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5789 doc/guix.texi:9640 doc/guix.texi:27255
+#: doc/guix.texi:5799 doc/guix.texi:9739 doc/guix.texi:27538
 #, no-wrap
 msgid "description"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5791
+#: doc/guix.texi:5801
 msgid "A more elaborate description of the package."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5792
+#: doc/guix.texi:5802
 #, no-wrap
 msgid "license"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5793
+#: doc/guix.texi:5803
 #, no-wrap
 msgid "license, of packages"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5796
+#: doc/guix.texi:5806
 msgid "The license of the package; a value from @code{(guix licenses)}, or a list of such values."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5797 doc/guix.texi:9648
+#: doc/guix.texi:5807 doc/guix.texi:9747
 #, no-wrap
 msgid "home-page"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5799
+#: doc/guix.texi:5809
 msgid "The URL to the home-page of the package, as a string."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5800
+#: doc/guix.texi:5810
 #, no-wrap
 msgid "@code{supported-systems} (default: @var{%supported-systems})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5803
+#: doc/guix.texi:5813
 msgid "The list of systems supported by the package, as strings of the form @code{architecture-kernel}, for example @code{\"x86_64-linux\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5804
+#: doc/guix.texi:5814
 #, no-wrap
 msgid "@code{location} (default: source location of the @code{package} form)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5808
+#: doc/guix.texi:5818
 msgid "The source location of the package.  It is useful to override this when inheriting from another package, in which case this field is not automatically corrected."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5811
+#: doc/guix.texi:5821
 #, no-wrap
 msgid "{Scheme Syntax} this-package"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5814
+#: doc/guix.texi:5824
 msgid "When used in the @emph{lexical scope} of a package field definition, this identifier resolves to the package being defined."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5817
+#: doc/guix.texi:5827
 msgid "The example below shows how to add a package as a native input of itself when cross-compiling:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:5822
+#: doc/guix.texi:5832
 #, no-wrap
 msgid ""
 "(package\n"
@@ -11927,7 +12071,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:5828
+#: doc/guix.texi:5838
 #, no-wrap
 msgid ""
 "  ;; When cross-compiled, Guile, for example, depends on\n"
@@ -11938,89 +12082,89 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5831
+#: doc/guix.texi:5841
 msgid "It is an error to refer to @code{this-package} outside a package definition."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:5834
+#: doc/guix.texi:5844
 #, no-wrap
 msgid "@code{origin} Reference"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5838
+#: doc/guix.texi:5848
 msgid "This section summarizes all the options available in @code{origin} declarations (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:5839
+#: doc/guix.texi:5849
 #, no-wrap
 msgid "{Data Type} origin"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:5841
+#: doc/guix.texi:5851
 msgid "This is the data type representing a source code origin."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5843 doc/guix.texi:20263
+#: doc/guix.texi:5853 doc/guix.texi:20431
 #, no-wrap
 msgid "uri"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5848
+#: doc/guix.texi:5858
 msgid "An object containing the URI of the source.  The object type depends on the @code{method} (see below).  For example, when using the @var{url-fetch} method of @code{(guix download)}, the valid @code{uri} values are: a URL represented as a string, or a list thereof."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5849
+#: doc/guix.texi:5859
 #, no-wrap
 msgid "method"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5851
+#: doc/guix.texi:5861
 msgid "A procedure that handles the URI."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5853
+#: doc/guix.texi:5863
 msgid "Examples include:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5855
+#: doc/guix.texi:5865
 #, no-wrap
 msgid "@var{url-fetch} from @code{(guix download)}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5858
+#: doc/guix.texi:5868
 msgid "download a file from the HTTP, HTTPS, or FTP URL specified in the @code{uri} field;"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:5859 doc/guix.texi:8863
+#: doc/guix.texi:5869 doc/guix.texi:8962
 #, no-wrap
 msgid "git-fetch"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5860
+#: doc/guix.texi:5870
 #, no-wrap
 msgid "@var{git-fetch} from @code{(guix git-download)}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5864
+#: doc/guix.texi:5874
 msgid "clone the Git version control repository, and check out the revision specified in the @code{uri} field as a @code{git-reference} object; a @code{git-reference} looks like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:5869
+#: doc/guix.texi:5879
 #, fuzzy, no-wrap
 #| msgid "git clone https://git.savannah.gnu.org/git/guix.git\n"
 msgid ""
@@ -12030,1521 +12174,1684 @@ msgid ""
 msgstr "git clone https://git.savannah.gnu.org/git/guix.git\n"
 
 #. type: code{#1}
-#: doc/guix.texi:5872
+#: doc/guix.texi:5882
 #, no-wrap
 msgid "sha256"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5876
+#: doc/guix.texi:5886
 msgid "A bytevector containing the SHA-256 hash of the source.  Typically the @code{base32} form is used here to generate the bytevector from a base-32 string."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5880
+#: doc/guix.texi:5890
 msgid "You can obtain this information using @code{guix download} (@pxref{Invoking guix download}) or @code{guix hash} (@pxref{Invoking guix hash})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5881
+#: doc/guix.texi:5891
 #, no-wrap
 msgid "@code{file-name} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5887
+#: doc/guix.texi:5897
 msgid "The file name under which the source code should be saved.  When this is @code{#f}, a sensible default value will be used in most cases.  In case the source is fetched from a URL, the file name from the URL will be used.  For version control checkouts, it is recommended to provide the file name explicitly because the default is not very descriptive."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5888
+#: doc/guix.texi:5898
 #, no-wrap
 msgid "@code{patches} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5891
+#: doc/guix.texi:5901
 msgid "A list of file names, origins, or file-like objects (@pxref{G-Expressions, file-like objects}) pointing to patches to be applied to the source."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5895
+#: doc/guix.texi:5905
 msgid "This list of patches must be unconditional.  In particular, it cannot depend on the value of @code{%current-system} or @code{%current-target-system}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5896
+#: doc/guix.texi:5906
 #, no-wrap
 msgid "@code{snippet} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5900
+#: doc/guix.texi:5910
 msgid "A G-expression (@pxref{G-Expressions}) or S-expression that will be run in the source directory.  This is a convenient way to modify the source, sometimes more convenient than a patch."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5901
+#: doc/guix.texi:5911
 #, no-wrap
 msgid "@code{patch-flags} (default: @code{'(\"-p1\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5904
+#: doc/guix.texi:5914
 msgid "A list of command-line flags that should be passed to the @code{patch} command."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5905
+#: doc/guix.texi:5915
 #, no-wrap
 msgid "@code{patch-inputs} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5909
+#: doc/guix.texi:5919
 msgid "Input packages or derivations to the patching process.  When this is @code{#f}, the usual set of inputs necessary for patching are provided, such as GNU@tie{}Patch."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5910 doc/guix.texi:20169
+#: doc/guix.texi:5920 doc/guix.texi:20326
 #, no-wrap
 msgid "@code{modules} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5913
+#: doc/guix.texi:5923
 msgid "A list of Guile modules that should be loaded during the patching process and while running the code in the @code{snippet} field."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5914
+#: doc/guix.texi:5924
 #, no-wrap
 msgid "@code{patch-guile} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5917
+#: doc/guix.texi:5927
 msgid "The Guile package that should be used in the patching process.  When this is @code{#f}, a sensible default is used."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5924
+#: doc/guix.texi:5934
 #, no-wrap
 msgid "build system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5929
+#: doc/guix.texi:5939
 msgid "Each package definition specifies a @dfn{build system} and arguments for that build system (@pxref{Defining Packages}).  This @code{build-system} field represents the build procedure of the package, as well as implicit dependencies of that build procedure."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5933
+#: doc/guix.texi:5943
 msgid "Build systems are @code{} objects.  The interface to create and manipulate them is provided by the @code{(guix build-system)} module, and actual build systems are exported by specific modules."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5934
+#: doc/guix.texi:5944
 #, no-wrap
 msgid "bag (low-level package representation)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5941
+#: doc/guix.texi:5951
 msgid "Under the hood, build systems first compile package objects to @dfn{bags}.  A @dfn{bag} is like a package, but with less ornamentation---in other words, a bag is a lower-level representation of a package, which includes all the inputs of that package, including some that were implicitly added by the build system.  This intermediate representation is then compiled to a derivation (@pxref{Derivations})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5949
+#: doc/guix.texi:5959
 msgid "Build systems accept an optional list of @dfn{arguments}.  In package definitions, these are passed @i{via} the @code{arguments} field (@pxref{Defining Packages}).  They are typically keyword arguments (@pxref{Optional Arguments, keyword arguments in Guile,, guile, GNU Guile Reference Manual}).  The value of these arguments is usually evaluated in the @dfn{build stratum}---i.e., by a Guile process launched by the daemon (@pxref{Derivations})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5953
+#: doc/guix.texi:5963
 msgid "The main build system is @code{gnu-build-system}, which implements the standard build procedure for GNU and many other packages.  It is provided by the @code{(guix build-system gnu)} module."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5954
+#: doc/guix.texi:5964
 #, no-wrap
 msgid "{Scheme Variable} gnu-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5958
+#: doc/guix.texi:5968
 msgid "@code{gnu-build-system} represents the GNU Build System, and variants thereof (@pxref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5959 doc/guix.texi:6695
+#: doc/guix.texi:5969 doc/guix.texi:6768
 #, no-wrap
 msgid "build phases"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5966
+#: doc/guix.texi:5976
 msgid "In a nutshell, packages using it are configured, built, and installed with the usual @code{./configure && make && make check && make install} command sequence.  In practice, a few additional steps are often needed.  All these steps are split up in separate @dfn{phases}, notably@footnote{Please see the @code{(guix build gnu-build-system)} modules for more details about the build phases.}:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5968
+#: doc/guix.texi:5978
 #, no-wrap
 msgid "unpack"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5972
+#: doc/guix.texi:5982
 msgid "Unpack the source tarball, and change the current directory to the extracted source tree.  If the source is actually a directory, copy it to the build tree, and enter that directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5973
+#: doc/guix.texi:5983
 #, no-wrap
 msgid "patch-source-shebangs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5977
+#: doc/guix.texi:5987
 msgid "Patch shebangs encountered in source files so they refer to the right store file names.  For instance, this changes @code{#!/bin/sh} to @code{#!/gnu/store/@dots{}-bash-4.3/bin/sh}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5978 doc/guix.texi:6653 doc/guix.texi:6701
+#: doc/guix.texi:5988 doc/guix.texi:6726 doc/guix.texi:6774
 #, no-wrap
 msgid "configure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5982
+#: doc/guix.texi:5992
 msgid "Run the @file{configure} script with a number of default options, such as @code{--prefix=/gnu/store/@dots{}}, as well as the options specified by the @code{#:configure-flags} argument."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5983 doc/guix.texi:6185 doc/guix.texi:6658 doc/guix.texi:6705
-#: doc/guix.texi:26435
+#: doc/guix.texi:5993 doc/guix.texi:6259 doc/guix.texi:6731 doc/guix.texi:6778
+#: doc/guix.texi:26698
 #, no-wrap
 msgid "build"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5987
+#: doc/guix.texi:5997
 msgid "Run @code{make} with the list of flags specified with @code{#:make-flags}.  If the @code{#:parallel-build?} argument is true (the default), build with @code{make -j}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5988 doc/guix.texi:6195 doc/guix.texi:6662
+#: doc/guix.texi:5998 doc/guix.texi:6269 doc/guix.texi:6735
 #, no-wrap
 msgid "check"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5993
+#: doc/guix.texi:6003
 msgid "Run @code{make check}, or some other target specified with @code{#:test-target}, unless @code{#:tests? #f} is passed.  If the @code{#:parallel-tests?} argument is true (the default), run @code{make check -j}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5994 doc/guix.texi:6203 doc/guix.texi:6666 doc/guix.texi:6709
+#: doc/guix.texi:6004 doc/guix.texi:6277 doc/guix.texi:6739 doc/guix.texi:6782
 #, no-wrap
 msgid "install"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5996
+#: doc/guix.texi:6006
 msgid "Run @code{make install} with the flags listed in @code{#:make-flags}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5997
+#: doc/guix.texi:6007
 #, no-wrap
 msgid "patch-shebangs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5999
+#: doc/guix.texi:6009
 msgid "Patch shebangs on the installed executable files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6000
+#: doc/guix.texi:6010
 #, no-wrap
 msgid "strip"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6004
+#: doc/guix.texi:6014
 msgid "Strip debugging symbols from ELF files (unless @code{#:strip-binaries?} is false), copying them to the @code{debug} output when available (@pxref{Installing Debugging Files})."
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:6006
+#: doc/guix.texi:6016
 #, no-wrap
 msgid "%standard-phases"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6011
+#: doc/guix.texi:6021
 msgid "The build-side module @code{(guix build gnu-build-system)} defines @code{%standard-phases} as the default list of build phases.  @code{%standard-phases} is a list of symbol/procedure pairs, where the procedure implements the actual phase."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6014
+#: doc/guix.texi:6024
 msgid "The list of phases used for a particular package can be changed with the @code{#:phases} parameter.  For instance, passing:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6017
+#: doc/guix.texi:6027
 #, no-wrap
 msgid "#:phases (modify-phases %standard-phases (delete 'configure))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6021
+#: doc/guix.texi:6031
 msgid "means that all the phases described above will be used, except the @code{configure} phase."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6028
+#: doc/guix.texi:6038
 msgid "In addition, this build system ensures that the ``standard'' environment for GNU packages is available.  This includes tools such as GCC, libc, Coreutils, Bash, Make, Diffutils, grep, and sed (see the @code{(guix build-system gnu)} module for a complete list).  We call these the @dfn{implicit inputs} of a package, because package definitions do not have to mention them."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6035
+#: doc/guix.texi:6045
 msgid "Other @code{} objects are defined to support other conventions and tools used by free software packages.  They inherit most of @code{gnu-build-system}, and differ mainly in the set of inputs implicitly added to the build process, and in the list of phases executed.  Some of these build systems are listed below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6036
+#: doc/guix.texi:6046
 #, no-wrap
 msgid "{Scheme Variable} ant-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6040
+#: doc/guix.texi:6050
 msgid "This variable is exported by @code{(guix build-system ant)}.  It implements the build procedure for Java packages that can be built with @url{https://ant.apache.org/, Ant build tool}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6045
+#: doc/guix.texi:6055
 msgid "It adds both @code{ant} and the @dfn{Java Development Kit} (JDK) as provided by the @code{icedtea} package to the set of inputs.  Different packages can be specified with the @code{#:ant} and @code{#:jdk} parameters, respectively."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6051
+#: doc/guix.texi:6061
 msgid "When the original package does not provide a suitable Ant build file, the parameter @code{#:jar-name} can be used to generate a minimal Ant build file @file{build.xml} with tasks to build the specified jar archive.  In this case the parameter @code{#:source-dir} can be used to specify the source sub-directory, defaulting to ``src''."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6059
+#: doc/guix.texi:6069
 msgid "The @code{#:main-class} parameter can be used with the minimal ant buildfile to specify the main class of the resulting jar.  This makes the jar file executable.  The @code{#:test-include} parameter can be used to specify the list of junit tests to run. It defaults to @code{(list \"**/*Test.java\")}.  The @code{#:test-exclude} can be used to disable some tests. It defaults to @code{(list \"**/Abstract*.java\")}, because abstract classes cannot be run as tests."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6063
+#: doc/guix.texi:6073
 msgid "The parameter @code{#:build-target} can be used to specify the Ant task that should be run during the @code{build} phase.  By default the ``jar'' task will be run."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6066
+#: doc/guix.texi:6076
 #, no-wrap
 msgid "{Scheme Variable} android-ndk-build-system"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6067
+#: doc/guix.texi:6077
 #, no-wrap
 msgid "Android distribution"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6068
+#: doc/guix.texi:6078
 #, no-wrap
 msgid "Android NDK build system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6072
+#: doc/guix.texi:6082
 msgid "This variable is exported by @code{(guix build-system android-ndk)}.  It implements a build procedure for Android NDK (native development kit)  packages using a Guix-specific build process."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6076
+#: doc/guix.texi:6086
 msgid "The build system assumes that packages install their public interface (header) files to the subdirectory \"include\" of the \"out\" output and their libraries to the subdirectory \"lib\" of the \"out\" output."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6079
+#: doc/guix.texi:6089
 msgid "It's also assumed that the union of all the dependencies of a package has no conflicting files."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6082
+#: doc/guix.texi:6092
 msgid "For the time being, cross-compilation is not supported - so right now the libraries and header files are assumed to be host tools."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6085
+#: doc/guix.texi:6095
 #, no-wrap
 msgid "{Scheme Variable} asdf-build-system/source"
 msgstr ""
 
 #. type: defvrx
-#: doc/guix.texi:6086
+#: doc/guix.texi:6096
 #, no-wrap
 msgid "{Scheme Variable} asdf-build-system/sbcl"
 msgstr ""
 
 #. type: defvrx
-#: doc/guix.texi:6087
+#: doc/guix.texi:6097
 #, no-wrap
 msgid "{Scheme Variable} asdf-build-system/ecl"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6093
+#: doc/guix.texi:6103
 msgid "These variables, exported by @code{(guix build-system asdf)}, implement build procedures for Common Lisp packages using @url{https://common-lisp.net/project/asdf/, ``ASDF''}. ASDF is a system definition facility for Common Lisp programs and libraries."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6100
+#: doc/guix.texi:6110
 msgid "The @code{asdf-build-system/source} system installs the packages in source form, and can be loaded using any common lisp implementation, via ASDF.  The others, such as @code{asdf-build-system/sbcl}, install binary systems in the format which a particular implementation understands.  These build systems can also be used to produce executable programs, or lisp images which contain a set of packages pre-loaded."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6104
+#: doc/guix.texi:6114
 msgid "The build system uses naming conventions.  For binary packages, the package name should be prefixed with the lisp implementation, such as @code{sbcl-} for @code{asdf-build-system/sbcl}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6108
+#: doc/guix.texi:6118
 msgid "Additionally, the corresponding source package should be labeled using the same convention as python packages (see @ref{Python Modules}), using the @code{cl-} prefix."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6113
+#: doc/guix.texi:6123
 msgid "For binary packages, each system should be defined as a Guix package.  If one package @code{origin} contains several systems, package variants can be created in order to build all the systems.  Source packages, which use @code{asdf-build-system/source}, may contain several systems."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6120
+#: doc/guix.texi:6130
 msgid "In order to create executable programs and images, the build-side procedures @code{build-program} and @code{build-image} can be used.  They should be called in a build phase after the @code{create-symlinks} phase, so that the system which was just built can be used within the resulting image.  @code{build-program} requires a list of Common Lisp expressions to be passed as the @code{#:entry-program} argument."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6129
+#: doc/guix.texi:6139
 msgid "If the system is not defined within its own @code{.asd} file of the same name, then the @code{#:asd-file} parameter should be used to specify which file the system is defined in.  Furthermore, if the package defines a system for its tests in a separate file, it will be loaded before the tests are run if it is specified by the @code{#:test-asd-file} parameter.  If it is not set, the files @code{-tests.asd}, @code{-test.asd}, @code{tests.asd}, and @code{test.asd} will be tried if they exist."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6133
+#: doc/guix.texi:6143
 msgid "If for some reason the package must be named in a different way than the naming conventions suggest, the @code{#:asd-system-name} parameter can be used to specify the name of the system."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6136
+#: doc/guix.texi:6146
 #, no-wrap
 msgid "{Scheme Variable} cargo-build-system"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6137
+#: doc/guix.texi:6147
 #, no-wrap
 msgid "Rust programming language"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6138
+#: doc/guix.texi:6148
 #, no-wrap
 msgid "Cargo (Rust build system)"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6142
+#: doc/guix.texi:6152
 msgid "This variable is exported by @code{(guix build-system cargo)}.  It supports builds of packages using Cargo, the build tool of the @uref{https://www.rust-lang.org, Rust programming language}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6145
+#: doc/guix.texi:6155
 msgid "It adds @code{rustc} and @code{cargo} to the set of inputs.  A different Rust package can be specified with the @code{#:rust} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6153
+#: doc/guix.texi:6163
 msgid "Regular cargo dependencies should be added to the package definition via the @code{#:cargo-inputs} parameter as a list of name and spec pairs, where the spec can be a package or a source definition.  Note that the spec must evaluate to a path to a gzipped tarball which includes a @code{Cargo.toml} file at its root, or it will be ignored.  Similarly, cargo dev-dependencies should be added to the package definition via the @code{#:cargo-development-inputs} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6160
+#: doc/guix.texi:6170
 msgid "In its @code{configure} phase, this build system will make any source inputs specified in the @code{#:cargo-inputs} and @code{#:cargo-development-inputs} parameters available to cargo.  It will also remove an included @code{Cargo.lock} file to be recreated by @code{cargo} during the @code{build} phase.  The @code{install} phase installs any crate the binaries if they are defined by the crate."
 msgstr ""
 
+#. type: defvr
+#: doc/guix.texi:6173
+#, no-wrap
+msgid "{Scheme Variable} copy-build-system"
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:6162
+#: doc/guix.texi:6174
+#, fuzzy, no-wrap
+#| msgid "Build Systems"
+msgid "(copy build system)"
+msgstr "Системы сборки"
+
+#. type: defvr
+#: doc/guix.texi:6178
+msgid "This variable is exported by @code{(guix build-system copy)}.  It supports builds of simple packages that don't require much compiling, mostly just moving files around."
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:6183
+msgid "It adds much of the @code{gnu-build-system} packages to the set of inputs.  Because of this, the @code{copy-build-system} does not require all the boilerplate code often needed for the @code{trivial-build-system}."
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:6188
+msgid "To further simplify the file installation process, an @code{#:install-plan} argument is exposed to let the packager specify which files go where.  The install plan is a list of @code{(@var{source} @var{target} [@var{filters}])}.  @var{filters} are optional."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6190
+#, no-wrap
+msgid "When @var{source} matches a file or directory without trailing slash, install it to @var{target}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6192
+#, no-wrap
+msgid "If @var{target} has a trailing slash, install @var{source} basename beneath @var{target}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6193
+#, fuzzy, no-wrap
+#| msgid "--share=@var{source}[=@var{target}]"
+msgid "Otherwise install @var{source} as @var{target}."
+msgstr "--share=@var{source}[=@var{target}]"
+
+#. type: item
+#: doc/guix.texi:6196
+#, no-wrap
+msgid "When @var{source} is a directory with a trailing slash, or when @var{filters} are used,"
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:6199
+msgid "the trailing slash of @var{target} is implied with the same meaning as above."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6200
+#, no-wrap
+msgid "Without @var{filters}, install the full @var{source} @emph{content} to @var{target}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6201
+#, no-wrap
+msgid "With @var{filters} among @code{#:include}, @code{#:include-regexp}, @code{#:exclude},"
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:6204
+msgid "@code{#:exclude-regexp}, only select files are installed depending on the filters.  Each filters is specified by a list of strings."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6205
+#, no-wrap
+msgid "With @code{#:include}, install all the files which the path suffix matches"
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:6207
+msgid "at least one of the elements in the given list."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6207
+#, no-wrap
+msgid "With @code{#:include-regexp}, install all the files which the"
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:6210
+msgid "subpaths match at least one of the regular expressions in the given list."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6210
+#, no-wrap
+msgid "The @code{#:exclude} and @code{#:exclude-regexp} filters"
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:6215
+msgid "are the complement of their inclusion counterpart.  Without @code{#:include} flags, install all files but those matching the exclusion filters.  If both inclusions and exclusions are specified, the exclusions are done on top of the inclusions."
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:6219
+msgid "In all cases, the paths relative to @var{source} are preserved within @var{target}."
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:6222
+msgid "Examples:"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6224
+#, no-wrap
+msgid "@code{(\"foo/bar\" \"share/my-app/\")}: Install @file{bar} to @file{share/my-app/bar}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6225
+#, no-wrap
+msgid "@code{(\"foo/bar\" \"share/my-app/baz\")}: Install @file{bar} to @file{share/my-app/baz}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6226
+#, no-wrap
+msgid "@code{(\"foo/\" \"share/my-app\")}: Install the content of @file{foo} inside @file{share/my-app},"
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:6228
+msgid "e.g., install @file{foo/sub/file} to @file{share/my-app/sub/file}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6228
+#, no-wrap
+msgid "@code{(\"foo/\" \"share/my-app\" #:include (\"sub/file\"))}: Install only @file{foo/sub/file} to"
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:6230
+msgid "@file{share/my-app/sub/file}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6230
+#, no-wrap
+msgid "@code{(\"foo/sub\" \"share/my-app\" #:include (\"file\"))}: Install @file{foo/sub/file} to"
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:6232
+msgid "@file{share/my-app/file}."
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:6236
 #, no-wrap
 msgid "Clojure (programming language)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6163
+#: doc/guix.texi:6237
 #, no-wrap
 msgid "simple Clojure build system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6164
+#: doc/guix.texi:6238
 #, no-wrap
 msgid "{Scheme Variable} clojure-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6169
+#: doc/guix.texi:6243
 msgid "This variable is exported by @code{(guix build-system clojure)}.  It implements a simple build procedure for @uref{https://clojure.org/, Clojure} packages using plain old @code{compile} in Clojure.  Cross-compilation is not supported yet."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6173
+#: doc/guix.texi:6247
 msgid "It adds @code{clojure}, @code{icedtea} and @code{zip} to the set of inputs.  Different packages can be specified with the @code{#:clojure}, @code{#:jdk} and @code{#:zip} parameters, respectively."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6179
+#: doc/guix.texi:6253
 msgid "A list of source directories, test directories and jar names can be specified with the @code{#:source-dirs}, @code{#:test-dirs} and @code{#:jar-names} parameters, respectively.  Compile directory and main class can be specified with the @code{#:compile-dir} and @code{#:main-class} parameters, respectively.  Other parameters are documented below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6182
+#: doc/guix.texi:6256
 msgid "This build system is an extension of @code{ant-build-system}, but with the following phases changed:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6194
+#: doc/guix.texi:6268
 msgid "This phase calls @code{compile} in Clojure to compile source files and runs @command{jar} to create jars from both source files and compiled files according to the include list and exclude list specified in @code{#:aot-include} and @code{#:aot-exclude}, respectively.  The exclude list has priority over the include list.  These lists consist of symbols representing Clojure libraries or the special keyword @code{#:all} representing all Clojure libraries found under the source directories.  The parameter @code{#:omit-source?} decides if source should be included into the jars."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6202
+#: doc/guix.texi:6276
 msgid "This phase runs tests according to the include list and exclude list specified in @code{#:test-include} and @code{#:test-exclude}, respectively.  Their meanings are analogous to that of @code{#:aot-include} and @code{#:aot-exclude}, except that the special keyword @code{#:all} now stands for all Clojure libraries found under the test directories.  The parameter @code{#:tests?} decides if tests should be run."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6205
+#: doc/guix.texi:6279
 msgid "This phase installs all jars built previously."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6208
+#: doc/guix.texi:6282
 msgid "Apart from the above, this build system also contains an additional phase:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6211
+#: doc/guix.texi:6285
 #, no-wrap
 msgid "install-doc"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6216
+#: doc/guix.texi:6290
 msgid "This phase installs all top-level files with base name matching @code{%doc-regex}.  A different regex can be specified with the @code{#:doc-regex} parameter.  All files (recursively) inside the documentation directories specified in @code{#:doc-dirs} are installed as well."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6219
+#: doc/guix.texi:6293
 #, no-wrap
 msgid "{Scheme Variable} cmake-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6223
+#: doc/guix.texi:6297
 msgid "This variable is exported by @code{(guix build-system cmake)}.  It implements the build procedure for packages using the @url{https://www.cmake.org, CMake build tool}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6227
+#: doc/guix.texi:6301
 msgid "It automatically adds the @code{cmake} package to the set of inputs.  Which package is used can be specified with the @code{#:cmake} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6234
+#: doc/guix.texi:6308
 msgid "The @code{#:configure-flags} parameter is taken as a list of flags passed to the @command{cmake} command.  The @code{#:build-type} parameter specifies in abstract terms the flags passed to the compiler; it defaults to @code{\"RelWithDebInfo\"} (short for ``release mode with debugging information''), which roughly means that code is compiled with @code{-O2 -g}, as is the case for Autoconf-based packages by default."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6236
+#: doc/guix.texi:6310
 #, no-wrap
 msgid "{Scheme Variable} dune-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6243
+#: doc/guix.texi:6317
 msgid "This variable is exported by @code{(guix build-system dune)}.  It supports builds of packages using @uref{https://dune.build/, Dune}, a build tool for the OCaml programming language.  It is implemented as an extension of the @code{ocaml-build-system} which is described below.  As such, the @code{#:ocaml} and @code{#:findlib} parameters can be passed to this build system."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6247
+#: doc/guix.texi:6321
 msgid "It automatically adds the @code{dune} package to the set of inputs.  Which package is used can be specified with the @code{#:dune} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6251
+#: doc/guix.texi:6325
 msgid "There is no @code{configure} phase because dune packages typically don't need to be configured.  The @code{#:build-flags} parameter is taken as a list of flags passed to the @code{dune} command during the build."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6255
+#: doc/guix.texi:6329
 msgid "The @code{#:jbuild?} parameter can be passed to use the @code{jbuild} command instead of the more recent @code{dune} command while building a package.  Its default value is @code{#f}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6260
+#: doc/guix.texi:6334
 msgid "The @code{#:package} parameter can be passed to specify a package name, which is useful when a package contains multiple packages and you want to build only one of them.  This is equivalent to passing the @code{-p} argument to @code{dune}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6262
+#: doc/guix.texi:6336
 #, no-wrap
 msgid "{Scheme Variable} go-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6267
+#: doc/guix.texi:6341
 msgid "This variable is exported by @code{(guix build-system go)}.  It implements a build procedure for Go packages using the standard @url{https://golang.org/cmd/go/#hdr-Compile_packages_and_dependencies, Go build mechanisms}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6278
+#: doc/guix.texi:6352
 msgid "The user is expected to provide a value for the key @code{#:import-path} and, in some cases, @code{#:unpack-path}.  The @url{https://golang.org/doc/code.html#ImportPaths, import path} corresponds to the file system path expected by the package's build scripts and any referring packages, and provides a unique way to refer to a Go package.  It is typically based on a combination of the package source code's remote URI and file system hierarchy structure.  In some cases, you will need to unpack the package's source code to a different directory structure than the one indicated by the import path, and @code{#:unpack-path} should be used in such cases."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6283
+#: doc/guix.texi:6357
 msgid "Packages that provide Go libraries should install their source code into the built output.  The key @code{#:install-source?}, which defaults to @code{#t}, controls whether or not the source code is installed.  It can be set to @code{#f} for packages that only provide executable files."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6285
+#: doc/guix.texi:6359
 #, no-wrap
 msgid "{Scheme Variable} glib-or-gtk-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6288
+#: doc/guix.texi:6362
 msgid "This variable is exported by @code{(guix build-system glib-or-gtk)}.  It is intended for use with packages making use of GLib or GTK+."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6291
+#: doc/guix.texi:6365
 msgid "This build system adds the following two phases to the ones defined by @code{gnu-build-system}:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6293 doc/guix.texi:6682
+#: doc/guix.texi:6367 doc/guix.texi:6755
 #, no-wrap
 msgid "glib-or-gtk-wrap"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6300
+#: doc/guix.texi:6374
 msgid "The phase @code{glib-or-gtk-wrap} ensures that programs in @file{bin/} are able to find GLib ``schemas'' and @uref{https://developer.gnome.org/gtk3/stable/gtk-running.html, GTK+ modules}.  This is achieved by wrapping the programs in launch scripts that appropriately set the @code{XDG_DATA_DIRS} and @code{GTK_PATH} environment variables."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6307
+#: doc/guix.texi:6381
 msgid "It is possible to exclude specific package outputs from that wrapping process by listing their names in the @code{#:glib-or-gtk-wrap-excluded-outputs} parameter.  This is useful when an output is known not to contain any GLib or GTK+ binaries, and where wrapping would gratuitously add a dependency of that output on GLib and GTK+."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6308 doc/guix.texi:6686
+#: doc/guix.texi:6382 doc/guix.texi:6759
 #, no-wrap
 msgid "glib-or-gtk-compile-schemas"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6316
+#: doc/guix.texi:6390
 msgid "The phase @code{glib-or-gtk-compile-schemas} makes sure that all @uref{https://developer.gnome.org/gio/stable/glib-compile-schemas.html, GSettings schemas} of GLib are compiled.  Compilation is performed by the @command{glib-compile-schemas} program.  It is provided by the package @code{glib:bin} which is automatically imported by the build system.  The @code{glib} package providing @command{glib-compile-schemas} can be specified with the @code{#:glib} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6319
+#: doc/guix.texi:6393
 msgid "Both phases are executed after the @code{install} phase."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6321
+#: doc/guix.texi:6395
 #, no-wrap
 msgid "{Scheme Variable} guile-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6328
+#: doc/guix.texi:6402
 msgid "This build system is for Guile packages that consist exclusively of Scheme code and that are so lean that they don't even have a makefile, let alone a @file{configure} script.  It compiles Scheme code using @command{guild compile} (@pxref{Compilation,,, guile, GNU Guile Reference Manual}) and installs the @file{.scm} and @file{.go} files in the right place.  It also installs documentation."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6331
+#: doc/guix.texi:6405
 msgid "This build system supports cross-compilation by using the @code{--target} option of @command{guild compile}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6334
+#: doc/guix.texi:6408
 msgid "Packages built with @code{guile-build-system} must provide a Guile package in their @code{native-inputs} field."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6336
+#: doc/guix.texi:6410
 #, no-wrap
 msgid "{Scheme Variable} julia-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6342
+#: doc/guix.texi:6416
 msgid "This variable is exported by @code{(guix build-system julia)}.  It implements the build procedure used by @uref{https://julialang.org/, julia} packages, which essentially is similar to running @command{julia -e 'using Pkg; Pkg.add(package)'} in an environment where @code{JULIA_LOAD_PATH} contains the paths to all Julia package inputs.  Tests are run not run."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6345
+#: doc/guix.texi:6419
 msgid "Julia packages require the source @code{file-name} to be the real name of the package, correctly capitalized."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6350
+#: doc/guix.texi:6424
 msgid "For packages requiring shared library dependencies, you may need to write the @file{/deps/deps.jl} file manually. It's usually a line of @code{const variable = /gnu/store/library.so} for each dependency, plus a void function @code{check_deps() = nothing}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6357
+#: doc/guix.texi:6431
 msgid "Some older packages that aren't using @file{Package.toml} yet, will require this file to be created, too. The function @code{julia-create-package-toml} helps creating the file. You need to pass the outputs and the source of the package, it's name (the same as the @code{file-name} parameter), the package uuid, the package version, and a list of dependencies specified by their name and their uuid."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6359
+#: doc/guix.texi:6433
 #, no-wrap
 msgid "{Scheme Variable} minify-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6362
+#: doc/guix.texi:6436
 msgid "This variable is exported by @code{(guix build-system minify)}.  It implements a minification procedure for simple JavaScript packages."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6368
+#: doc/guix.texi:6442
 msgid "It adds @code{uglify-js} to the set of inputs and uses it to compress all JavaScript files in the @file{src} directory.  A different minifier package can be specified with the @code{#:uglify-js} parameter, but it is expected that the package writes the minified code to the standard output."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6372
+#: doc/guix.texi:6446
 msgid "When the input JavaScript files are not all located in the @file{src} directory, the parameter @code{#:javascript-files} can be used to specify a list of file names to feed to the minifier."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6374
+#: doc/guix.texi:6448
 #, no-wrap
 msgid "{Scheme Variable} ocaml-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6380
+#: doc/guix.texi:6454
 msgid "This variable is exported by @code{(guix build-system ocaml)}.  It implements a build procedure for @uref{https://ocaml.org, OCaml} packages, which consists of choosing the correct set of commands to run for each package.  OCaml packages can expect many different commands to be run.  This build system will try some of them."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6390
+#: doc/guix.texi:6464
 msgid "When the package has a @file{setup.ml} file present at the top-level, it will run @code{ocaml setup.ml -configure}, @code{ocaml setup.ml -build} and @code{ocaml setup.ml -install}.  The build system will assume that this file was generated by @uref{http://oasis.forge.ocamlcore.org/, OASIS} and will take care of setting the prefix and enabling tests if they are not disabled.  You can pass configure and build flags with the @code{#:configure-flags} and @code{#:build-flags}.  The @code{#:test-flags} key can be passed to change the set of flags used to enable tests.  The @code{#:use-make?} key can be used to bypass this system in the build and install phases."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6395
+#: doc/guix.texi:6469
 msgid "When the package has a @file{configure} file, it is assumed that it is a hand-made configure script that requires a different argument format than in the @code{gnu-build-system}.  You can add more flags with the @code{#:configure-flags} key."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6399
+#: doc/guix.texi:6473
 msgid "When the package has a @file{Makefile} file (or @code{#:use-make?} is @code{#t}), it will be used and more flags can be passed to the build and install phases with the @code{#:make-flags} key."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6407
+#: doc/guix.texi:6481
 msgid "Finally, some packages do not have these files and use a somewhat standard location for its build system.  In that case, the build system will run @code{ocaml pkg/pkg.ml} or @code{ocaml pkg/build.ml} and take care of providing the path to the required findlib module.  Additional flags can be passed via the @code{#:build-flags} key.  Install is taken care of by @command{opam-installer}.  In this case, the @code{opam} package must be added to the @code{native-inputs} field of the package definition."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6415
+#: doc/guix.texi:6489
 msgid "Note that most OCaml packages assume they will be installed in the same directory as OCaml, which is not what we want in guix.  In particular, they will install @file{.so} files in their module's directory, which is usually fine because it is in the OCaml compiler directory.  In guix though, these libraries cannot be found and we use @code{CAML_LD_LIBRARY_PATH}.  This variable points to @file{lib/ocaml/site-lib/stubslibs} and this is where @file{.so} libraries should be installed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6417
+#: doc/guix.texi:6491
 #, no-wrap
 msgid "{Scheme Variable} python-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6422
+#: doc/guix.texi:6496
 msgid "This variable is exported by @code{(guix build-system python)}.  It implements the more or less standard build procedure used by Python packages, which consists in running @code{python setup.py build} and then @code{python setup.py install --prefix=/gnu/store/@dots{}}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6426
+#: doc/guix.texi:6500
 msgid "For packages that install stand-alone Python programs under @code{bin/}, it takes care of wrapping these programs so that their @code{PYTHONPATH} environment variable points to all the Python libraries they depend on."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6432
+#: doc/guix.texi:6506
 msgid "Which Python package is used to perform the build can be specified with the @code{#:python} parameter.  This is a useful way to force a package to be built for a specific version of the Python interpreter, which might be necessary if the package is only compatible with a single interpreter version."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6437
+#: doc/guix.texi:6511
 msgid "By default guix calls @code{setup.py} under control of @code{setuptools}, much like @command{pip} does.  Some packages are not compatible with setuptools (and pip), thus you can disable this by setting the @code{#:use-setuptools?} parameter to @code{#f}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6439
+#: doc/guix.texi:6513
 #, no-wrap
 msgid "{Scheme Variable} perl-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6451
+#: doc/guix.texi:6525
 msgid "This variable is exported by @code{(guix build-system perl)}.  It implements the standard build procedure for Perl packages, which either consists in running @code{perl Build.PL --prefix=/gnu/store/@dots{}}, followed by @code{Build} and @code{Build install}; or in running @code{perl Makefile.PL PREFIX=/gnu/store/@dots{}}, followed by @code{make} and @code{make install}, depending on which of @code{Build.PL} or @code{Makefile.PL} is present in the package distribution.  Preference is given to the former if both @code{Build.PL} and @code{Makefile.PL} exist in the package distribution.  This preference can be reversed by specifying @code{#t} for the @code{#:make-maker?} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6455
+#: doc/guix.texi:6529
 msgid "The initial @code{perl Makefile.PL} or @code{perl Build.PL} invocation passes flags specified by the @code{#:make-maker-flags} or @code{#:module-build-flags} parameter, respectively."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6457
+#: doc/guix.texi:6531
 msgid "Which Perl package is used can be specified with @code{#:perl}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6459
+#: doc/guix.texi:6533
 #, no-wrap
 msgid "{Scheme Variable} qt-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6462
+#: doc/guix.texi:6536
 msgid "This variable is exported by @code{(guix build-system qt)}.  It is intended for use with applications using Qt or KDE."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6465
+#: doc/guix.texi:6539
 msgid "This build system adds the following two phases to the ones defined by @code{cmake-build-system}:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6467
+#: doc/guix.texi:6541
 #, no-wrap
 msgid "check-setup"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6474
+#: doc/guix.texi:6548
 msgid "The phase @code{check-setup} prepares the environment for running the checks as commonly used by Qt test programs.  For now this only sets some environment variables: @code{QT_QPA_PLATFORM=offscreen}, @code{DBUS_FATAL_WARNINGS=0} and @code{CTEST_OUTPUT_ON_FAILURE=1}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6477
+#: doc/guix.texi:6551
 msgid "This phase is added before the @code{check} phase.  It's a separate phase to ease adjusting if necessary."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6478
+#: doc/guix.texi:6552
 #, no-wrap
 msgid "qt-wrap"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6484
+#: doc/guix.texi:6558
 msgid "The phase @code{qt-wrap} searches for Qt5 plugin paths, QML paths and some XDG in the inputs and output.  In case some path is found, all programs in the output's @file{bin/}, @file{sbin/}, @file{libexec/} and @file{lib/libexec/} directories are wrapped in scripts defining the necessary environment variables."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6490
+#: doc/guix.texi:6564
 msgid "It is possible to exclude specific package outputs from that wrapping process by listing their names in the @code{#:qt-wrap-excluded-outputs} parameter.  This is useful when an output is known not to contain any Qt binaries, and where wrapping would gratuitously add a dependency of that output on Qt, KDE, or such."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6492
+#: doc/guix.texi:6566
 msgid "This phase is added after the @code{install} phase."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6495
+#: doc/guix.texi:6569
 #, no-wrap
 msgid "{Scheme Variable} r-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6503
+#: doc/guix.texi:6577
 msgid "This variable is exported by @code{(guix build-system r)}.  It implements the build procedure used by @uref{https://r-project.org, R} packages, which essentially is little more than running @code{R CMD INSTALL --library=/gnu/store/@dots{}} in an environment where @code{R_LIBS_SITE} contains the paths to all R package inputs.  Tests are run after installation using the R function @code{tools::testInstalledPackage}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6505
+#: doc/guix.texi:6579
 #, no-wrap
 msgid "{Scheme Variable} rakudo-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6513
+#: doc/guix.texi:6587
 msgid "This variable is exported by @code{(guix build-system rakudo)}.  It implements the build procedure used by @uref{https://rakudo.org/, Rakudo} for @uref{https://perl6.org/, Perl6} packages. It installs the package to @code{/gnu/store/@dots{}/NAME-VERSION/share/perl6} and installs the binaries, library files and the resources, as well as wrap the files under the @code{bin/} directory.  Tests can be skipped by passing @code{#f} to the @code{tests?} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6521
+#: doc/guix.texi:6595
 msgid "Which rakudo package is used can be specified with @code{rakudo}.  Which perl6-tap-harness package used for the tests can be specified with @code{#:prove6} or removed by passing @code{#f} to the @code{with-prove6?} parameter.  Which perl6-zef package used for tests and installing can be specified with @code{#:zef} or removed by passing @code{#f} to the @code{with-zef?} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6523
+#: doc/guix.texi:6597
 #, no-wrap
 msgid "{Scheme Variable} texlive-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6528
+#: doc/guix.texi:6602
 msgid "This variable is exported by @code{(guix build-system texlive)}.  It is used to build TeX packages in batch mode with a specified engine.  The build system sets the @code{TEXINPUTS} variable to find all TeX source files in the inputs."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6537
+#: doc/guix.texi:6611
 msgid "By default it runs @code{luatex} on all files ending on @code{ins}.  A different engine and format can be specified with the @code{#:tex-format} argument.  Different build targets can be specified with the @code{#:build-targets} argument, which expects a list of file names.  The build system adds only @code{texlive-bin} and @code{texlive-latex-base} (both from @code{(gnu packages tex}) to the inputs.  Both can be overridden with the arguments @code{#:texlive-bin} and @code{#:texlive-latex-base}, respectively."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6540
+#: doc/guix.texi:6614
 msgid "The @code{#:tex-directory} parameter tells the build system where to install the built files under the texmf tree."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6542
+#: doc/guix.texi:6616
 #, no-wrap
 msgid "{Scheme Variable} ruby-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6546
+#: doc/guix.texi:6620
 msgid "This variable is exported by @code{(guix build-system ruby)}.  It implements the RubyGems build procedure used by Ruby packages, which involves running @code{gem build} followed by @code{gem install}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6554
+#: doc/guix.texi:6628
 msgid "The @code{source} field of a package that uses this build system typically references a gem archive, since this is the format that Ruby developers use when releasing their software.  The build system unpacks the gem archive, potentially patches the source, runs the test suite, repackages the gem, and installs it.  Additionally, directories and tarballs may be referenced to allow building unreleased gems from Git or a traditional source release tarball."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6558
+#: doc/guix.texi:6632
 msgid "Which Ruby package is used can be specified with the @code{#:ruby} parameter.  A list of additional flags to be passed to the @command{gem} command can be specified with the @code{#:gem-flags} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6560
+#: doc/guix.texi:6634
 #, no-wrap
 msgid "{Scheme Variable} waf-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6566
+#: doc/guix.texi:6640
 msgid "This variable is exported by @code{(guix build-system waf)}.  It implements a build procedure around the @code{waf} script.  The common phases---@code{configure}, @code{build}, and @code{install}---are implemented by passing their names as arguments to the @code{waf} script."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6570
+#: doc/guix.texi:6644
 msgid "The @code{waf} script is executed by the Python interpreter.  Which Python package is used to run the script can be specified with the @code{#:python} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6572
+#: doc/guix.texi:6646
 #, no-wrap
 msgid "{Scheme Variable} scons-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6578
+#: doc/guix.texi:6652
 msgid "This variable is exported by @code{(guix build-system scons)}.  It implements the build procedure used by the SCons software construction tool.  This build system runs @code{scons} to build the package, @code{scons test} to run tests, and then @code{scons install} to install the package."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6585
+#: doc/guix.texi:6659
 msgid "Additional flags to be passed to @code{scons} can be specified with the @code{#:scons-flags} parameter.  The default build and install targets can be overridden with @code{#:build-targets} and @code{#:install-targets} respectively.  The version of Python used to run SCons can be specified by selecting the appropriate SCons package with the @code{#:scons} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6587
+#: doc/guix.texi:6661
 #, no-wrap
 msgid "{Scheme Variable} haskell-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6601
+#: doc/guix.texi:6675
 msgid "This variable is exported by @code{(guix build-system haskell)}.  It implements the Cabal build procedure used by Haskell packages, which involves running @code{runhaskell Setup.hs configure --prefix=/gnu/store/@dots{}} and @code{runhaskell Setup.hs build}.  Instead of installing the package by running @code{runhaskell Setup.hs install}, to avoid trying to register libraries in the read-only compiler store directory, the build system uses @code{runhaskell Setup.hs copy}, followed by @code{runhaskell Setup.hs register}.  In addition, the build system generates the package documentation by running @code{runhaskell Setup.hs haddock}, unless @code{#:haddock? #f} is passed.  Optional Haddock parameters can be passed with the help of the @code{#:haddock-flags} parameter.  If the file @code{Setup.hs} is not found, the build system looks for @code{Setup.lhs} instead."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6604
+#: doc/guix.texi:6678
 msgid "Which Haskell compiler is used can be specified with the @code{#:haskell} parameter which defaults to @code{ghc}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6606
+#: doc/guix.texi:6680
 #, no-wrap
 msgid "{Scheme Variable} dub-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6611
+#: doc/guix.texi:6685
 msgid "This variable is exported by @code{(guix build-system dub)}.  It implements the Dub build procedure used by D packages, which involves running @code{dub build} and @code{dub run}.  Installation is done by copying the files manually."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6614
+#: doc/guix.texi:6688
 msgid "Which D compiler is used can be specified with the @code{#:ldc} parameter which defaults to @code{ldc}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6616
+#: doc/guix.texi:6690
 #, no-wrap
 msgid "{Scheme Variable} emacs-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6620
+#: doc/guix.texi:6694
 msgid "This variable is exported by @code{(guix build-system emacs)}.  It implements an installation procedure similar to the packaging system of Emacs itself (@pxref{Packages,,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6627
-msgid "It first creates the @code{@code{package}-autoloads.el} file, then it byte compiles all Emacs Lisp files.  Differently from the Emacs packaging system, the Info documentation files are moved to the standard documentation directory and the @file{dir} file is deleted.  Each package is installed in its own directory under @file{share/emacs/site-lisp/guix.d}."
+#: doc/guix.texi:6700
+msgid "It first creates the @code{@code{package}-autoloads.el} file, then it byte compiles all Emacs Lisp files.  Differently from the Emacs packaging system, the Info documentation files are moved to the standard documentation directory and the @file{dir} file is deleted.  The Elisp package files are installed directly under @file{share/emacs/site-lisp}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6629
+#: doc/guix.texi:6702
 #, no-wrap
 msgid "{Scheme Variable} font-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6635
+#: doc/guix.texi:6708
 msgid "This variable is exported by @code{(guix build-system font)}.  It implements an installation procedure for font packages where upstream provides pre-compiled TrueType, OpenType, etc.@: font files that merely need to be copied into place.  It copies font files to standard locations in the output directory."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6637
+#: doc/guix.texi:6710
 #, no-wrap
 msgid "{Scheme Variable} meson-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6641
+#: doc/guix.texi:6714
 msgid "This variable is exported by @code{(guix build-system meson)}.  It implements the build procedure for packages that use @url{https://mesonbuild.com, Meson} as their build system."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6647
+#: doc/guix.texi:6720
 msgid "It adds both Meson and @uref{https://ninja-build.org/, Ninja} to the set of inputs, and they can be changed with the parameters @code{#:meson} and @code{#:ninja} if needed.  The default Meson is @code{meson-for-build}, which is special because it doesn't clear the @code{RUNPATH} of binaries and libraries when they are installed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6650
+#: doc/guix.texi:6723
 msgid "This build system is an extension of @code{gnu-build-system}, but with the following phases changed to some specific for Meson:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6657
+#: doc/guix.texi:6730
 msgid "The phase runs @code{meson} with the flags specified in @code{#:configure-flags}.  The flag @code{--build-type} is always set to @code{plain} unless something else is specified in @code{#:build-type}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6661
+#: doc/guix.texi:6734
 msgid "The phase runs @code{ninja} to build the package in parallel by default, but this can be changed with @code{#:parallel-build?}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6665
+#: doc/guix.texi:6738
 msgid "The phase runs @code{ninja} with the target specified in @code{#:test-target}, which is @code{\"test\"} by default."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6668
+#: doc/guix.texi:6741
 msgid "The phase runs @code{ninja install} and can not be changed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6671
+#: doc/guix.texi:6744
 msgid "Apart from that, the build system also adds the following phases:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6674
+#: doc/guix.texi:6747
 #, no-wrap
 msgid "fix-runpath"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6681
+#: doc/guix.texi:6754
 msgid "This phase ensures that all binaries can find the libraries they need.  It searches for required libraries in subdirectories of the package being built, and adds those to @code{RUNPATH} where needed.  It also removes references to libraries left over from the build phase by @code{meson-for-build}, such as test dependencies, that aren't actually required for the program to run."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6685 doc/guix.texi:6689
+#: doc/guix.texi:6758 doc/guix.texi:6762
 msgid "This phase is the phase provided by @code{glib-or-gtk-build-system}, and it is not enabled by default.  It can be enabled with @code{#:glib-or-gtk?}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6692
+#: doc/guix.texi:6765
 #, no-wrap
 msgid "{Scheme Variable} linux-module-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6694
+#: doc/guix.texi:6767
 msgid "@code{linux-module-build-system} allows building Linux kernel modules."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6698
+#: doc/guix.texi:6771
 msgid "This build system is an extension of @code{gnu-build-system}, but with the following phases changed:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6704
+#: doc/guix.texi:6777
 msgid "This phase configures the environment so that the Linux kernel's Makefile can be used to build the external kernel module."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6708
+#: doc/guix.texi:6781
 msgid "This phase uses the Linux kernel's Makefile in order to build the external kernel module."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6712
+#: doc/guix.texi:6785
 msgid "This phase uses the Linux kernel's Makefile in order to install the external kernel module."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6717
+#: doc/guix.texi:6790
 msgid "It is possible and useful to specify the Linux kernel to use for building the module (in the \"arguments\" form of a package using the linux-module-build-system, use the key #:linux to specify it)."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6719
+#: doc/guix.texi:6792
 #, no-wrap
 msgid "{Scheme Variable} node-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6724
-msgid "This variable is exported by @code{(guix build-system node)}.  It implements the build procedure used by @uref{http://nodejs.org, Node.js}, which implements an approximation of the @code{npm install} command, followed by an @code{npm test} command."
+#: doc/guix.texi:6797
+msgid "This variable is exported by @code{(guix build-system node)}.  It implements the build procedure used by @uref{https://nodejs.org, Node.js}, which implements an approximation of the @code{npm install} command, followed by an @code{npm test} command."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6728
+#: doc/guix.texi:6801
 msgid "Which Node.js package is used to interpret the @code{npm} commands can be specified with the @code{#:node} parameter which defaults to @code{node}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6734
+#: doc/guix.texi:6807
 msgid "Lastly, for packages that do not need anything as sophisticated, a ``trivial'' build system is provided.  It is trivial in the sense that it provides basically no support: it does not pull any implicit inputs, and does not have a notion of build phases."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6735
+#: doc/guix.texi:6808
 #, no-wrap
 msgid "{Scheme Variable} trivial-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6737
+#: doc/guix.texi:6810
 msgid "This variable is exported by @code{(guix build-system trivial)}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6742
+#: doc/guix.texi:6815
 msgid "This build system requires a @code{#:builder} argument.  This argument must be a Scheme expression that builds the package output(s)---as with @code{build-expression->derivation} (@pxref{Derivations, @code{build-expression->derivation}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6748
+#: doc/guix.texi:6821
 #, no-wrap
 msgid "store items"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6749
+#: doc/guix.texi:6822
 #, no-wrap
 msgid "store paths"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6760
+#: doc/guix.texi:6833
 msgid "Conceptually, the @dfn{store} is the place where derivations that have been built successfully are stored---by default, @file{/gnu/store}.  Sub-directories in the store are referred to as @dfn{store items} or sometimes @dfn{store paths}.  The store has an associated database that contains information such as the store paths referred to by each store path, and the list of @emph{valid} store items---results of successful builds.  This database resides in @file{@var{localstatedir}/guix/db}, where @var{localstatedir} is the state directory specified @i{via} @option{--localstatedir} at configure time, usually @file{/var}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6765
+#: doc/guix.texi:6838
 msgid "The store is @emph{always} accessed by the daemon on behalf of its clients (@pxref{Invoking guix-daemon}).  To manipulate the store, clients connect to the daemon over a Unix-domain socket, send requests to it, and read the result---these are remote procedure calls, or RPCs."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:6770
+#: doc/guix.texi:6843
 msgid "Users must @emph{never} modify files under @file{/gnu/store} directly.  This would lead to inconsistencies and break the immutability assumptions of Guix's functional model (@pxref{Introduction})."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:6774
+#: doc/guix.texi:6847
 msgid "@xref{Invoking guix gc, @command{guix gc --verify}}, for information on how to check the integrity of the store and attempt recovery from accidental modifications."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6781
+#: doc/guix.texi:6854
 msgid "The @code{(guix store)} module provides procedures to connect to the daemon, and to perform RPCs.  These are described below.  By default, @code{open-connection}, and thus all the @command{guix} commands, connect to the local daemon or to the URI specified by the @code{GUIX_DAEMON_SOCKET} environment variable."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6782
+#: doc/guix.texi:6855
 #, no-wrap
 msgid "{Environment Variable} GUIX_DAEMON_SOCKET"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6787
+#: doc/guix.texi:6860
 msgid "When set, the value of this variable should be a file name or a URI designating the daemon endpoint.  When it is a file name, it denotes a Unix-domain socket to connect to.  In addition to file names, the supported URI schemes are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:6789 doc/guix.texi:19928
+#: doc/guix.texi:6862 doc/guix.texi:20085
 #, no-wrap
 msgid "file"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6790
+#: doc/guix.texi:6863
 #, no-wrap
 msgid "unix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6794
+#: doc/guix.texi:6867
 msgid "These are for Unix-domain sockets.  @code{file:///var/guix/daemon-socket/socket} is equivalent to @file{/var/guix/daemon-socket/socket}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6795
+#: doc/guix.texi:6868
 #, no-wrap
 msgid "guix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6803
+#: doc/guix.texi:6876
 msgid "These URIs denote connections over TCP/IP, without encryption nor authentication of the remote host.  The URI must specify the host name and optionally a port number (by default port 44146 is used):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6806
+#: doc/guix.texi:6879
 #, no-wrap
 msgid "guix://master.guix.example.org:1234\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6811
+#: doc/guix.texi:6884
 msgid "This setup is suitable on local networks, such as clusters, where only trusted nodes may connect to the build daemon at @code{master.guix.example.org}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6815
+#: doc/guix.texi:6888
 msgid "The @code{--listen} option of @command{guix-daemon} can be used to instruct it to listen for TCP connections (@pxref{Invoking guix-daemon, @code{--listen}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6816
+#: doc/guix.texi:6889
 #, no-wrap
 msgid "ssh"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6817
+#: doc/guix.texi:6890
 #, no-wrap
 msgid "SSH access to build daemons"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6821
-msgid "These URIs allow you to connect to a remote daemon over SSH@footnote{This feature requires Guile-SSH (@pxref{Requirements}).}.  A typical URL might look like this:"
+#: doc/guix.texi:6896
+msgid "These URIs allow you to connect to a remote daemon over SSH.  This feature requires Guile-SSH (@pxref{Requirements}) and a working @code{guile} binary in @code{PATH} on the destination machine.  It supports public key and GSSAPI authentication.  A typical URL might look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6824
+#: doc/guix.texi:6899
 #, no-wrap
 msgid "ssh://charlie@@guix.example.org:22\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6828
+#: doc/guix.texi:6903
 msgid "As for @command{guix copy}, the usual OpenSSH client configuration files are honored (@pxref{Invoking guix copy})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6831
+#: doc/guix.texi:6906
 msgid "Additional URI schemes may be supported in the future."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:6838
+#: doc/guix.texi:6913
 msgid "The ability to connect to remote build daemons is considered experimental as of @value{VERSION}.  Please get in touch with us to share any problems or suggestions you may have (@pxref{Contributing})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6841
+#: doc/guix.texi:6916
 #, no-wrap
 msgid "{Scheme Procedure} open-connection [@var{uri}] [#:reserve-space? #t]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6846
+#: doc/guix.texi:6921
 msgid "Connect to the daemon over the Unix-domain socket at @var{uri} (a string).  When @var{reserve-space?} is true, instruct it to reserve a little bit of extra space on the file system so that the garbage collector can still operate should the disk become full.  Return a server object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6849
+#: doc/guix.texi:6924
 msgid "@var{file} defaults to @code{%default-socket-path}, which is the normal location given the options that were passed to @command{configure}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6851
+#: doc/guix.texi:6926
 #, no-wrap
 msgid "{Scheme Procedure} close-connection @var{server}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6853
+#: doc/guix.texi:6928
 msgid "Close the connection to @var{server}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6855
+#: doc/guix.texi:6930
 #, no-wrap
 msgid "{Scheme Variable} current-build-output-port"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6858
+#: doc/guix.texi:6933
 msgid "This variable is bound to a SRFI-39 parameter, which refers to the port where build and error logs sent by the daemon should be written."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6862
+#: doc/guix.texi:6937
 msgid "Procedures that make RPCs all take a server object as their first argument."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6863
+#: doc/guix.texi:6938
 #, no-wrap
 msgid "{Scheme Procedure} valid-path? @var{server} @var{path}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6864
+#: doc/guix.texi:6939
 #, no-wrap
 msgid "invalid store items"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6869
+#: doc/guix.texi:6944
 msgid "Return @code{#t} when @var{path} designates a valid store item and @code{#f} otherwise (an invalid item may exist on disk but still be invalid, for instance because it is the result of an aborted or failed build.)"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6872
+#: doc/guix.texi:6947
 msgid "A @code{&store-protocol-error} condition is raised if @var{path} is not prefixed by the store directory (@file{/gnu/store})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6874
+#: doc/guix.texi:6949
 #, no-wrap
 msgid "{Scheme Procedure} add-text-to-store @var{server} @var{name} @var{text} [@var{references}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6878
+#: doc/guix.texi:6953
 msgid "Add @var{text} under file @var{name} in the store, and return its store path.  @var{references} is the list of store paths referred to by the resulting store path."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6880
+#: doc/guix.texi:6955
 #, fuzzy, no-wrap
 #| msgid "{Scheme Procedure} lookup-inferior-packages @var{inferior} @var{name} @"
 msgid "{Scheme Procedure} build-derivations @var{store} @var{derivations} @"
 msgstr "{Процедура Scheme} lookup-inferior-packages @var{inferior} @var{name} @"
 
 #. type: deffn
-#: doc/guix.texi:6885
+#: doc/guix.texi:6960
 msgid "[@var{mode}] Build @var{derivations}, a list of @code{} objects, @file{.drv} file names, or derivation/output pairs, using the specified @var{mode}---@code{(build-mode normal)} by default."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6891
+#: doc/guix.texi:6966
 msgid "Note that the @code{(guix monads)} module provides a monad as well as monadic versions of the above procedures, with the goal of making it more convenient to work with code that accesses the store (@pxref{The Store Monad})."
 msgstr ""
 
 #. type: i{#1}
-#: doc/guix.texi:6894
+#: doc/guix.texi:6969
 msgid "This section is currently incomplete."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6898
+#: doc/guix.texi:6973
 #, no-wrap
 msgid "derivations"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6902
+#: doc/guix.texi:6977
 msgid "Low-level build actions and the environment in which they are performed are represented by @dfn{derivations}.  A derivation contains the following pieces of information:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6907
+#: doc/guix.texi:6982
 msgid "The outputs of the derivation---derivations produce at least one file or directory in the store, but may produce more."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6909
+#: doc/guix.texi:6984
 #, no-wrap
 msgid "build-time dependencies"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6910
+#: doc/guix.texi:6985
 #, no-wrap
 msgid "dependencies, build-time"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6914
+#: doc/guix.texi:6989
 msgid "The inputs of the derivations---i.e., its build-time dependencies---which may be other derivations or plain files in the store (patches, build scripts, etc.)"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6917
+#: doc/guix.texi:6992
 msgid "The system type targeted by the derivation---e.g., @code{x86_64-linux}."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6921
+#: doc/guix.texi:6996
 msgid "The file name of a build script in the store, along with the arguments to be passed."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6924
+#: doc/guix.texi:6999
 msgid "A list of environment variables to be defined."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6927
+#: doc/guix.texi:7002
 #, no-wrap
 msgid "derivation path"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6935
+#: doc/guix.texi:7010
 msgid "Derivations allow clients of the daemon to communicate build actions to the store.  They exist in two forms: as an in-memory representation, both on the client- and daemon-side, and as files in the store whose name end in @code{.drv}---these files are referred to as @dfn{derivation paths}.  Derivations paths can be passed to the @code{build-derivations} procedure to perform the build actions they prescribe (@pxref{The Store})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6936
+#: doc/guix.texi:7011
 #, no-wrap
 msgid "fixed-output derivations"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6943
+#: doc/guix.texi:7018
 msgid "Operations such as file downloads and version-control checkouts for which the expected content hash is known in advance are modeled as @dfn{fixed-output derivations}.  Unlike regular derivations, the outputs of a fixed-output derivation are independent of its inputs---e.g., a source code download produces the same result regardless of the download method and tools being used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6944 doc/guix.texi:10040
+#: doc/guix.texi:7019 doc/guix.texi:10139
 #, no-wrap
 msgid "references"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6945
+#: doc/guix.texi:7020
 #, no-wrap
 msgid "run-time dependencies"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6946
+#: doc/guix.texi:7021
 #, no-wrap
 msgid "dependencies, run-time"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6953
+#: doc/guix.texi:7028
 msgid "The outputs of derivations---i.e., the build results---have a set of @dfn{references}, as reported by the @code{references} RPC or the @command{guix gc --references} command (@pxref{Invoking guix gc}).  References are the set of run-time dependencies of the build results.  References are a subset of the inputs of the derivation; this subset is automatically computed by the build daemon by scanning all the files in the outputs."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6958
+#: doc/guix.texi:7033
 msgid "The @code{(guix derivations)} module provides a representation of derivations as Scheme objects, along with procedures to create and otherwise manipulate derivations.  The lowest-level primitive to create a derivation is the @code{derivation} procedure:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6959
+#: doc/guix.texi:7034
 #, no-wrap
 msgid "{Scheme Procedure} derivation @var{store} @var{name} @var{builder} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6968
+#: doc/guix.texi:7043
 msgid "@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-references #f] @ [#:leaked-env-vars #f] [#:local-build? #f] @ [#:substitutable? #t] [#:properties '()] Build a derivation with the given arguments, and return the resulting @code{} object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6975
+#: doc/guix.texi:7050
 msgid "When @var{hash} and @var{hash-algo} are given, a @dfn{fixed-output derivation} is created---i.e., one whose result is known in advance, such as a file download.  If, in addition, @var{recursive?} is true, then that fixed output may be an executable file or a directory and @var{hash} must be the hash of an archive containing this output."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6980
+#: doc/guix.texi:7055
 msgid "When @var{references-graphs} is true, it must be a list of file name/store path pairs.  In that case, the reference graph of each store path is exported in the build environment in the corresponding file, in a simple text format."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6985
+#: doc/guix.texi:7060
 msgid "When @var{allowed-references} is true, it must be a list of store items or outputs that the derivation's output may refer to.  Likewise, @var{disallowed-references}, if true, must be a list of things the outputs may @emph{not} refer to."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6992
+#: doc/guix.texi:7067
 msgid "When @var{leaked-env-vars} is true, it must be a list of strings denoting environment variables that are allowed to ``leak'' from the daemon's environment to the build environment.  This is only applicable to fixed-output derivations---i.e., when @var{hash} is true.  The main use is to allow variables such as @code{http_proxy} to be passed to derivations that download files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6997
+#: doc/guix.texi:7072
 msgid "When @var{local-build?} is true, declare that the derivation is not a good candidate for offloading and should rather be built locally (@pxref{Daemon Offload Setup}).  This is the case for small derivations where the costs of data transfers would outweigh the benefits."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7002
+#: doc/guix.texi:7077
 msgid "When @var{substitutable?} is false, declare that substitutes of the derivation's output should not be used (@pxref{Substitutes}).  This is useful, for instance, when building packages that capture details of the host CPU instruction set."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7005
+#: doc/guix.texi:7080
 msgid "@var{properties} must be an association list describing ``properties'' of the derivation.  It is kept as-is, uninterpreted, in the derivation."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7011
+#: doc/guix.texi:7086
 msgid "Here's an example with a shell script as its builder, assuming @var{store} is an open connection to the daemon, and @var{bash} points to a Bash executable in the store:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7016
+#: doc/guix.texi:7091
 #, no-wrap
 msgid ""
 "(use-modules (guix utils)\n"
@@ -13554,7 +13861,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7025
+#: doc/guix.texi:7100
 #, no-wrap
 msgid ""
 "(let ((builder   ; add the Bash script to the store\n"
@@ -13568,48 +13875,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7032
+#: doc/guix.texi:7107
 msgid "As can be guessed, this primitive is cumbersome to use directly.  A better approach is to write build scripts in Scheme, of course! The best course of action for that is to write the build code as a ``G-expression'', and to pass it to @code{gexp->derivation}.  For more information, @pxref{G-Expressions}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7037
+#: doc/guix.texi:7112
 msgid "Once upon a time, @code{gexp->derivation} did not exist and constructing derivations with build code written in Scheme was achieved with @code{build-expression->derivation}, documented below.  This procedure is now deprecated in favor of the much nicer @code{gexp->derivation}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7038
+#: doc/guix.texi:7113
 #, no-wrap
 msgid "{Scheme Procedure} build-expression->derivation @var{store} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7054
+#: doc/guix.texi:7129
 msgid "@var{name} @var{exp} @ [#:system (%current-system)] [#:inputs '()] @ [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:local-build? #f] [#:substitutable? #t] [#:guile-for-build #f] Return a derivation that executes Scheme expression @var{exp} as a builder for derivation @var{name}.  @var{inputs} must be a list of @code{(name drv-path sub-drv)} tuples; when @var{sub-drv} is omitted, @code{\"out\"} is assumed.  @var{modules} is a list of names of Guile modules from the current search path to be copied in the store, compiled, and made available in the load path during the execution of @var{exp}---e.g., @code{((guix build utils) (guix build gnu-build-system))}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7062
+#: doc/guix.texi:7137
 msgid "@var{exp} is evaluated in an environment where @code{%outputs} is bound to a list of output/path pairs, and where @code{%build-inputs} is bound to a list of string/output-path pairs made from @var{inputs}.  Optionally, @var{env-vars} is a list of string pairs specifying the name and value of environment variables visible to the builder.  The builder terminates by passing the result of @var{exp} to @code{exit}; thus, when @var{exp} returns @code{#f}, the build is considered to have failed."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7066
+#: doc/guix.texi:7141
 msgid "@var{exp} is built using @var{guile-for-build} (a derivation).  When @var{guile-for-build} is omitted or is @code{#f}, the value of the @code{%guile-for-build} fluid is used instead."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7071
+#: doc/guix.texi:7146
 msgid "See the @code{derivation} procedure for the meaning of @var{references-graphs}, @var{allowed-references}, @var{disallowed-references}, @var{local-build?}, and @var{substitutable?}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7076
+#: doc/guix.texi:7151
 msgid "Here's an example of a single-output derivation that creates a directory containing one file:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7084
+#: doc/guix.texi:7159
 #, no-wrap
 msgid ""
 "(let ((builder '(let ((out (assoc-ref %outputs \"out\")))\n"
@@ -13622,51 +13929,51 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7086
+#: doc/guix.texi:7161
 #, no-wrap
 msgid "@result{} # @dots{}>\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7092
+#: doc/guix.texi:7167
 #, no-wrap
 msgid "monad"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7098
+#: doc/guix.texi:7173
 msgid "The procedures that operate on the store described in the previous sections all take an open connection to the build daemon as their first argument.  Although the underlying model is functional, they either have side effects or depend on the current state of the store."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7104
+#: doc/guix.texi:7179
 msgid "The former is inconvenient: the connection to the build daemon has to be carried around in all those functions, making it impossible to compose functions that do not take that parameter with functions that do.  The latter can be problematic: since store operations have side effects and/or depend on external state, they have to be properly sequenced."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7105
+#: doc/guix.texi:7180
 #, no-wrap
 msgid "monadic values"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7106
+#: doc/guix.texi:7181
 #, no-wrap
 msgid "monadic functions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7116
+#: doc/guix.texi:7191
 msgid "This is where the @code{(guix monads)} module comes in.  This module provides a framework for working with @dfn{monads}, and a particularly useful monad for our uses, the @dfn{store monad}.  Monads are a construct that allows two things: associating ``context'' with values (in our case, the context is the store), and building sequences of computations (here computations include accesses to the store).  Values in a monad---values that carry this additional context---are called @dfn{monadic values}; procedures that return such values are called @dfn{monadic procedures}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7118
+#: doc/guix.texi:7193
 msgid "Consider this ``normal'' procedure:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7127
+#: doc/guix.texi:7202
 #, no-wrap
 msgid ""
 "(define (sh-symlink store)\n"
@@ -13679,12 +13986,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7131
+#: doc/guix.texi:7206
 msgid "Using @code{(guix monads)} and @code{(guix gexp)}, it may be rewritten as a monadic function:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7139
+#: doc/guix.texi:7214
 #, no-wrap
 msgid ""
 "(define (sh-symlink)\n"
@@ -13696,17 +14003,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7146
+#: doc/guix.texi:7221
 msgid "There are several things to note in the second version: the @code{store} parameter is now implicit and is ``threaded'' in the calls to the @code{package->derivation} and @code{gexp->derivation} monadic procedures, and the monadic value returned by @code{package->derivation} is @dfn{bound} using @code{mlet} instead of plain @code{let}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7150
+#: doc/guix.texi:7225
 msgid "As it turns out, the call to @code{package->derivation} can even be omitted since it will take place implicitly, as we will see later (@pxref{G-Expressions}):"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7156
+#: doc/guix.texi:7231
 #, no-wrap
 msgid ""
 "(define (sh-symlink)\n"
@@ -13716,12 +14023,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7165
+#: doc/guix.texi:7240
 msgid "Calling the monadic @code{sh-symlink} has no effect.  As someone once said, ``you exit a monad like you exit a building on fire: by running''.  So, to exit the monad and get the desired effect, one must use @code{run-with-store}:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7169
+#: doc/guix.texi:7244
 #, no-wrap
 msgid ""
 "(run-with-store (open-connection) (sh-symlink))\n"
@@ -13729,12 +14036,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7175
+#: doc/guix.texi:7250
 msgid "Note that the @code{(guix monad-repl)} module extends the Guile REPL with new ``meta-commands'' to make it easier to deal with monadic procedures: @code{run-in-store}, and @code{enter-store-monad}.  The former is used to ``run'' a single monadic value through the store:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7179
+#: doc/guix.texi:7254
 #, no-wrap
 msgid ""
 "scheme@@(guile-user)> ,run-in-store (package->derivation hello)\n"
@@ -13742,12 +14049,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7183
+#: doc/guix.texi:7258
 msgid "The latter enters a recursive REPL, where all the return values are automatically run through the store:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7192
+#: doc/guix.texi:7267
 #, no-wrap
 msgid ""
 "scheme@@(guile-user)> ,enter-store-monad\n"
@@ -13760,50 +14067,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7197
+#: doc/guix.texi:7272
 msgid "Note that non-monadic values cannot be returned in the @code{store-monad} REPL."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7200
+#: doc/guix.texi:7275
 msgid "The main syntactic forms to deal with monads in general are provided by the @code{(guix monads)} module and are described below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7201
+#: doc/guix.texi:7276
 #, no-wrap
 msgid "{Scheme Syntax} with-monad @var{monad} @var{body} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7204
+#: doc/guix.texi:7279
 msgid "Evaluate any @code{>>=} or @code{return} forms in @var{body} as being in @var{monad}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7206
+#: doc/guix.texi:7281
 #, no-wrap
 msgid "{Scheme Syntax} return @var{val}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7208
+#: doc/guix.texi:7283
 msgid "Return a monadic value that encapsulates @var{val}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7210
+#: doc/guix.texi:7285
 #, no-wrap
 msgid "{Scheme Syntax} >>= @var{mval} @var{mproc} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7217
+#: doc/guix.texi:7292
 msgid "@dfn{Bind} monadic value @var{mval}, passing its ``contents'' to monadic procedures @var{mproc}@dots{}@footnote{This operation is commonly referred to as ``bind'', but that name denotes an unrelated procedure in Guile.  Thus we use this somewhat cryptic symbol inherited from the Haskell language.}.  There can be one @var{mproc} or several of them, as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7225
+#: doc/guix.texi:7300
 #, no-wrap
 msgid ""
 "(run-with-state\n"
@@ -13816,7 +14123,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7228
+#: doc/guix.texi:7303
 #, no-wrap
 msgid ""
 "@result{} 4\n"
@@ -13824,99 +14131,99 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7231
+#: doc/guix.texi:7306
 #, no-wrap
 msgid "{Scheme Syntax} mlet @var{monad} ((@var{var} @var{mval}) ...) @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7233
+#: doc/guix.texi:7308
 msgid "@var{body} ..."
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:7233
+#: doc/guix.texi:7308
 #, no-wrap
 msgid "{Scheme Syntax} mlet* @var{monad} ((@var{var} @var{mval}) ...) @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7245
+#: doc/guix.texi:7320
 msgid "@var{body} ...  Bind the variables @var{var} to the monadic values @var{mval} in @var{body}, which is a sequence of expressions.  As with the bind operator, this can be thought of as ``unpacking'' the raw, non-monadic value ``contained'' in @var{mval} and making @var{var} refer to that raw, non-monadic value within the scope of the @var{body}.  The form (@var{var} -> @var{val}) binds @var{var} to the ``normal'' value @var{val}, as per @code{let}.  The binding operations occur in sequence from left to right.  The last expression of @var{body} must be a monadic expression, and its result will become the result of the @code{mlet} or @code{mlet*} when run in the @var{monad}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7248
+#: doc/guix.texi:7323
 msgid "@code{mlet*} is to @code{mlet} what @code{let*} is to @code{let} (@pxref{Local Bindings,,, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7250
+#: doc/guix.texi:7325
 #, no-wrap
 msgid "{Scheme System} mbegin @var{monad} @var{mexp} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7254
+#: doc/guix.texi:7329
 msgid "Bind @var{mexp} and the following monadic expressions in sequence, returning the result of the last expression.  Every expression in the sequence must be a monadic expression."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7258
+#: doc/guix.texi:7333
 msgid "This is akin to @code{mlet}, except that the return values of the monadic expressions are ignored.  In that sense, it is analogous to @code{begin}, but applied to monadic expressions."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7260
+#: doc/guix.texi:7335
 #, no-wrap
 msgid "{Scheme System} mwhen @var{condition} @var{mexp0} @var{mexp*} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7265
+#: doc/guix.texi:7340
 msgid "When @var{condition} is true, evaluate the sequence of monadic expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}.  When @var{condition} is false, return @code{*unspecified*} in the current monad.  Every expression in the sequence must be a monadic expression."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7267
+#: doc/guix.texi:7342
 #, no-wrap
 msgid "{Scheme System} munless @var{condition} @var{mexp0} @var{mexp*} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7272
+#: doc/guix.texi:7347
 msgid "When @var{condition} is false, evaluate the sequence of monadic expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}.  When @var{condition} is true, return @code{*unspecified*} in the current monad.  Every expression in the sequence must be a monadic expression."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7274
+#: doc/guix.texi:7349
 #, no-wrap
 msgid "state monad"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7278
+#: doc/guix.texi:7353
 msgid "The @code{(guix monads)} module provides the @dfn{state monad}, which allows an additional value---the state---to be @emph{threaded} through monadic procedure calls."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:7279
+#: doc/guix.texi:7354
 #, no-wrap
 msgid "{Scheme Variable} %state-monad"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:7282
+#: doc/guix.texi:7357
 msgid "The state monad.  Procedures in the state monad can access and change the state that is threaded."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:7286
+#: doc/guix.texi:7361
 msgid "Consider the example below.  The @code{square} procedure returns a value in the state monad.  It returns the square of its argument, but also increments the current state value:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7293
+#: doc/guix.texi:7368
 #, no-wrap
 msgid ""
 "(define (square x)\n"
@@ -13928,7 +14235,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7297
+#: doc/guix.texi:7372
 #, no-wrap
 msgid ""
 "(run-with-state (sequence %state-monad (map square (iota 3))) 0)\n"
@@ -13937,147 +14244,147 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:7301
+#: doc/guix.texi:7376
 msgid "When ``run'' through @var{%state-monad}, we obtain that additional state value, which is the number of @code{square} calls."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7303
+#: doc/guix.texi:7378
 #, no-wrap
 msgid "{Monadic Procedure} current-state"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7305
+#: doc/guix.texi:7380
 msgid "Return the current state as a monadic value."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7307
+#: doc/guix.texi:7382
 #, no-wrap
 msgid "{Monadic Procedure} set-current-state @var{value}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7310
+#: doc/guix.texi:7385
 msgid "Set the current state to @var{value} and return the previous state as a monadic value."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7312
+#: doc/guix.texi:7387
 #, no-wrap
 msgid "{Monadic Procedure} state-push @var{value}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7315
+#: doc/guix.texi:7390
 msgid "Push @var{value} to the current state, which is assumed to be a list, and return the previous state as a monadic value."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7317
+#: doc/guix.texi:7392
 #, no-wrap
 msgid "{Monadic Procedure} state-pop"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7320
+#: doc/guix.texi:7395
 msgid "Pop a value from the current state and return it as a monadic value.  The state is assumed to be a list."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7322
+#: doc/guix.texi:7397
 #, no-wrap
 msgid "{Scheme Procedure} run-with-state @var{mval} [@var{state}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7325
+#: doc/guix.texi:7400
 msgid "Run monadic value @var{mval} starting with @var{state} as the initial state.  Return two values: the resulting value, and the resulting state."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7329
+#: doc/guix.texi:7404
 msgid "The main interface to the store monad, provided by the @code{(guix store)} module, is as follows."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:7330
+#: doc/guix.texi:7405
 #, no-wrap
 msgid "{Scheme Variable} %store-monad"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:7332
+#: doc/guix.texi:7407
 msgid "The store monad---an alias for @var{%state-monad}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:7336
+#: doc/guix.texi:7411
 msgid "Values in the store monad encapsulate accesses to the store.  When its effect is needed, a value of the store monad must be ``evaluated'' by passing it to the @code{run-with-store} procedure (see below.)"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7338
+#: doc/guix.texi:7413
 #, no-wrap
 msgid "{Scheme Procedure} run-with-store @var{store} @var{mval} [#:guile-for-build] [#:system (%current-system)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7341
+#: doc/guix.texi:7416
 msgid "Run @var{mval}, a monadic value in the store monad, in @var{store}, an open store connection."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7343
+#: doc/guix.texi:7418
 #, no-wrap
 msgid "{Monadic Procedure} text-file @var{name} @var{text} [@var{references}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7347
+#: doc/guix.texi:7422
 msgid "Return as a monadic value the absolute file name in the store of the file containing @var{text}, a string.  @var{references} is a list of store items that the resulting text file refers to; it defaults to the empty list."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7349
+#: doc/guix.texi:7424
 #, no-wrap
 msgid "{Monadic Procedure} binary-file @var{name} @var{data} [@var{references}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7353
+#: doc/guix.texi:7428
 msgid "Return as a monadic value the absolute file name in the store of the file containing @var{data}, a bytevector.  @var{references} is a list of store items that the resulting binary file refers to; it defaults to the empty list."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7355
+#: doc/guix.texi:7430
 #, no-wrap
 msgid "{Monadic Procedure} interned-file @var{file} [@var{name}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7360
+#: doc/guix.texi:7435
 msgid "[#:recursive? #t] [#:select? (const #t)] Return the name of @var{file} once interned in the store.  Use @var{name} as its store name, or the basename of @var{file} if @var{name} is omitted."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7364 doc/guix.texi:7781
+#: doc/guix.texi:7439 doc/guix.texi:7856
 msgid "When @var{recursive?} is true, the contents of @var{file} are added recursively; if @var{file} designates a flat file and @var{recursive?} is true, its contents are added, and its permission bits are kept."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7369 doc/guix.texi:7786
+#: doc/guix.texi:7444 doc/guix.texi:7861
 msgid "When @var{recursive?} is true, call @code{(@var{select?} @var{file} @var{stat})} for each directory entry, where @var{file} is the entry's absolute file name and @var{stat} is the result of @code{lstat}; exclude entries for which @var{select?} does not return true."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7371
+#: doc/guix.texi:7446
 msgid "The example below adds a file to the store, under two different names:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7377
+#: doc/guix.texi:7452
 #, no-wrap
 msgid ""
 "(run-with-store (open-connection)\n"
@@ -14088,115 +14395,115 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7379
+#: doc/guix.texi:7454
 #, no-wrap
 msgid "@result{} (\"/gnu/store/rwm@dots{}-README\" \"/gnu/store/44i@dots{}-LEGU-MIN\")\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7385
+#: doc/guix.texi:7460
 msgid "The @code{(guix packages)} module exports the following package-related monadic procedures:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7386
+#: doc/guix.texi:7461
 #, no-wrap
 msgid "{Monadic Procedure} package-file @var{package} [@var{file}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7394
+#: doc/guix.texi:7469
 msgid "[#:system (%current-system)] [#:target #f] @ [#:output \"out\"] Return as a monadic value in the absolute file name of @var{file} within the @var{output} directory of @var{package}.  When @var{file} is omitted, return the name of the @var{output} directory of @var{package}.  When @var{target} is true, use it as a cross-compilation target triplet."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7396
+#: doc/guix.texi:7471
 #, no-wrap
 msgid "{Monadic Procedure} package->derivation @var{package} [@var{system}]"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:7397
+#: doc/guix.texi:7472
 #, no-wrap
 msgid "{Monadic Procedure} package->cross-derivation @var{package} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7401
+#: doc/guix.texi:7476
 msgid "@var{target} [@var{system}] Monadic version of @code{package-derivation} and @code{package-cross-derivation} (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7407
+#: doc/guix.texi:7482
 #, no-wrap
 msgid "G-expression"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7408
+#: doc/guix.texi:7483
 #, no-wrap
 msgid "build code quoting"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7414
+#: doc/guix.texi:7489
 msgid "So we have ``derivations'', which represent a sequence of build actions to be performed to produce an item in the store (@pxref{Derivations}).  These build actions are performed when asking the daemon to actually build the derivations; they are run by the daemon in a container (@pxref{Invoking guix-daemon})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7415
+#: doc/guix.texi:7490
 #, no-wrap
 msgid "strata of code"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7427
+#: doc/guix.texi:7502
 msgid "It should come as no surprise that we like to write these build actions in Scheme.  When we do that, we end up with two @dfn{strata} of Scheme code@footnote{The term @dfn{stratum} in this context was coined by Manuel Serrano et al.@: in the context of their work on Hop.  Oleg Kiselyov, who has written insightful @url{http://okmij.org/ftp/meta-programming/#meta-scheme, essays and code on this topic}, refers to this kind of code generation as @dfn{staging}.}: the ``host code''---code that defines packages, talks to the daemon, etc.---and the ``build code''---code that actually performs build actions, such as making directories, invoking @command{make}, etc."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7434
+#: doc/guix.texi:7509
 msgid "To describe a derivation and its build actions, one typically needs to embed build code inside host code.  It boils down to manipulating build code as data, and the homoiconicity of Scheme---code has a direct representation as data---comes in handy for that.  But we need more than the normal @code{quasiquote} mechanism in Scheme to construct build expressions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7443
+#: doc/guix.texi:7518
 msgid "The @code{(guix gexp)} module implements @dfn{G-expressions}, a form of S-expressions adapted to build expressions.  G-expressions, or @dfn{gexps}, consist essentially of three syntactic forms: @code{gexp}, @code{ungexp}, and @code{ungexp-splicing} (or simply: @code{#~}, @code{#$}, and @code{#$@@}), which are comparable to @code{quasiquote}, @code{unquote}, and @code{unquote-splicing}, respectively (@pxref{Expression Syntax, @code{quasiquote},, guile, GNU Guile Reference Manual}).  However, there are major differences:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:7448
+#: doc/guix.texi:7523
 msgid "Gexps are meant to be written to a file and run or manipulated by other processes."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:7453
+#: doc/guix.texi:7528
 msgid "When a high-level object such as a package or derivation is unquoted inside a gexp, the result is as if its output file name had been introduced."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:7458
+#: doc/guix.texi:7533
 msgid "Gexps carry information about the packages or derivations they refer to, and these dependencies are automatically added as inputs to the build processes that use them."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7460 doc/guix.texi:7969
+#: doc/guix.texi:7535 doc/guix.texi:8063
 #, no-wrap
 msgid "lowering, of high-level objects in gexps"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7470
+#: doc/guix.texi:7545
 msgid "This mechanism is not limited to package and derivation objects: @dfn{compilers} able to ``lower'' other high-level objects to derivations or files in the store can be defined, such that these objects can also be inserted into gexps.  For example, a useful type of high-level objects that can be inserted in a gexp is ``file-like objects'', which make it easy to add files to the store and to refer to them in derivations and such (see @code{local-file} and @code{plain-file} below.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7472
+#: doc/guix.texi:7547
 msgid "To illustrate the idea, here is an example of a gexp:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7480
+#: doc/guix.texi:7555
 #, no-wrap
 msgid ""
 "(define build-exp\n"
@@ -14208,34 +14515,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7485
+#: doc/guix.texi:7560
 msgid "This gexp can be passed to @code{gexp->derivation}; we obtain a derivation that builds a directory containing exactly one symlink to @file{/gnu/store/@dots{}-coreutils-8.22/bin/ls}:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7488
+#: doc/guix.texi:7563
 #, no-wrap
 msgid "(gexp->derivation \"the-thing\" build-exp)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7496
+#: doc/guix.texi:7571
 msgid "As one would expect, the @code{\"/gnu/store/@dots{}-coreutils-8.22\"} string is substituted to the reference to the @var{coreutils} package in the actual build code, and @var{coreutils} is automatically made an input to the derivation.  Likewise, @code{#$output} (equivalent to @code{(ungexp output)}) is replaced by a string containing the directory name of the output of the derivation."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7497
+#: doc/guix.texi:7572
 #, no-wrap
 msgid "cross compilation"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7503
+#: doc/guix.texi:7578
 msgid "In a cross-compilation context, it is useful to distinguish between references to the @emph{native} build of a package---that can run on the host---versus references to cross builds of a package.  To that end, the @code{#+} plays the same role as @code{#$}, but is a reference to a native package build:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7514
+#: doc/guix.texi:7589
 #, no-wrap
 msgid ""
 "(gexp->derivation \"vi\"\n"
@@ -14250,29 +14557,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7520
+#: doc/guix.texi:7595
 msgid "In the example above, the native build of @var{coreutils} is used, so that @command{ln} can actually run on the host; but then the cross-compiled build of @var{emacs} is referenced."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7521
+#: doc/guix.texi:7596
 #, no-wrap
 msgid "imported modules, for gexps"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:7522
+#: doc/guix.texi:7597
 #, no-wrap
 msgid "with-imported-modules"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7527
+#: doc/guix.texi:7602
 msgid "Another gexp feature is @dfn{imported modules}: sometimes you want to be able to use certain Guile modules from the ``host environment'' in the gexp, so those modules should be imported in the ``build environment''.  The @code{with-imported-modules} form allows you to express that:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7538
+#: doc/guix.texi:7613
 #, no-wrap
 msgid ""
 "(let ((build (with-imported-modules '((guix build utils))\n"
@@ -14287,29 +14594,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7544
+#: doc/guix.texi:7619
 msgid "In this example, the @code{(guix build utils)} module is automatically pulled into the isolated build environment of our gexp, such that @code{(use-modules (guix build utils))} works as expected."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7545
+#: doc/guix.texi:7620
 #, no-wrap
 msgid "module closure"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:7546
+#: doc/guix.texi:7621
 #, no-wrap
 msgid "source-module-closure"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7553
+#: doc/guix.texi:7628
 msgid "Usually you want the @emph{closure} of the module to be imported---i.e., the module itself and all the modules it depends on---rather than just the module; failing to do that, attempts to use the module will fail because of missing dependent modules.  The @code{source-module-closure} procedure computes the closure of a module by looking at its source file headers, which comes in handy in this case:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7556
+#: doc/guix.texi:7631
 #, no-wrap
 msgid ""
 "(use-modules (guix modules))   ;for 'source-module-closure'\n"
@@ -14317,7 +14624,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7565
+#: doc/guix.texi:7640
 #, no-wrap
 msgid ""
 "(with-imported-modules (source-module-closure\n"
@@ -14331,24 +14638,24 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7567
+#: doc/guix.texi:7642
 #, no-wrap
 msgid "extensions, for gexps"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:7568
+#: doc/guix.texi:7643
 #, no-wrap
 msgid "with-extensions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7573
+#: doc/guix.texi:7648
 msgid "In the same vein, sometimes you want to import not just pure-Scheme modules, but also ``extensions'' such as Guile bindings to C libraries or other ``full-blown'' packages.  Say you need the @code{guile-json} package available on the build side, here's how you would do it:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7576
+#: doc/guix.texi:7651
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages guile))  ;for 'guile-json'\n"
@@ -14356,7 +14663,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7582
+#: doc/guix.texi:7657
 #, no-wrap
 msgid ""
 "(with-extensions (list guile-json)\n"
@@ -14367,184 +14674,184 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7585
+#: doc/guix.texi:7660
 msgid "The syntactic form to construct gexps is summarized below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7586
+#: doc/guix.texi:7661
 #, no-wrap
 msgid "{Scheme Syntax} #~@var{exp}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:7587
+#: doc/guix.texi:7662
 #, no-wrap
 msgid "{Scheme Syntax} (gexp @var{exp})"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7590
+#: doc/guix.texi:7665
 msgid "Return a G-expression containing @var{exp}.  @var{exp} may contain one or more of the following forms:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7592
+#: doc/guix.texi:7667
 #, no-wrap
 msgid "#$@var{obj}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7593
+#: doc/guix.texi:7668
 #, no-wrap
 msgid "(ungexp @var{obj})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7598
+#: doc/guix.texi:7673
 msgid "Introduce a reference to @var{obj}.  @var{obj} may have one of the supported types, for example a package or a derivation, in which case the @code{ungexp} form is replaced by its output file name---e.g., @code{\"/gnu/store/@dots{}-coreutils-8.22}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7601
+#: doc/guix.texi:7676
 msgid "If @var{obj} is a list, it is traversed and references to supported objects are substituted similarly."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7604
+#: doc/guix.texi:7679
 msgid "If @var{obj} is another gexp, its contents are inserted and its dependencies are added to those of the containing gexp."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7606
+#: doc/guix.texi:7681
 msgid "If @var{obj} is another kind of object, it is inserted as is."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7607
+#: doc/guix.texi:7682
 #, no-wrap
 msgid "#$@var{obj}:@var{output}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7608
+#: doc/guix.texi:7683
 #, no-wrap
 msgid "(ungexp @var{obj} @var{output})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7612
+#: doc/guix.texi:7687
 msgid "This is like the form above, but referring explicitly to the @var{output} of @var{obj}---this is useful when @var{obj} produces multiple outputs (@pxref{Packages with Multiple Outputs})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7613
+#: doc/guix.texi:7688
 #, no-wrap
 msgid "#+@var{obj}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7614
+#: doc/guix.texi:7689
 #, no-wrap
 msgid "#+@var{obj}:output"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7615
+#: doc/guix.texi:7690
 #, no-wrap
 msgid "(ungexp-native @var{obj})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7616
+#: doc/guix.texi:7691
 #, no-wrap
 msgid "(ungexp-native @var{obj} @var{output})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7619
+#: doc/guix.texi:7694
 msgid "Same as @code{ungexp}, but produces a reference to the @emph{native} build of @var{obj} when used in a cross compilation context."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7620
+#: doc/guix.texi:7695
 #, no-wrap
 msgid "#$output[:@var{output}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7621
+#: doc/guix.texi:7696
 #, no-wrap
 msgid "(ungexp output [@var{output}])"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7624
+#: doc/guix.texi:7699
 msgid "Insert a reference to derivation output @var{output}, or to the main output when @var{output} is omitted."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7626
+#: doc/guix.texi:7701
 msgid "This only makes sense for gexps passed to @code{gexp->derivation}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7627
+#: doc/guix.texi:7702
 #, no-wrap
 msgid "#$@@@var{lst}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7628
+#: doc/guix.texi:7703
 #, no-wrap
 msgid "(ungexp-splicing @var{lst})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7631
+#: doc/guix.texi:7706
 msgid "Like the above, but splices the contents of @var{lst} inside the containing list."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7632
+#: doc/guix.texi:7707
 #, no-wrap
 msgid "#+@@@var{lst}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7633
+#: doc/guix.texi:7708
 #, no-wrap
 msgid "(ungexp-native-splicing @var{lst})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7636
+#: doc/guix.texi:7711
 msgid "Like the above, but refers to native builds of the objects listed in @var{lst}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7641
+#: doc/guix.texi:7716
 msgid "G-expressions created by @code{gexp} or @code{#~} are run-time objects of the @code{gexp?} type (see below.)"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7643
+#: doc/guix.texi:7718
 #, no-wrap
 msgid "{Scheme Syntax} with-imported-modules @var{modules} @var{body}@dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7646
+#: doc/guix.texi:7721
 msgid "Mark the gexps defined in @var{body}@dots{} as requiring @var{modules} in their execution environment."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7650
+#: doc/guix.texi:7725
 msgid "Each item in @var{modules} can be the name of a module, such as @code{(guix build utils)}, or it can be a module name, followed by an arrow, followed by a file-like object:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7656
+#: doc/guix.texi:7731
 #, no-wrap
 msgid ""
 "`((guix build utils)\n"
@@ -14554,80 +14861,80 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7661
+#: doc/guix.texi:7736
 msgid "In the example above, the first two modules are taken from the search path, and the last one is created from the given file-like object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7665
+#: doc/guix.texi:7740
 msgid "This form has @emph{lexical} scope: it has an effect on the gexps directly defined in @var{body}@dots{}, but not on those defined, say, in procedures called from @var{body}@dots{}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7667
+#: doc/guix.texi:7742
 #, no-wrap
 msgid "{Scheme Syntax} with-extensions @var{extensions} @var{body}@dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7672
+#: doc/guix.texi:7747
 msgid "Mark the gexps defined in @var{body}@dots{} as requiring @var{extensions} in their build and execution environment.  @var{extensions} is typically a list of package objects such as those defined in the @code{(gnu packages guile)} module."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7677
+#: doc/guix.texi:7752
 msgid "Concretely, the packages listed in @var{extensions} are added to the load path while compiling imported modules in @var{body}@dots{}; they are also added to the load path of the gexp returned by @var{body}@dots{}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7679
+#: doc/guix.texi:7754
 #, no-wrap
 msgid "{Scheme Procedure} gexp? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7681
+#: doc/guix.texi:7756
 msgid "Return @code{#t} if @var{obj} is a G-expression."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7687
+#: doc/guix.texi:7762
 msgid "G-expressions are meant to be written to disk, either as code building some derivation, or as plain files in the store.  The monadic procedures below allow you to do that (@pxref{The Store Monad}, for more information about monads.)"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7688
+#: doc/guix.texi:7763
 #, no-wrap
 msgid "{Monadic Procedure} gexp->derivation @var{name} @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7706
+#: doc/guix.texi:7781
 msgid "[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:module-path @var{%load-path}] @ [#:effective-version \"2.2\"] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:leaked-env-vars #f] @ [#:script-name (string-append @var{name} \"-builder\")] @ [#:deprecation-warnings #f] @ [#:local-build? #f] [#:substitutable? #t] @ [#:properties '()] [#:guile-for-build #f] Return a derivation @var{name} that runs @var{exp} (a gexp) with @var{guile-for-build} (a derivation) on @var{system}; @var{exp} is stored in a file called @var{script-name}.  When @var{target} is true, it is used as the cross-compilation target triplet for packages referred to by @var{exp}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7714
+#: doc/guix.texi:7789
 msgid "@var{modules} is deprecated in favor of @code{with-imported-modules}.  Its meaning is to make @var{modules} available in the evaluation context of @var{exp}; @var{modules} is a list of names of Guile modules searched in @var{module-path} to be copied in the store, compiled, and made available in the load path during the execution of @var{exp}---e.g., @code{((guix build utils) (guix build gnu-build-system))}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7717
+#: doc/guix.texi:7792
 msgid "@var{effective-version} determines the string to use when adding extensions of @var{exp} (see @code{with-extensions}) to the search path---e.g., @code{\"2.2\"}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7720
+#: doc/guix.texi:7795
 msgid "@var{graft?} determines whether packages referred to by @var{exp} should be grafted when applicable."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7723
+#: doc/guix.texi:7798
 msgid "When @var{references-graphs} is true, it must be a list of tuples of one of the following forms:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7730
+#: doc/guix.texi:7805
 #, no-wrap
 msgid ""
 "(@var{file-name} @var{package})\n"
@@ -14638,38 +14945,38 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7736
+#: doc/guix.texi:7811
 msgid "The right-hand-side of each element of @var{references-graphs} is automatically made an input of the build process of @var{exp}.  In the build environment, each @var{file-name} contains the reference graph of the corresponding item, in a simple text format."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7742
+#: doc/guix.texi:7817
 msgid "@var{allowed-references} must be either @code{#f} or a list of output names and packages.  In the latter case, the list denotes store items that the result is allowed to refer to.  Any reference to another store item will lead to a build error.  Similarly for @var{disallowed-references}, which can list items that must not be referenced by the outputs."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7745
+#: doc/guix.texi:7820
 msgid "@var{deprecation-warnings} determines whether to show deprecation warnings while compiling modules.  It can be @code{#f}, @code{#t}, or @code{'detailed}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7747
+#: doc/guix.texi:7822
 msgid "The other arguments are as for @code{derivation} (@pxref{Derivations})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7749
+#: doc/guix.texi:7824
 #, no-wrap
 msgid "file-like objects"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7754
+#: doc/guix.texi:7829
 msgid "The @code{local-file}, @code{plain-file}, @code{computed-file}, @code{program-file}, and @code{scheme-file} procedures below return @dfn{file-like objects}.  That is, when unquoted in a G-expression, these objects lead to a file in the store.  Consider this G-expression:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7758
+#: doc/guix.texi:7833
 #, no-wrap
 msgid ""
 "#~(system* #$(file-append glibc \"/sbin/nscd\") \"-f\"\n"
@@ -14677,76 +14984,76 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7767
+#: doc/guix.texi:7842
 msgid "The effect here is to ``intern'' @file{/tmp/my-nscd.conf} by copying it to the store.  Once expanded, for instance @i{via} @code{gexp->derivation}, the G-expression refers to that copy under @file{/gnu/store}; thus, modifying or removing the file in @file{/tmp} does not have any effect on what the G-expression does.  @code{plain-file} can be used similarly; it differs in that the file content is directly passed as a string."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7768
+#: doc/guix.texi:7843
 #, no-wrap
 msgid "{Scheme Procedure} local-file @var{file} [@var{name}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7777
+#: doc/guix.texi:7852
 msgid "[#:recursive? #f] [#:select? (const #t)] Return an object representing local file @var{file} to add to the store; this object can be used in a gexp.  If @var{file} is a literal string denoting a relative file name, it is looked up relative to the source file where it appears; if @var{file} is not a literal string, it is looked up relative to the current working directory at run time.  @var{file} will be added to the store under @var{name}--by default the base name of @var{file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7789
+#: doc/guix.texi:7864
 msgid "This is the declarative counterpart of the @code{interned-file} monadic procedure (@pxref{The Store Monad, @code{interned-file}})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7791
+#: doc/guix.texi:7866
 #, no-wrap
 msgid "{Scheme Procedure} plain-file @var{name} @var{content}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7794
+#: doc/guix.texi:7869
 msgid "Return an object representing a text file called @var{name} with the given @var{content} (a string or a bytevector) to be added to the store."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7796
+#: doc/guix.texi:7871
 msgid "This is the declarative counterpart of @code{text-file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7798
+#: doc/guix.texi:7873
 #, no-wrap
 msgid "{Scheme Procedure} computed-file @var{name} @var{gexp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7803
+#: doc/guix.texi:7878
 msgid "[#:options '(#:local-build? #t)] Return an object representing the store item @var{name}, a file or directory computed by @var{gexp}.  @var{options} is a list of additional arguments to pass to @code{gexp->derivation}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7805
+#: doc/guix.texi:7880
 msgid "This is the declarative counterpart of @code{gexp->derivation}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7807
+#: doc/guix.texi:7882
 #, no-wrap
 msgid "{Monadic Procedure} gexp->script @var{name} @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7813
+#: doc/guix.texi:7888
 msgid "[#:guile (default-guile)] [#:module-path %load-path] @ [#:system (%current-system)] [#:target #f] Return an executable script @var{name} that runs @var{exp} using @var{guile}, with @var{exp}'s imported modules in its search path.  Look up @var{exp}'s modules in @var{module-path}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7816
+#: doc/guix.texi:7891
 msgid "The example below builds a script that simply invokes the @command{ls} command:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7819
+#: doc/guix.texi:7894
 #, no-wrap
 msgid ""
 "(use-modules (guix gexp) (gnu packages base))\n"
@@ -14754,7 +15061,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7823
+#: doc/guix.texi:7898
 #, no-wrap
 msgid ""
 "(gexp->script \"list-files\"\n"
@@ -14763,12 +15070,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7828
+#: doc/guix.texi:7903
 msgid "When ``running'' it through the store (@pxref{The Store Monad, @code{run-with-store}}), we obtain a derivation that produces an executable file @file{/gnu/store/@dots{}-list-files} along these lines:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7833
+#: doc/guix.texi:7908
 #, no-wrap
 msgid ""
 "#!/gnu/store/@dots{}-guile-2.0.11/bin/guile -ds\n"
@@ -14777,76 +15084,76 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7836
+#: doc/guix.texi:7911
 #, no-wrap
 msgid "{Scheme Procedure} program-file @var{name} @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7841
+#: doc/guix.texi:7916
 msgid "[#:guile #f] [#:module-path %load-path] Return an object representing the executable store item @var{name} that runs @var{gexp}.  @var{guile} is the Guile package used to execute that script.  Imported modules of @var{gexp} are looked up in @var{module-path}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7843
+#: doc/guix.texi:7918
 msgid "This is the declarative counterpart of @code{gexp->script}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7845
+#: doc/guix.texi:7920
 #, no-wrap
 msgid "{Monadic Procedure} gexp->file @var{name} @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7852
+#: doc/guix.texi:7927
 msgid "[#:set-load-path? #t] [#:module-path %load-path] @ [#:splice? #f] @ [#:guile (default-guile)] Return a derivation that builds a file @var{name} containing @var{exp}.  When @var{splice?} is true, @var{exp} is considered to be a list of expressions that will be spliced in the resulting file."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7857
+#: doc/guix.texi:7932
 msgid "When @var{set-load-path?} is true, emit code in the resulting file to set @code{%load-path} and @code{%load-compiled-path} to honor @var{exp}'s imported modules.  Look up @var{exp}'s modules in @var{module-path}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7860
+#: doc/guix.texi:7935
 msgid "The resulting file holds references to all the dependencies of @var{exp} or a subset thereof."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7862
+#: doc/guix.texi:7937
 #, no-wrap
 msgid "{Scheme Procedure} scheme-file @var{name} @var{exp} [#:splice? #f]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7865
+#: doc/guix.texi:7940
 msgid "Return an object representing the Scheme file @var{name} that contains @var{exp}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7867
+#: doc/guix.texi:7942
 msgid "This is the declarative counterpart of @code{gexp->file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7869
+#: doc/guix.texi:7944
 #, no-wrap
 msgid "{Monadic Procedure} text-file* @var{name} @var{text} @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7875
+#: doc/guix.texi:7950
 msgid "Return as a monadic value a derivation that builds a text file containing all of @var{text}.  @var{text} may list, in addition to strings, objects of any type that can be used in a gexp: packages, derivations, local file objects, etc.  The resulting store file holds references to all these."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7880
+#: doc/guix.texi:7955
 msgid "This variant should be preferred over @code{text-file} anytime the file to create will reference items from the store.  This is typically the case when building a configuration file that embeds store file names, like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7888
+#: doc/guix.texi:7963
 #, no-wrap
 msgid ""
 "(define (profile.sh)\n"
@@ -14858,23 +15165,23 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7893
+#: doc/guix.texi:7968
 msgid "In this example, the resulting @file{/gnu/store/@dots{}-profile.sh} file will reference @var{coreutils}, @var{grep}, and @var{sed}, thereby preventing them from being garbage-collected during its lifetime."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7895
+#: doc/guix.texi:7970
 #, no-wrap
 msgid "{Scheme Procedure} mixed-text-file @var{name} @var{text} @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7899
+#: doc/guix.texi:7974
 msgid "Return an object representing store file @var{name} containing @var{text}.  @var{text} is a sequence of strings and file-like objects, as in:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7903
+#: doc/guix.texi:7978
 #, no-wrap
 msgid ""
 "(mixed-text-file \"profile\"\n"
@@ -14882,23 +15189,23 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7906
+#: doc/guix.texi:7981
 msgid "This is the declarative counterpart of @code{text-file*}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7908
+#: doc/guix.texi:7983
 #, no-wrap
 msgid "{Scheme Procedure} file-union @var{name} @var{files}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7913
+#: doc/guix.texi:7988
 msgid "Return a @code{} that builds a directory containing all of @var{files}.  Each item in @var{files} must be a two-element list where the first element is the file name to use in the new directory, and the second element is a gexp denoting the target file.  Here's an example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7920
+#: doc/guix.texi:7995
 #, no-wrap
 msgid ""
 "(file-union \"etc\"\n"
@@ -14909,50 +15216,50 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7923
+#: doc/guix.texi:7998
 msgid "This yields an @code{etc} directory containing these two files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7925
+#: doc/guix.texi:8000
 #, no-wrap
 msgid "{Scheme Procedure} directory-union @var{name} @var{things}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7928
+#: doc/guix.texi:8003
 msgid "Return a directory that is the union of @var{things}, where @var{things} is a list of file-like objects denoting directories.  For example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7931
+#: doc/guix.texi:8006
 #, no-wrap
 msgid "(directory-union \"guile+emacs\" (list guile emacs))\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7934
+#: doc/guix.texi:8009
 msgid "yields a directory that is the union of the @code{guile} and @code{emacs} packages."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7936
+#: doc/guix.texi:8011
 #, no-wrap
 msgid "{Scheme Procedure} file-append @var{obj} @var{suffix} @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7940
+#: doc/guix.texi:8015
 msgid "Return a file-like object that expands to the concatenation of @var{obj} and @var{suffix}, where @var{obj} is a lowerable object and each @var{suffix} is a string."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7942
+#: doc/guix.texi:8017
 msgid "As an example, consider this gexp:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7947
+#: doc/guix.texi:8022
 #, no-wrap
 msgid ""
 "(gexp->script \"run-uname\"\n"
@@ -14961,12 +15268,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7950
+#: doc/guix.texi:8025
 msgid "The same effect could be achieved with:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:7955
+#: doc/guix.texi:8030
 #, no-wrap
 msgid ""
 "(gexp->script \"run-uname\"\n"
@@ -14975,50 +15282,79 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7961
+#: doc/guix.texi:8036
 msgid "There is one difference though: in the @code{file-append} case, the resulting script contains the absolute file name as a string, whereas in the second case, the resulting script contains a @code{(string-append @dots{})} expression to construct the file name @emph{at run time}."
 msgstr ""
 
+#. type: deffn
+#: doc/guix.texi:8038
+#, no-wrap
+msgid "{Scheme Syntax} with-parameters ((@var{parameter} @var{value}) @dots{}) @var{exp}"
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:8044
+msgid "This macro is similar to the @code{parameterize} form for dynamically-bound @dfn{parameters} (@pxref{Parameters,,, guile, GNU Guile Reference Manual}).  The key difference is that it takes effect when the file-like object returned by @var{exp} is lowered to a derivation or store item."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:8047
+msgid "A typical use of @code{with-parameters} is to force the system in effect for a given object:"
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:8051
+#, no-wrap
+msgid ""
+"(with-parameters ((%current-system \"i686-linux\"))\n"
+"  coreutils)\n"
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:8055
+msgid "The example above returns an object that corresponds to the i686 build of Coreutils, regardless of the current value of @code{%current-system}."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:7968
+#: doc/guix.texi:8062
 msgid "Of course, in addition to gexps embedded in ``host'' code, there are also modules containing build tools.  To make it clear that they are meant to be used in the build stratum, these modules are kept in the @code{(guix build @dots{})} name space."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7974
+#: doc/guix.texi:8068
 msgid "Internally, high-level objects are @dfn{lowered}, using their compiler, to either derivations or store items.  For instance, lowering a package yields a derivation, and lowering a @code{plain-file} yields a store item.  This is achieved using the @code{lower-object} monadic procedure."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7975
+#: doc/guix.texi:8069
 #, no-wrap
 msgid "{Monadic Procedure} lower-object @var{obj} [@var{system}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7981
+#: doc/guix.texi:8075
 msgid "[#:target #f] Return as a value in @var{%store-monad} the derivation or store item corresponding to @var{obj} for @var{system}, cross-compiling for @var{target} if @var{target} is true.  @var{obj} must be an object that has an associated gexp compiler, such as a @code{}."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:7984
+#: doc/guix.texi:8078
 #, no-wrap
 msgid "Invoking @command{guix repl}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7986
+#: doc/guix.texi:8080
 #, no-wrap
 msgid "REPL, read-eval-print loop"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7992
+#: doc/guix.texi:8086
 msgid "The @command{guix repl} command spawns a Guile @dfn{read-eval-print loop} (REPL) for interactive programming (@pxref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}).  Compared to just launching the @command{guile} command, @command{guix repl} guarantees that all the Guix modules and all its dependencies are available in the search path.  You can use it this way:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7998
+#: doc/guix.texi:8092
 #, no-wrap
 msgid ""
 "$ guix repl\n"
@@ -15028,163 +15364,163 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8005
+#: doc/guix.texi:8099
 msgid "In addition, @command{guix repl} implements a simple machine-readable REPL protocol for use by @code{(guix inferior)}, a facility to interact with @dfn{inferiors}, separate processes running a potentially different revision of Guix."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8007
+#: doc/guix.texi:8101
 msgid "The available options are as follows:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8009 doc/guix.texi:10073
+#: doc/guix.texi:8103 doc/guix.texi:10172
 #, no-wrap
 msgid "--type=@var{type}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8010 doc/guix.texi:10074 doc/guix.texi:26636
+#: doc/guix.texi:8104 doc/guix.texi:10173 doc/guix.texi:26899
 #, no-wrap
 msgid "-t @var{type}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8012
+#: doc/guix.texi:8106
 msgid "Start a REPL of the given @var{TYPE}, which can be one of the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8014
+#: doc/guix.texi:8108
 #, no-wrap
 msgid "guile"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8016
+#: doc/guix.texi:8110
 msgid "This is default, and it spawns a standard full-featured Guile REPL."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8016
+#: doc/guix.texi:8110
 #, no-wrap
 msgid "machine"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8019
+#: doc/guix.texi:8113
 msgid "Spawn a REPL that uses the machine-readable protocol.  This is the protocol that the @code{(guix inferior)} module speaks."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8025
+#: doc/guix.texi:8119
 msgid "By default, @command{guix repl} reads from standard input and writes to standard output.  When this option is passed, it will instead listen for connections on @var{endpoint}.  Here are examples of valid options:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8027
+#: doc/guix.texi:8121
 #, no-wrap
 msgid "--listen=tcp:37146"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8029
+#: doc/guix.texi:8123
 msgid "Accept connections on localhost on port 37146."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8030
+#: doc/guix.texi:8124
 #, no-wrap
 msgid "--listen=unix:/tmp/socket"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8032
+#: doc/guix.texi:8126
 msgid "Accept connections on the Unix-domain socket @file{/tmp/socket}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8034 doc/guix.texi:8138 doc/guix.texi:9606 doc/guix.texi:9766
-#: doc/guix.texi:9898 doc/guix.texi:10107
+#: doc/guix.texi:8128 doc/guix.texi:8232 doc/guix.texi:9705 doc/guix.texi:9865
+#: doc/guix.texi:9997 doc/guix.texi:10206
 #, no-wrap
 msgid "--load-path=@var{directory}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8035 doc/guix.texi:8139 doc/guix.texi:9767 doc/guix.texi:9899
-#: doc/guix.texi:10108
+#: doc/guix.texi:8129 doc/guix.texi:8233 doc/guix.texi:9866 doc/guix.texi:9998
+#: doc/guix.texi:10207
 #, no-wrap
 msgid "-L @var{directory}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8038 doc/guix.texi:8142 doc/guix.texi:9609 doc/guix.texi:9770
-#: doc/guix.texi:9902 doc/guix.texi:10111
+#: doc/guix.texi:8132 doc/guix.texi:8236 doc/guix.texi:9708 doc/guix.texi:9869
+#: doc/guix.texi:10001 doc/guix.texi:10210
 msgid "Add @var{directory} to the front of the package module search path (@pxref{Package Modules})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8041
+#: doc/guix.texi:8135
 msgid "This allows users to define their own packages and make them visible to the command-line tool."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8042 doc/guix.texi:8442
+#: doc/guix.texi:8136 doc/guix.texi:8536
 #, no-wrap
 msgid "-q"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8045
+#: doc/guix.texi:8139
 msgid "Inhibit loading of the @file{~/.guile} file.  By default, that configuration file is loaded when spawning a @code{guile} REPL."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8055
+#: doc/guix.texi:8149
 msgid "This section describes Guix command-line utilities.  Some of them are primarily targeted at developers and users who write new package definitions, while others are more generally useful.  They complement the Scheme programming interface of Guix in a convenient way."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8077
+#: doc/guix.texi:8171
 #, no-wrap
 msgid "package building"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:8078
+#: doc/guix.texi:8172
 #, no-wrap
 msgid "guix build"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8084
+#: doc/guix.texi:8178
 msgid "The @command{guix build} command builds packages or derivations and their dependencies, and prints the resulting store paths.  Note that it does not modify the user's profile---this is the job of the @command{guix package} command (@pxref{Invoking guix package}).  Thus, it is mainly useful for distribution developers."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8089
+#: doc/guix.texi:8183
 #, no-wrap
 msgid "guix build @var{options} @var{package-or-derivation}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8094
+#: doc/guix.texi:8188
 msgid "As an example, the following command builds the latest versions of Emacs and of Guile, displays their build logs, and finally displays the resulting directories:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8097
+#: doc/guix.texi:8191
 #, no-wrap
 msgid "guix build emacs guile\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8100
+#: doc/guix.texi:8194
 msgid "Similarly, the following command builds all the available packages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8104
+#: doc/guix.texi:8198
 #, no-wrap
 msgid ""
 "guix build --quiet --keep-going \\\n"
@@ -15192,313 +15528,313 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8112
+#: doc/guix.texi:8206
 msgid "@var{package-or-derivation} may be either the name of a package found in the software distribution such as @code{coreutils} or @code{coreutils@@8.20}, or a derivation such as @file{/gnu/store/@dots{}-coreutils-8.19.drv}.  In the former case, a package with the corresponding name (and optionally version) is searched for among the GNU distribution modules (@pxref{Package Modules})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8117
+#: doc/guix.texi:8211
 msgid "Alternatively, the @code{--expression} option may be used to specify a Scheme expression that evaluates to a package; this is useful when disambiguating among several same-named packages or package variants is needed."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8120
+#: doc/guix.texi:8214
 msgid "There may be zero or more @var{options}.  The available options are described in the subsections below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8135
+#: doc/guix.texi:8229
 msgid "A number of options that control the build process are common to @command{guix build} and other commands that can spawn builds, such as @command{guix package} or @command{guix archive}.  These are the following:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8145 doc/guix.texi:9612 doc/guix.texi:9773 doc/guix.texi:9905
-#: doc/guix.texi:10114
+#: doc/guix.texi:8239 doc/guix.texi:9711 doc/guix.texi:9872
+#: doc/guix.texi:10004 doc/guix.texi:10213
 msgid "This allows users to define their own packages and make them visible to the command-line tools."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8146
+#: doc/guix.texi:8240
 #, no-wrap
 msgid "--keep-failed"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8147
+#: doc/guix.texi:8241
 #, no-wrap
 msgid "-K"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8153
+#: doc/guix.texi:8247
 msgid "Keep the build tree of failed builds.  Thus, if a build fails, its build tree is kept under @file{/tmp}, in a directory whose name is shown at the end of the build log.  This is useful when debugging build issues.  @xref{Debugging Build Failures}, for tips and tricks on how to debug build issues."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8157
+#: doc/guix.texi:8251
 msgid "This option implies @option{--no-offload}, and it has no effect when connecting to a remote daemon with a @code{guix://} URI (@pxref{The Store, the @code{GUIX_DAEMON_SOCKET} variable})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8158
+#: doc/guix.texi:8252
 #, no-wrap
 msgid "--keep-going"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8159
+#: doc/guix.texi:8253
 #, no-wrap
 msgid "-k"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8162
+#: doc/guix.texi:8256
 msgid "Keep going when some of the derivations fail to build; return only once all the builds have either completed or failed."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8165
+#: doc/guix.texi:8259
 msgid "The default behavior is to stop as soon as one of the specified derivations has failed."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8169
+#: doc/guix.texi:8263
 msgid "Do not build the derivations."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:8171
+#: doc/guix.texi:8265
 msgid "fallback-option"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8171
+#: doc/guix.texi:8265
 #, no-wrap
 msgid "--fallback"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8174
+#: doc/guix.texi:8268
 msgid "When substituting a pre-built binary fails, fall back to building packages locally (@pxref{Substitution Failure})."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:8180
+#: doc/guix.texi:8274
 msgid "client-substitute-urls"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8180
+#: doc/guix.texi:8274
 msgid "Consider @var{urls} the whitespace-separated list of substitute source URLs, overriding the default list of URLs of @command{guix-daemon} (@pxref{daemon-substitute-urls,, @command{guix-daemon} URLs})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8184
+#: doc/guix.texi:8278
 msgid "This means that substitutes may be downloaded from @var{urls}, provided they are signed by a key authorized by the system administrator (@pxref{Substitutes})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8187
+#: doc/guix.texi:8281
 msgid "When @var{urls} is the empty string, substitutes are effectively disabled."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8193
+#: doc/guix.texi:8287
 #, no-wrap
 msgid "--no-grafts"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8197
+#: doc/guix.texi:8291
 msgid "Do not ``graft'' packages.  In practice, this means that package updates available as grafts are not applied.  @xref{Security Updates}, for more information on grafts."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8198
+#: doc/guix.texi:8292
 #, no-wrap
 msgid "--rounds=@var{n}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8201
+#: doc/guix.texi:8295
 msgid "Build each derivation @var{n} times in a row, and raise an error if consecutive build results are not bit-for-bit identical."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8206
+#: doc/guix.texi:8300
 msgid "This is a useful way to detect non-deterministic builds processes.  Non-deterministic build processes are a problem because they make it practically impossible for users to @emph{verify} whether third-party binaries are genuine.  @xref{Invoking guix challenge}, for more."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8212
+#: doc/guix.texi:8306
 msgid "Note that, currently, the differing build results are not kept around, so you will have to manually investigate in case of an error---e.g., by stashing one of the build results with @code{guix archive --export} (@pxref{Invoking guix archive}), then rebuilding, and finally comparing the two results."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8224
+#: doc/guix.texi:8318
 msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--max-silent-time}})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8231
+#: doc/guix.texi:8325
 msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--timeout}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8234
+#: doc/guix.texi:8328
 #, no-wrap
 msgid "verbosity, of the command-line tools"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8235
+#: doc/guix.texi:8329
 #, no-wrap
 msgid "build logs, verbosity"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8236
+#: doc/guix.texi:8330
 #, no-wrap
 msgid "-v @var{level}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8237
+#: doc/guix.texi:8331
 #, no-wrap
 msgid "--verbosity=@var{level}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8241
+#: doc/guix.texi:8335
 msgid "Use the given verbosity @var{level}, an integer.  Choosing 0 means that no output is produced, 1 is for quiet output, and 2 shows all the build log output on standard error."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8246
+#: doc/guix.texi:8340
 msgid "Allow the use of up to @var{n} CPU cores for the build.  The special value @code{0} means to use as many CPU cores as available."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8252
+#: doc/guix.texi:8346
 msgid "Allow at most @var{n} build jobs in parallel.  @xref{Invoking guix-daemon, @code{--max-jobs}}, for details about this option and the equivalent @command{guix-daemon} option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8253
+#: doc/guix.texi:8347
 #, no-wrap
 msgid "--debug=@var{level}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8257
+#: doc/guix.texi:8351
 msgid "Produce debugging output coming from the build daemon.  @var{level} must be an integer between 0 and 5; higher means more verbose output.  Setting a level of 4 or more may be helpful when debugging setup issues with the build daemon."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8264
+#: doc/guix.texi:8358
 msgid "Behind the scenes, @command{guix build} is essentially an interface to the @code{package-derivation} procedure of the @code{(guix packages)} module, and to the @code{build-derivations} procedure of the @code{(guix derivations)} module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8268
+#: doc/guix.texi:8362
 msgid "In addition to options explicitly passed on the command line, @command{guix build} and other @command{guix} commands that support building honor the @code{GUIX_BUILD_OPTIONS} environment variable."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:8269
+#: doc/guix.texi:8363
 #, no-wrap
 msgid "{Environment Variable} GUIX_BUILD_OPTIONS"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:8274
+#: doc/guix.texi:8368
 msgid "Users can define this variable to a list of command line options that will automatically be used by @command{guix build} and other @command{guix} commands that can perform builds, as in the example below:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8277
+#: doc/guix.texi:8371
 #, no-wrap
 msgid "$ export GUIX_BUILD_OPTIONS=\"--no-substitutes -c 2 -L /foo/bar\"\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:8281
+#: doc/guix.texi:8375
 msgid "These options are parsed independently, and the result is appended to the parsed command-line options."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8287
+#: doc/guix.texi:8381
 #, no-wrap
 msgid "package variants"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8295
+#: doc/guix.texi:8389
 msgid "Another set of command-line options supported by @command{guix build} and also @command{guix package} are @dfn{package transformation options}.  These are options that make it possible to define @dfn{package variants}---for instance, packages built from different source code.  This is a convenient way to create customized packages on the fly without having to type in the definitions of package variants (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8298
+#: doc/guix.texi:8392
 #, no-wrap
 msgid "--with-source=@var{source}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8299
+#: doc/guix.texi:8393
 #, no-wrap
 msgid "--with-source=@var{package}=@var{source}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8300
+#: doc/guix.texi:8394
 #, no-wrap
 msgid "--with-source=@var{package}@@@var{version}=@var{source}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8305
+#: doc/guix.texi:8399
 msgid "Use @var{source} as the source of @var{package}, and @var{version} as its version number.  @var{source} must be a file name or a URL, as for @command{guix download} (@pxref{Invoking guix download})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8311
+#: doc/guix.texi:8405
 msgid "When @var{package} is omitted, it is taken to be the package name specified on the command line that matches the base of @var{source}---e.g., if @var{source} is @code{/src/guile-2.0.10.tar.gz}, the corresponding package is @code{guile}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8314
+#: doc/guix.texi:8408
 msgid "Likewise, when @var{version} is omitted, the version string is inferred from @var{source}; in the previous example, it is @code{2.0.10}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8319
+#: doc/guix.texi:8413
 msgid "This option allows users to try out versions of packages other than the one provided by the distribution.  The example below downloads @file{ed-1.7.tar.gz} from a GNU mirror and uses that as the source for the @code{ed} package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8322
+#: doc/guix.texi:8416
 #, no-wrap
 msgid "guix build ed --with-source=mirror://gnu/ed/ed-1.7.tar.gz\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8326
+#: doc/guix.texi:8420
 msgid "As a developer, @code{--with-source} makes it easy to test release candidates:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8329
+#: doc/guix.texi:8423
 #, no-wrap
 msgid "guix build guile --with-source=../guile-2.0.9.219-e1bb7.tar.xz\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8332
+#: doc/guix.texi:8426
 msgid "@dots{} or to build from a checkout in a pristine environment:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8336
+#: doc/guix.texi:8430
 #, no-wrap
 msgid ""
 "$ git clone git://git.sv.gnu.org/guix.git\n"
@@ -15506,94 +15842,94 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8338
+#: doc/guix.texi:8432
 #, no-wrap
 msgid "--with-input=@var{package}=@var{replacement}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8343
+#: doc/guix.texi:8437
 msgid "Replace dependency on @var{package} by a dependency on @var{replacement}.  @var{package} must be a package name, and @var{replacement} must be a package specification such as @code{guile} or @code{guile@@1.8}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8347
+#: doc/guix.texi:8441
 msgid "For instance, the following command builds Guix, but replaces its dependency on the current stable version of Guile with a dependency on the legacy version of Guile, @code{guile@@2.0}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8350
+#: doc/guix.texi:8444
 #, no-wrap
 msgid "guix build --with-input=guile=guile@@2.0 guix\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8355
+#: doc/guix.texi:8449
 msgid "This is a recursive, deep replacement.  So in this example, both @code{guix} and its dependency @code{guile-json} (which also depends on @code{guile}) get rebuilt against @code{guile@@2.0}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8358
+#: doc/guix.texi:8452
 msgid "This is implemented using the @code{package-input-rewriting} Scheme procedure (@pxref{Defining Packages, @code{package-input-rewriting}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8359
+#: doc/guix.texi:8453
 #, no-wrap
 msgid "--with-graft=@var{package}=@var{replacement}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8365
+#: doc/guix.texi:8459
 msgid "This is similar to @code{--with-input} but with an important difference: instead of rebuilding the whole dependency chain, @var{replacement} is built and then @dfn{grafted} onto the binaries that were initially referring to @var{package}.  @xref{Security Updates}, for more information on grafts."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8369
+#: doc/guix.texi:8463
 msgid "For example, the command below grafts version 3.5.4 of GnuTLS onto Wget and all its dependencies, replacing references to the version of GnuTLS they currently refer to:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8372
+#: doc/guix.texi:8466
 #, no-wrap
 msgid "guix build --with-graft=gnutls=gnutls@@3.5.4 wget\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8381
+#: doc/guix.texi:8475
 msgid "This has the advantage of being much faster than rebuilding everything.  But there is a caveat: it works if and only if @var{package} and @var{replacement} are strictly compatible---for example, if they provide a library, the application binary interface (ABI) of those libraries must be compatible.  If @var{replacement} is somehow incompatible with @var{package}, then the resulting package may be unusable.  Use with care!"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8382
+#: doc/guix.texi:8476
 #, no-wrap
 msgid "--with-git-url=@var{package}=@var{url}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8383
+#: doc/guix.texi:8477
 #, no-wrap
 msgid "Git, using the latest commit"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8384
+#: doc/guix.texi:8478
 #, no-wrap
 msgid "latest commit, building"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8388
+#: doc/guix.texi:8482
 msgid "Build @var{package} from the latest commit of the @code{master} branch of the Git repository at @var{url}.  Git sub-modules of the repository are fetched, recursively."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8391
+#: doc/guix.texi:8485
 msgid "For example, the following command builds the NumPy Python library against the latest commit of the master branch of Python itself:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8395
+#: doc/guix.texi:8489
 #, no-wrap
 msgid ""
 "guix build python-numpy \\\n"
@@ -15601,178 +15937,197 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8399
+#: doc/guix.texi:8493
 msgid "This option can also be combined with @code{--with-branch} or @code{--with-commit} (see below)."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8400 doc/guix.texi:22248
+#: doc/guix.texi:8494 doc/guix.texi:22466
 #, no-wrap
 msgid "continuous integration"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8406
+#: doc/guix.texi:8500
 msgid "Obviously, since it uses the latest commit of the given branch, the result of such a command varies over time.  Nevertheless it is a convenient way to rebuild entire software stacks against the latest commit of one or more packages.  This is particularly useful in the context of continuous integration (CI)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8410
+#: doc/guix.texi:8504
 msgid "Checkouts are kept in a cache under @file{~/.cache/guix/checkouts} to speed up consecutive accesses to the same repository.  You may want to clean it up once in a while to save disk space."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8411
+#: doc/guix.texi:8505
 #, no-wrap
 msgid "--with-branch=@var{package}=@var{branch}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8417
+#: doc/guix.texi:8511
 msgid "Build @var{package} from the latest commit of @var{branch}.  If the @code{source} field of @var{package} is an origin with the @code{git-fetch} method (@pxref{origin Reference}) or a @code{git-checkout} object, the repository URL is taken from that @code{source}.  Otherwise you have to use @code{--with-git-url} to specify the URL of the Git repository."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8422
+#: doc/guix.texi:8516
 msgid "For instance, the following command builds @code{guile-sqlite3} from the latest commit of its @code{master} branch, and then builds @code{guix} (which depends on it) and @code{cuirass} (which depends on @code{guix}) against this specific @code{guile-sqlite3} build:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8425
+#: doc/guix.texi:8519
 #, no-wrap
 msgid "guix build --with-branch=guile-sqlite3=master cuirass\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8427
+#: doc/guix.texi:8521
 #, no-wrap
 msgid "--with-commit=@var{package}=@var{commit}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8431
+#: doc/guix.texi:8525
 msgid "This is similar to @code{--with-branch}, except that it builds from @var{commit} rather than the tip of a branch.  @var{commit} must be a valid Git commit SHA1 identifier or a tag."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8438
+#: doc/guix.texi:8532
 msgid "The command-line options presented below are specific to @command{guix build}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8441
+#: doc/guix.texi:8535
 #, no-wrap
 msgid "--quiet"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8446
+#: doc/guix.texi:8540
 msgid "Build quietly, without displaying the build log; this is equivalent to @code{--verbosity=0}.  Upon completion, the build log is kept in @file{/var} (or similar) and can always be retrieved using the @option{--log-file} option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8447
+#: doc/guix.texi:8541
 #, no-wrap
 msgid "--file=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8451
+#: doc/guix.texi:8545
 msgid "Build the package, derivation, or other file-like object that the code within @var{file} evaluates to (@pxref{G-Expressions, file-like objects})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8454
+#: doc/guix.texi:8548
 msgid "As an example, @var{file} might contain a package definition like this (@pxref{Defining Packages}):"
 msgstr ""
 
+#. type: item
+#: doc/guix.texi:8553
+#, fuzzy, no-wrap
+#| msgid "--manifest=@var{file}"
+msgid "--manifest=@var{manifest}"
+msgstr "--manifest=@var{file}"
+
+#. type: itemx
+#: doc/guix.texi:8554
+#, fuzzy, no-wrap
+#| msgid "-m @var{file}"
+msgid "-m @var{manifest}"
+msgstr "-m @var{file}"
+
+#. type: table
+#: doc/guix.texi:8557
+msgid "Build all packages listed in the given @var{manifest} (@pxref{profile-manifest, @option{--manifest}})."
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:8462
+#: doc/guix.texi:8561
 msgid "Build the package or derivation @var{expr} evaluates to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8466
+#: doc/guix.texi:8565
 msgid "For example, @var{expr} may be @code{(@@ (gnu packages guile)  guile-1.8)}, which unambiguously designates this specific variant of version 1.8 of Guile."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8470
+#: doc/guix.texi:8569
 msgid "Alternatively, @var{expr} may be a G-expression, in which case it is used as a build program passed to @code{gexp->derivation} (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8474
+#: doc/guix.texi:8573
 msgid "Lastly, @var{expr} may refer to a zero-argument monadic procedure (@pxref{The Store Monad}).  The procedure must return a derivation as a monadic value, which is then passed through @code{run-with-store}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8475
+#: doc/guix.texi:8574
 #, no-wrap
 msgid "--source"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8476
+#: doc/guix.texi:8575
 #, no-wrap
 msgid "-S"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8479
+#: doc/guix.texi:8578
 msgid "Build the source derivations of the packages, rather than the packages themselves."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8483
+#: doc/guix.texi:8582
 msgid "For instance, @code{guix build -S gcc} returns something like @file{/gnu/store/@dots{}-gcc-4.7.2.tar.bz2}, which is the GCC source tarball."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8487
+#: doc/guix.texi:8586
 msgid "The returned source tarball is the result of applying any patches and code snippets specified in the package @code{origin} (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8492
+#: doc/guix.texi:8591
 msgid "Note that @command{guix build -S} compiles the sources only of the specified packages.  They do not include the sources of statically linked dependencies and by themselves are insufficient for reproducing the packages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8493
+#: doc/guix.texi:8592
 #, no-wrap
 msgid "--sources"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8500
+#: doc/guix.texi:8599
 msgid "Fetch and return the source of @var{package-or-derivation} and all their dependencies, recursively.  This is a handy way to obtain a local copy of all the source code needed to build @var{packages}, allowing you to eventually build them even without network access.  It is an extension of the @code{--source} option and can accept one of the following optional argument values:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8502 doc/guix.texi:9951
+#: doc/guix.texi:8601 doc/guix.texi:10050
 #, no-wrap
 msgid "package"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8505
+#: doc/guix.texi:8604
 msgid "This value causes the @code{--sources} option to behave in the same way as the @code{--source} option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8506 doc/guix.texi:14777
+#: doc/guix.texi:8605 doc/guix.texi:14934
 #, no-wrap
 msgid "all"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8509
+#: doc/guix.texi:8608
 msgid "Build the source derivations of all packages, including any source that might be listed as @code{inputs}.  This is the default value."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8515
+#: doc/guix.texi:8614
 #, no-wrap
 msgid ""
 "$ guix build --sources tzdata\n"
@@ -15782,18 +16137,18 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8517
+#: doc/guix.texi:8616
 #, no-wrap
 msgid "transitive"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8521
+#: doc/guix.texi:8620
 msgid "Build the source derivations of all packages, as well of all transitive inputs to the packages.  This can be used e.g.@: to prefetch package source for later offline building."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8532
+#: doc/guix.texi:8631
 #, no-wrap
 msgid ""
 "$ guix build --sources=transitive tzdata\n"
@@ -15808,152 +16163,152 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8542
+#: doc/guix.texi:8641
 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host.  The @command{guix build} command allows you to repeat this option several times, in which case it builds for all the specified systems; other commands ignore extraneous @option{-s} options."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:8547
+#: doc/guix.texi:8646
 msgid "The @code{--system} flag is for @emph{native} compilation and must not be confused with cross-compilation.  See @code{--target} below for information on cross-compilation."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8554
+#: doc/guix.texi:8653
 msgid "An example use of this is on Linux-based systems, which can emulate different personalities.  For instance, passing @code{--system=i686-linux} on an @code{x86_64-linux} system or @code{--system=armhf-linux} on an @code{aarch64-linux} system allows you to build packages in a complete 32-bit environment."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:8559
+#: doc/guix.texi:8658
 msgid "Building for an @code{armhf-linux} system is unconditionally enabled on @code{aarch64-linux} machines, although certain aarch64 chipsets do not allow for this functionality, notably the ThunderX."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8565
+#: doc/guix.texi:8664
 msgid "Similarly, when transparent emulation with QEMU and @code{binfmt_misc} is enabled (@pxref{Virtualization Services, @code{qemu-binfmt-service-type}}), you can build for any system for which a QEMU @code{binfmt_misc} handler is installed."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8569
+#: doc/guix.texi:8668
 msgid "Builds for a system other than that of the machine you are using can also be offloaded to a remote machine of the right architecture.  @xref{Daemon Offload Setup}, for more information on offloading."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8575
+#: doc/guix.texi:8674
 msgid "Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying Target Triplets, GNU configuration triplets,, autoconf, Autoconf})."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:8577
+#: doc/guix.texi:8676
 msgid "build-check"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8577
+#: doc/guix.texi:8676
 #, no-wrap
 msgid "--check"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8578
+#: doc/guix.texi:8677
 #, no-wrap
 msgid "determinism, checking"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8579
+#: doc/guix.texi:8678
 #, no-wrap
 msgid "reproducibility, checking"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8583
+#: doc/guix.texi:8682
 msgid "Rebuild @var{package-or-derivation}, which are already available in the store, and raise an error if the build results are not bit-for-bit identical."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8588
+#: doc/guix.texi:8687
 msgid "This mechanism allows you to check whether previously installed substitutes are genuine (@pxref{Substitutes}), or whether the build result of a package is deterministic.  @xref{Invoking guix challenge}, for more background information and tools."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8593
+#: doc/guix.texi:8692
 #, no-wrap
 msgid "--repair"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8594
+#: doc/guix.texi:8693
 #, no-wrap
 msgid "repairing store items"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8598
+#: doc/guix.texi:8697
 msgid "Attempt to repair the specified store items, if they are corrupt, by re-downloading or rebuilding them."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8600
+#: doc/guix.texi:8699
 msgid "This operation is not atomic and thus restricted to @code{root}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8601
+#: doc/guix.texi:8700
 #, no-wrap
 msgid "--derivations"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8605
+#: doc/guix.texi:8704
 msgid "Return the derivation paths, not the output paths, of the given packages."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8608
+#: doc/guix.texi:8707
 #, no-wrap
 msgid "GC roots, adding"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8609
+#: doc/guix.texi:8708
 #, no-wrap
 msgid "garbage collector roots, adding"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8612 doc/guix.texi:26667
+#: doc/guix.texi:8711 doc/guix.texi:26930
 msgid "Make @var{file} a symlink to the result, and register it as a garbage collector root."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8618
+#: doc/guix.texi:8717
 msgid "Consequently, the results of this @command{guix build} invocation are protected from garbage collection until @var{file} is removed.  When that option is omitted, build results are eligible for garbage collection as soon as the build completes.  @xref{Invoking guix gc}, for more on GC roots."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8619
+#: doc/guix.texi:8718
 #, no-wrap
 msgid "--log-file"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8620
+#: doc/guix.texi:8719
 #, no-wrap
 msgid "build logs, access"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8624
+#: doc/guix.texi:8723
 msgid "Return the build log file names or URLs for the given @var{package-or-derivation}, or raise an error if build logs are missing."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8627
+#: doc/guix.texi:8726
 msgid "This works regardless of how packages or derivations are specified.  For instance, the following invocations are equivalent:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8633
+#: doc/guix.texi:8732
 #, no-wrap
 msgid ""
 "guix build --log-file `guix build -d guile`\n"
@@ -15963,17 +16318,17 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8638
+#: doc/guix.texi:8737
 msgid "If a log is unavailable locally, and unless @code{--no-substitutes} is passed, the command looks for a corresponding log on one of the substitute servers (as specified with @code{--substitute-urls}.)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8641
+#: doc/guix.texi:8740
 msgid "So for instance, imagine you want to see the build log of GDB on MIPS, but you are actually on an @code{x86_64} machine:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8645
+#: doc/guix.texi:8744
 #, no-wrap
 msgid ""
 "$ guix build --log-file gdb -s mips64el-linux\n"
@@ -15981,33 +16336,33 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8648
+#: doc/guix.texi:8747
 msgid "You can freely access a huge library of build logs!"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8653
+#: doc/guix.texi:8752
 #, no-wrap
 msgid "build failures, debugging"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8659
+#: doc/guix.texi:8758
 msgid "When defining a new package (@pxref{Defining Packages}), you will probably find yourself spending some time debugging and tweaking the build until it succeeds.  To do that, you need to operate the build commands yourself in an environment as close as possible to the one the build daemon uses."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8664
+#: doc/guix.texi:8763
 msgid "To that end, the first thing to do is to use the @option{--keep-failed} or @option{-K} option of @command{guix build}, which will keep the failed build tree in @file{/tmp} or whatever directory you specified as @code{TMPDIR} (@pxref{Invoking guix build, @code{--keep-failed}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8670
+#: doc/guix.texi:8769
 msgid "From there on, you can @command{cd} to the failed build tree and source the @file{environment-variables} file, which contains all the environment variable definitions that were in place when the build failed.  So let's say you're debugging a build failure in package @code{foo}; a typical session would look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8677
+#: doc/guix.texi:8776
 #, no-wrap
 msgid ""
 "$ guix build foo -K\n"
@@ -16018,22 +16373,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8681
+#: doc/guix.texi:8780
 msgid "Now, you can invoke commands as if you were the daemon (almost) and troubleshoot your build process."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8687
+#: doc/guix.texi:8786
 msgid "Sometimes it happens that, for example, a package's tests pass when you run them manually but they fail when the daemon runs them.  This can happen because the daemon runs builds in containers where, unlike in our environment above, network access is missing, @file{/bin/sh} does not exist, etc. (@pxref{Build Environment Setup})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8690
+#: doc/guix.texi:8789
 msgid "In such cases, you may need to run inspect the build process from within a container similar to the one the build daemon creates:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8698
+#: doc/guix.texi:8797
 #, no-wrap
 msgid ""
 "$ guix build -K foo\n"
@@ -16045,256 +16400,256 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8707
+#: doc/guix.texi:8806
 msgid "Here, @command{guix environment -C} creates a container and spawns a new shell in it (@pxref{Invoking guix environment}).  The @command{--ad-hoc strace gdb} part adds the @command{strace} and @command{gdb} commands to the container, which would may find handy while debugging.  The @option{--no-grafts} option makes sure we get the exact same environment, with ungrafted packages (@pxref{Security Updates}, for more info on grafts)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8710
+#: doc/guix.texi:8809
 msgid "To get closer to a container like that used by the build daemon, we can remove @file{/bin/sh}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8713
+#: doc/guix.texi:8812
 #, no-wrap
 msgid "[env]# rm /bin/sh\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8717
+#: doc/guix.texi:8816
 msgid "(Don't worry, this is harmless: this is all happening in the throw-away container created by @command{guix environment}.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8720
+#: doc/guix.texi:8819
 msgid "The @command{strace} command is probably not in the search path, but we can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8723
+#: doc/guix.texi:8822
 #, no-wrap
 msgid "[env]# $GUIX_ENVIRONMENT/bin/strace -f -o log make check\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8728
+#: doc/guix.texi:8827
 msgid "In this way, not only you will have reproduced the environment variables the daemon uses, you will also be running the build process in a container similar to the one the daemon uses."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:8731
+#: doc/guix.texi:8830
 #, no-wrap
 msgid "Invoking @command{guix edit}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:8733
+#: doc/guix.texi:8832
 #, no-wrap
 msgid "guix edit"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8734
+#: doc/guix.texi:8833
 #, no-wrap
 msgid "package definition, editing"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8739
+#: doc/guix.texi:8838
 msgid "So many packages, so many source files! The @command{guix edit} command facilitates the life of users and packagers by pointing their editor at the source file containing the definition of the specified packages.  For instance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8742
+#: doc/guix.texi:8841
 #, no-wrap
 msgid "guix edit gcc@@4.9 vim\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8748
+#: doc/guix.texi:8847
 msgid "launches the program specified in the @code{VISUAL} or in the @code{EDITOR} environment variable to view the recipe of GCC@tie{}4.9.3 and that of Vim."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8754
+#: doc/guix.texi:8853
 msgid "If you are using a Guix Git checkout (@pxref{Building from Git}), or have created your own packages on @code{GUIX_PACKAGE_PATH} (@pxref{Package Modules}), you will be able to edit the package recipes.  In other cases, you will be able to examine the read-only recipes for packages currently in the store."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8759
+#: doc/guix.texi:8858
 msgid "Instead of @code{GUIX_PACKAGE_PATH}, the command-line option @code{--load-path=@var{directory}} (or in short @code{-L @var{directory}}) allows you to add @var{directory} to the front of the package module search path and so make your own packages visible."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:8761
+#: doc/guix.texi:8860
 #, no-wrap
 msgid "Invoking @command{guix download}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:8763
+#: doc/guix.texi:8862
 #, no-wrap
 msgid "guix download"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8764
+#: doc/guix.texi:8863
 #, no-wrap
 msgid "downloading package sources"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8771
+#: doc/guix.texi:8870
 msgid "When writing a package definition, developers typically need to download a source tarball, compute its SHA256 hash, and write that hash in the package definition (@pxref{Defining Packages}).  The @command{guix download} tool helps with this task: it downloads a file from the given URI, adds it to the store, and prints both its file name in the store and its SHA256 hash."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8778
+#: doc/guix.texi:8877
 msgid "The fact that the downloaded file is added to the store saves bandwidth: when the developer eventually tries to build the newly defined package with @command{guix build}, the source tarball will not have to be downloaded again because it is already in the store.  It is also a convenient way to temporarily stash files, which may be deleted eventually (@pxref{Invoking guix gc})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8786
+#: doc/guix.texi:8885
 msgid "The @command{guix download} command supports the same URIs as used in package definitions.  In particular, it supports @code{mirror://} URIs.  @code{https} URIs (HTTP over TLS) are supported @emph{provided} the Guile bindings for GnuTLS are available in the user's environment; when they are not available, an error is raised.  @xref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile}, for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8791
+#: doc/guix.texi:8890
 msgid "@command{guix download} verifies HTTPS server certificates by loading the certificates of X.509 authorities from the directory pointed to by the @code{SSL_CERT_DIR} environment variable (@pxref{X.509 Certificates}), unless @option{--no-check-certificate} is used."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8793 doc/guix.texi:10212
+#: doc/guix.texi:8892 doc/guix.texi:10311
 msgid "The following options are available:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8795 doc/guix.texi:8834
+#: doc/guix.texi:8894 doc/guix.texi:8933
 #, no-wrap
 msgid "--format=@var{fmt}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8796 doc/guix.texi:8835
+#: doc/guix.texi:8895 doc/guix.texi:8934
 #, no-wrap
 msgid "-f @var{fmt}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8799
+#: doc/guix.texi:8898
 msgid "Write the hash in the format specified by @var{fmt}.  For more information on the valid values for @var{fmt}, @pxref{Invoking guix hash}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8800
+#: doc/guix.texi:8899
 #, no-wrap
 msgid "--no-check-certificate"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8802
+#: doc/guix.texi:8901
 msgid "Do not validate the X.509 certificates of HTTPS servers."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8806
+#: doc/guix.texi:8905
 msgid "When using this option, you have @emph{absolutely no guarantee} that you are communicating with the authentic server responsible for the given URL, which makes you vulnerable to ``man-in-the-middle'' attacks."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8807
+#: doc/guix.texi:8906
 #, no-wrap
 msgid "--output=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8808
+#: doc/guix.texi:8907
 #, no-wrap
 msgid "-o @var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8811
+#: doc/guix.texi:8910
 msgid "Save the downloaded file to @var{file} instead of adding it to the store."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:8814
+#: doc/guix.texi:8913
 #, no-wrap
 msgid "Invoking @command{guix hash}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:8816
+#: doc/guix.texi:8915
 #, no-wrap
 msgid "guix hash"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8821
+#: doc/guix.texi:8920
 msgid "The @command{guix hash} command computes the SHA256 hash of a file.  It is primarily a convenience tool for anyone contributing to the distribution: it computes the cryptographic hash of a file, which can be used in the definition of a package (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8826
+#: doc/guix.texi:8925
 #, no-wrap
 msgid "guix hash @var{option} @var{file}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8831
+#: doc/guix.texi:8930
 msgid "When @var{file} is @code{-} (a hyphen), @command{guix hash} computes the hash of data read from standard input.  @command{guix hash} has the following options:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8837
+#: doc/guix.texi:8936
 msgid "Write the hash in the format specified by @var{fmt}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8840
+#: doc/guix.texi:8939
 msgid "Supported formats: @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} and @code{hexadecimal} can be used as well)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8844
+#: doc/guix.texi:8943
 msgid "If the @option{--format} option is not specified, @command{guix hash} will output the hash in @code{nix-base32}.  This representation is used in the definitions of packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8848
+#: doc/guix.texi:8947
 msgid "Compute the hash on @var{file} recursively."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8857
+#: doc/guix.texi:8956
 msgid "In this case, the hash is computed on an archive containing @var{file}, including its children if it is a directory.  Some of the metadata of @var{file} is part of the archive; for instance, when @var{file} is a regular file, the hash is different depending on whether @var{file} is executable or not.  Metadata such as time stamps has no impact on the hash (@pxref{Invoking guix archive})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8858
+#: doc/guix.texi:8957
 #, no-wrap
 msgid "--exclude-vcs"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8859
+#: doc/guix.texi:8958
 #, no-wrap
 msgid "-x"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8862
+#: doc/guix.texi:8961
 msgid "When combined with @option{--recursive}, exclude version control system directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8867
+#: doc/guix.texi:8966
 msgid "As an example, here is how you would compute the hash of a Git checkout, which is useful when using the @code{git-fetch} method (@pxref{origin Reference}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8872
+#: doc/guix.texi:8971
 #, no-wrap
 msgid ""
 "$ git clone http://example.org/foo.git\n"
@@ -16303,322 +16658,322 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8876 doc/guix.texi:8881
+#: doc/guix.texi:8975 doc/guix.texi:8980
 #, no-wrap
 msgid "Invoking @command{guix import}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8878
+#: doc/guix.texi:8977
 #, no-wrap
 msgid "importing packages"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8879
+#: doc/guix.texi:8978
 #, no-wrap
 msgid "package import"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8880
+#: doc/guix.texi:8979
 #, no-wrap
 msgid "package conversion"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8888
+#: doc/guix.texi:8987
 msgid "The @command{guix import} command is useful for people who would like to add a package to the distribution with as little work as possible---a legitimate demand.  The command knows of a few repositories from which it can ``import'' package metadata.  The result is a package definition, or a template thereof, in the format we know (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8893
+#: doc/guix.texi:8992
 #, no-wrap
 msgid "guix import @var{importer} @var{options}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8898
+#: doc/guix.texi:8997
 msgid "@var{importer} specifies the source from which to import package metadata, and @var{options} specifies a package identifier and other options specific to @var{importer}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8902
+#: doc/guix.texi:9001
 msgid "Some of the importers rely on the ability to run the @command{gpgv} command.  For these, GnuPG must be installed and in @code{$PATH}; run @code{guix install gnupg} if needed."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8904
+#: doc/guix.texi:9003
 #, fuzzy
 #| msgid "The available formats are:"
 msgid "Currently, the available ``importers'' are:"
 msgstr "Возможные форматы:"
 
 #. type: item
-#: doc/guix.texi:8906 doc/guix.texi:9437
+#: doc/guix.texi:9005 doc/guix.texi:9536
 #, no-wrap
 msgid "gnu"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8910
+#: doc/guix.texi:9009
 msgid "Import metadata for the given GNU package.  This provides a template for the latest version of that GNU package, including the hash of its source tarball, and its canonical synopsis and description."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8913
+#: doc/guix.texi:9012
 msgid "Additional information such as the package dependencies and its license needs to be figured out manually."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8916
+#: doc/guix.texi:9015
 msgid "For example, the following command returns a package definition for GNU@tie{}Hello:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8919
+#: doc/guix.texi:9018
 #, no-wrap
 msgid "guix import gnu hello\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8922 doc/guix.texi:9157 doc/guix.texi:9207 doc/guix.texi:9236
+#: doc/guix.texi:9021 doc/guix.texi:9256 doc/guix.texi:9306 doc/guix.texi:9335
 msgid "Specific command-line options are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8924 doc/guix.texi:9586
+#: doc/guix.texi:9023 doc/guix.texi:9685
 #, no-wrap
 msgid "--key-download=@var{policy}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8928
+#: doc/guix.texi:9027
 msgid "As for @code{guix refresh}, specify the policy to handle missing OpenPGP keys when verifying the package signature.  @xref{Invoking guix refresh, @code{--key-download}}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8930 doc/guix.texi:8931 doc/guix.texi:9455
+#: doc/guix.texi:9029 doc/guix.texi:9030 doc/guix.texi:9554
 #, no-wrap
 msgid "pypi"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8938
+#: doc/guix.texi:9037
 msgid "Import metadata from the @uref{https://pypi.python.org/, Python Package Index}.  Information is taken from the JSON-formatted description available at @code{pypi.python.org} and usually includes all the relevant information, including package dependencies.  For maximum efficiency, it is recommended to install the @command{unzip} utility, so that the importer can unzip Python wheels and gather data from them."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8941
+#: doc/guix.texi:9040
 msgid "The command below imports metadata for the @code{itsdangerous} Python package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8944
+#: doc/guix.texi:9043
 #, no-wrap
 msgid "guix import pypi itsdangerous\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8952 doc/guix.texi:8977 doc/guix.texi:9180 doc/guix.texi:9221
-#: doc/guix.texi:9268 doc/guix.texi:9293
+#: doc/guix.texi:9051 doc/guix.texi:9076 doc/guix.texi:9279 doc/guix.texi:9320
+#: doc/guix.texi:9367 doc/guix.texi:9392
 msgid "Traverse the dependency graph of the given upstream package recursively and generate package expressions for all those packages that are not yet in Guix."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8954 doc/guix.texi:8955 doc/guix.texi:9457
+#: doc/guix.texi:9053 doc/guix.texi:9054 doc/guix.texi:9556
 #, no-wrap
 msgid "gem"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8964
+#: doc/guix.texi:9063
 msgid "Import metadata from @uref{https://rubygems.org/, RubyGems}.  Information is taken from the JSON-formatted description available at @code{rubygems.org} and includes most relevant information, including runtime dependencies.  There are some caveats, however.  The metadata doesn't distinguish between synopses and descriptions, so the same string is used for both fields.  Additionally, the details of non-Ruby dependencies required to build native extensions is unavailable and left as an exercise to the packager."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8966
+#: doc/guix.texi:9065
 msgid "The command below imports metadata for the @code{rails} Ruby package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8969
+#: doc/guix.texi:9068
 #, no-wrap
 msgid "guix import gem rails\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8979 doc/guix.texi:9453
+#: doc/guix.texi:9078 doc/guix.texi:9552
 #, no-wrap
 msgid "cpan"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8980
+#: doc/guix.texi:9079
 #, no-wrap
 msgid "CPAN"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8988
+#: doc/guix.texi:9087
 msgid "Import metadata from @uref{https://www.metacpan.org/, MetaCPAN}.  Information is taken from the JSON-formatted metadata provided through @uref{https://fastapi.metacpan.org/, MetaCPAN's API} and includes most relevant information, such as module dependencies.  License information should be checked closely.  If Perl is available in the store, then the @code{corelist} utility will be used to filter core modules out of the list of dependencies."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8991
+#: doc/guix.texi:9090
 msgid "The command command below imports metadata for the @code{Acme::Boolean} Perl module:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8994
+#: doc/guix.texi:9093
 #, no-wrap
 msgid "guix import cpan Acme::Boolean\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8996 doc/guix.texi:9449
+#: doc/guix.texi:9095 doc/guix.texi:9548
 #, no-wrap
 msgid "cran"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8997
+#: doc/guix.texi:9096
 #, no-wrap
 msgid "CRAN"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8998
+#: doc/guix.texi:9097
 #, no-wrap
 msgid "Bioconductor"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9002
+#: doc/guix.texi:9101
 msgid "Import metadata from @uref{https://cran.r-project.org/, CRAN}, the central repository for the @uref{https://r-project.org, GNU@tie{}R statistical and graphical environment}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9004
+#: doc/guix.texi:9103
 msgid "Information is extracted from the @code{DESCRIPTION} file of the package."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9007
+#: doc/guix.texi:9106
 msgid "The command command below imports metadata for the @code{Cairo} R package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9010
+#: doc/guix.texi:9109
 #, no-wrap
 msgid "guix import cran Cairo\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9015
+#: doc/guix.texi:9114
 msgid "When @code{--recursive} is added, the importer will traverse the dependency graph of the given upstream package recursively and generate package expressions for all those packages that are not yet in Guix."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9020
+#: doc/guix.texi:9119
 msgid "When @code{--archive=bioconductor} is added, metadata is imported from @uref{https://www.bioconductor.org/, Bioconductor}, a repository of R packages for for the analysis and comprehension of high-throughput genomic data in bioinformatics."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9023
+#: doc/guix.texi:9122
 msgid "Information is extracted from the @code{DESCRIPTION} file contained in the package archive."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9026
+#: doc/guix.texi:9125
 msgid "The command below imports metadata for the @code{GenomicRanges} R package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9029
+#: doc/guix.texi:9128
 #, no-wrap
 msgid "guix import cran --archive=bioconductor GenomicRanges\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9034
+#: doc/guix.texi:9133
 msgid "Finally, you can also import R packages that have not yet been published on CRAN or Bioconductor as long as they are in a git repository.  Use @code{--archive=git} followed by the URL of the git repository:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9037
+#: doc/guix.texi:9136
 #, no-wrap
 msgid "guix import cran --archive=git https://github.com/immunogenomics/harmony\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9039
+#: doc/guix.texi:9138
 #, no-wrap
 msgid "texlive"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9040
+#: doc/guix.texi:9139
 #, no-wrap
 msgid "TeX Live"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9041
+#: doc/guix.texi:9140
 #, no-wrap
 msgid "CTAN"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9045
+#: doc/guix.texi:9144
 msgid "Import metadata from @uref{https://www.ctan.org/, CTAN}, the comprehensive TeX archive network for TeX packages that are part of the @uref{https://www.tug.org/texlive/, TeX Live distribution}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9050
+#: doc/guix.texi:9149
 msgid "Information about the package is obtained through the XML API provided by CTAN, while the source code is downloaded from the SVN repository of the Tex Live project.  This is done because the CTAN does not keep versioned archives."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9053
+#: doc/guix.texi:9152
 msgid "The command command below imports metadata for the @code{fontspec} TeX package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9056
+#: doc/guix.texi:9155
 #, no-wrap
 msgid "guix import texlive fontspec\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9062
+#: doc/guix.texi:9161
 msgid "When @code{--archive=DIRECTORY} is added, the source code is downloaded not from the @file{latex} sub-directory of the @file{texmf-dist/source} tree in the TeX Live SVN repository, but from the specified sibling directory under the same root."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9066
+#: doc/guix.texi:9165
 msgid "The command below imports metadata for the @code{ifxetex} package from CTAN while fetching the sources from the directory @file{texmf/source/generic}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9069
+#: doc/guix.texi:9168
 #, no-wrap
 msgid "guix import texlive --archive=generic ifxetex\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9072
+#: doc/guix.texi:9171
 #, no-wrap
 msgid "JSON, import"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9075
+#: doc/guix.texi:9174
 msgid "Import package metadata from a local JSON file.  Consider the following example package definition in JSON format:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9088
+#: doc/guix.texi:9187
 #, no-wrap
 msgid ""
 "@{\n"
@@ -16635,17 +16990,17 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9094
+#: doc/guix.texi:9193
 msgid "The field names are the same as for the @code{} record (@xref{Defining Packages}).  References to other packages are provided as JSON lists of quoted package specification strings such as @code{guile} or @code{guile@@2.0}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9097
+#: doc/guix.texi:9196
 msgid "The importer also supports a more explicit source definition using the common fields for @code{} records:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9110
+#: doc/guix.texi:9209
 #, no-wrap
 msgid ""
 "@{\n"
@@ -16662,306 +17017,306 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9114
+#: doc/guix.texi:9213
 msgid "The command below reads metadata from the JSON file @code{hello.json} and outputs a package expression:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9117
+#: doc/guix.texi:9216
 #, no-wrap
 msgid "guix import json hello.json\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9119
+#: doc/guix.texi:9218
 #, no-wrap
 msgid "nix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9128
+#: doc/guix.texi:9227
 msgid "Import metadata from a local copy of the source of the @uref{https://nixos.org/nixpkgs/, Nixpkgs distribution}@footnote{This relies on the @command{nix-instantiate} command of @uref{https://nixos.org/nix/, Nix}.}.  Package definitions in Nixpkgs are typically written in a mixture of Nix-language and Bash code.  This command only imports the high-level package structure that is written in the Nix language.  It normally includes all the basic fields of a package definition."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9131
+#: doc/guix.texi:9230
 msgid "When importing a GNU package, the synopsis and descriptions are replaced by their canonical upstream variant."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9133
+#: doc/guix.texi:9232
 msgid "Usually, you will first need to do:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9136
+#: doc/guix.texi:9235
 #, no-wrap
 msgid "export NIX_REMOTE=daemon\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9140
+#: doc/guix.texi:9239
 msgid "so that @command{nix-instantiate} does not try to open the Nix database."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9144
+#: doc/guix.texi:9243
 msgid "As an example, the command below imports the package definition of LibreOffice (more precisely, it imports the definition of the package bound to the @code{libreoffice} top-level attribute):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9147
+#: doc/guix.texi:9246
 #, no-wrap
 msgid "guix import nix ~/path/to/nixpkgs libreoffice\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9149 doc/guix.texi:9150 doc/guix.texi:9461
+#: doc/guix.texi:9248 doc/guix.texi:9249 doc/guix.texi:9560
 #, no-wrap
 msgid "hackage"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9155
+#: doc/guix.texi:9254
 msgid "Import metadata from the Haskell community's central package archive @uref{https://hackage.haskell.org/, Hackage}.  Information is taken from Cabal files and includes all the relevant information, including package dependencies."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9159
+#: doc/guix.texi:9258
 #, no-wrap
 msgid "--stdin"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9160
+#: doc/guix.texi:9259
 #, no-wrap
 msgid "-s"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9162
+#: doc/guix.texi:9261
 msgid "Read a Cabal file from standard input."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9162 doc/guix.texi:9209
+#: doc/guix.texi:9261 doc/guix.texi:9308
 #, no-wrap
 msgid "--no-test-dependencies"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9165 doc/guix.texi:9212
+#: doc/guix.texi:9264 doc/guix.texi:9311
 msgid "Do not include dependencies required only by the test suites."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9165
+#: doc/guix.texi:9264
 #, no-wrap
 msgid "--cabal-environment=@var{alist}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9166
+#: doc/guix.texi:9265
 #, no-wrap
 msgid "-e @var{alist}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9175
+#: doc/guix.texi:9274
 msgid "@var{alist} is a Scheme alist defining the environment in which the Cabal conditionals are evaluated.  The accepted keys are: @code{os}, @code{arch}, @code{impl} and a string representing the name of a flag.  The value associated with a flag has to be either the symbol @code{true} or @code{false}.  The value associated with other keys has to conform to the Cabal file format definition.  The default value associated with the keys @code{os}, @code{arch} and @code{impl} is @samp{linux}, @samp{x86_64} and @samp{ghc}, respectively."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9185
+#: doc/guix.texi:9284
 msgid "The command below imports metadata for the latest version of the @code{HTTP} Haskell package without including test dependencies and specifying the value of the flag @samp{network-uri} as @code{false}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9188
+#: doc/guix.texi:9287
 #, no-wrap
 msgid "guix import hackage -t -e \"'((\\\"network-uri\\\" . false))\" HTTP\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9192
+#: doc/guix.texi:9291
 msgid "A specific package version may optionally be specified by following the package name by an at-sign and a version number as in the following example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9195
+#: doc/guix.texi:9294
 #, no-wrap
 msgid "guix import hackage mtl@@2.1.3.1\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9197 doc/guix.texi:9198 doc/guix.texi:9463
+#: doc/guix.texi:9296 doc/guix.texi:9297 doc/guix.texi:9562
 #, no-wrap
 msgid "stackage"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9205
+#: doc/guix.texi:9304
 msgid "The @code{stackage} importer is a wrapper around the @code{hackage} one.  It takes a package name, looks up the package version included in a long-term support (LTS) @uref{https://www.stackage.org, Stackage} release and uses the @code{hackage} importer to retrieve its metadata.  Note that it is up to you to select an LTS release compatible with the GHC compiler used by Guix."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9212
+#: doc/guix.texi:9311
 #, no-wrap
 msgid "--lts-version=@var{version}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9213
+#: doc/guix.texi:9312
 #, no-wrap
 msgid "-l @var{version}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9216
+#: doc/guix.texi:9315
 msgid "@var{version} is the desired LTS release version.  If omitted the latest release is used."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9225
+#: doc/guix.texi:9324
 msgid "The command below imports metadata for the @code{HTTP} Haskell package included in the LTS Stackage release version 7.18:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9228
+#: doc/guix.texi:9327
 #, no-wrap
 msgid "guix import stackage --lts-version=7.18 HTTP\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9230 doc/guix.texi:9231 doc/guix.texi:9447
+#: doc/guix.texi:9329 doc/guix.texi:9330 doc/guix.texi:9546
 #, no-wrap
 msgid "elpa"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9234
+#: doc/guix.texi:9333
 msgid "Import metadata from an Emacs Lisp Package Archive (ELPA) package repository (@pxref{Packages,,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9238
+#: doc/guix.texi:9337
 #, no-wrap
 msgid "--archive=@var{repo}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9239
+#: doc/guix.texi:9338
 #, no-wrap
 msgid "-a @var{repo}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9243
+#: doc/guix.texi:9342
 msgid "@var{repo} identifies the archive repository from which to retrieve the information.  Currently the supported repositories and their identifiers are:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:9247
+#: doc/guix.texi:9346
 msgid "@uref{https://elpa.gnu.org/packages, GNU}, selected by the @code{gnu} identifier.  This is the default."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:9253
+#: doc/guix.texi:9352
 msgid "Packages from @code{elpa.gnu.org} are signed with one of the keys contained in the GnuPG keyring at @file{share/emacs/25.1/etc/package-keyring.gpg} (or similar) in the @code{emacs} package (@pxref{Package Installation, ELPA package signatures,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:9257
+#: doc/guix.texi:9356
 msgid "@uref{https://stable.melpa.org/packages, MELPA-Stable}, selected by the @code{melpa-stable} identifier."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:9261
+#: doc/guix.texi:9360
 msgid "@uref{https://melpa.org/packages, MELPA}, selected by the @code{melpa} identifier."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9270 doc/guix.texi:9271 doc/guix.texi:9465
+#: doc/guix.texi:9369 doc/guix.texi:9370 doc/guix.texi:9564
 #, no-wrap
 msgid "crate"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9274
+#: doc/guix.texi:9373
 msgid "Import metadata from the crates.io Rust package repository @uref{https://crates.io, crates.io}, as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9277
+#: doc/guix.texi:9376
 #, no-wrap
 msgid "guix import crate blake2-rfc\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9280
+#: doc/guix.texi:9379
 msgid "The crate importer also allows you to specify a version string:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9283
+#: doc/guix.texi:9382
 #, no-wrap
 msgid "guix import crate constant-time-eq@@0.1.0\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9286
+#: doc/guix.texi:9385
 #, fuzzy
 #| msgid "Additional Build Options"
 msgid "Additional options include:"
 msgstr "Дополительные опции сборки"
 
 #. type: item
-#: doc/guix.texi:9295
+#: doc/guix.texi:9394
 #, no-wrap
 msgid "opam"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9296
+#: doc/guix.texi:9395
 #, no-wrap
 msgid "OPAM"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9297
+#: doc/guix.texi:9396
 #, no-wrap
 msgid "OCaml"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9300
+#: doc/guix.texi:9399
 msgid "Import metadata from the @uref{https://opam.ocaml.org/, OPAM} package repository used by the OCaml community."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9305
+#: doc/guix.texi:9404
 msgid "The structure of the @command{guix import} code is modular.  It would be useful to have more importers for other package formats, and your help is welcome here (@pxref{Contributing})."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:9307
+#: doc/guix.texi:9406
 #, no-wrap
 msgid "Invoking @command{guix refresh}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:9309
+#: doc/guix.texi:9408
 #, no-wrap
 msgid "guix refresh"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9314
+#: doc/guix.texi:9413
 msgid "The primary audience of the @command{guix refresh} command is developers of the GNU software distribution.  By default, it reports any packages provided by the distribution that are outdated compared to the latest upstream version, like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9319
+#: doc/guix.texi:9418
 #, no-wrap
 msgid ""
 "$ guix refresh\n"
@@ -16970,12 +17325,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9323
+#: doc/guix.texi:9422
 msgid "Alternately, one can specify packages to consider, in which case a warning is emitted for packages that lack an updater:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9328
+#: doc/guix.texi:9427
 #, no-wrap
 msgid ""
 "$ guix refresh coreutils guile guile-ssh\n"
@@ -16984,17 +17339,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9337
+#: doc/guix.texi:9436
 msgid "@command{guix refresh} browses the upstream repository of each package and determines the highest version number of the releases therein.  The command knows how to update specific types of packages: GNU packages, ELPA packages, etc.---see the documentation for @option{--type} below.  There are many packages, though, for which it lacks a method to determine whether a new upstream release is available.  However, the mechanism is extensible, so feel free to get in touch with us to add a new method!"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9342
+#: doc/guix.texi:9441
 msgid "Consider the packages specified, and all the packages upon which they depend."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9350
+#: doc/guix.texi:9449
 #, no-wrap
 msgid ""
 "$ guix refresh --recursive coreutils\n"
@@ -17006,12 +17361,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9358
+#: doc/guix.texi:9457
 msgid "Sometimes the upstream name differs from the package name used in Guix, and @command{guix refresh} needs a little help.  Most updaters honor the @code{upstream-name} property in package definitions, which can be used to that effect:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:9365
+#: doc/guix.texi:9464
 #, no-wrap
 msgid ""
 "(define-public network-manager\n"
@@ -17022,242 +17377,242 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9374
+#: doc/guix.texi:9473
 msgid "When passed @code{--update}, it modifies distribution source files to update the version numbers and source tarball hashes of those package recipes (@pxref{Defining Packages}).  This is achieved by downloading each package's latest source tarball and its associated OpenPGP signature, authenticating the downloaded tarball against its signature using @command{gpgv}, and finally computing its hash---note that GnuPG must be installed and in @code{$PATH}; run @code{guix install gnupg} if needed."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9380
+#: doc/guix.texi:9479
 msgid "When the public key used to sign the tarball is missing from the user's keyring, an attempt is made to automatically retrieve it from a public key server; when this is successful, the key is added to the user's keyring; otherwise, @command{guix refresh} reports an error."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9382
+#: doc/guix.texi:9481
 msgid "The following options are supported:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9390 doc/guix.texi:10095
+#: doc/guix.texi:9489 doc/guix.texi:10194
 msgid "This is useful to precisely refer to a package, as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9393
+#: doc/guix.texi:9492
 #, no-wrap
 msgid "guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)'\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9397
+#: doc/guix.texi:9496
 msgid "This command lists the dependents of the ``final'' libc (essentially all the packages.)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9398
+#: doc/guix.texi:9497
 #, no-wrap
 msgid "--update"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9399
+#: doc/guix.texi:9498
 #, no-wrap
 msgid "-u"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9403
+#: doc/guix.texi:9502
 msgid "Update distribution source files (package recipes) in place.  This is usually run from a checkout of the Guix source tree (@pxref{Running Guix Before It Is Installed}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9406
+#: doc/guix.texi:9505
 #, no-wrap
 msgid "$ ./pre-inst-env guix refresh -s non-core -u\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9409
+#: doc/guix.texi:9508
 msgid "@xref{Defining Packages}, for more information on package definitions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9410
+#: doc/guix.texi:9509
 #, no-wrap
 msgid "--select=[@var{subset}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9411
+#: doc/guix.texi:9510
 #, no-wrap
 msgid "-s @var{subset}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9414
+#: doc/guix.texi:9513
 msgid "Select all the packages in @var{subset}, one of @code{core} or @code{non-core}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9421
+#: doc/guix.texi:9520
 msgid "The @code{core} subset refers to all the packages at the core of the distribution---i.e., packages that are used to build ``everything else''.  This includes GCC, libc, Binutils, Bash, etc.  Usually, changing one of these packages in the distribution entails a rebuild of all the others.  Thus, such updates are an inconvenience to users in terms of build time or bandwidth used to achieve the upgrade."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9425
+#: doc/guix.texi:9524
 msgid "The @code{non-core} subset refers to the remaining packages.  It is typically useful in cases where an update of the core packages would be inconvenient."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9430
+#: doc/guix.texi:9529
 msgid "Select all the packages from the manifest in @var{file}. This is useful to check if any packages of the user manifest can be updated."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9431
+#: doc/guix.texi:9530
 #, no-wrap
 msgid "--type=@var{updater}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9432
+#: doc/guix.texi:9531
 #, no-wrap
 msgid "-t @var{updater}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9435
+#: doc/guix.texi:9534
 msgid "Select only packages handled by @var{updater} (may be a comma-separated list of updaters).  Currently, @var{updater} may be one of:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9439
+#: doc/guix.texi:9538
 msgid "the updater for GNU packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9439
+#: doc/guix.texi:9538
 #, no-wrap
 msgid "gnome"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9441
+#: doc/guix.texi:9540
 msgid "the updater for GNOME packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9441
+#: doc/guix.texi:9540
 #, no-wrap
 msgid "kde"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9443
+#: doc/guix.texi:9542
 msgid "the updater for KDE packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9443
+#: doc/guix.texi:9542
 #, no-wrap
 msgid "xorg"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9445
+#: doc/guix.texi:9544
 msgid "the updater for X.org packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9445
+#: doc/guix.texi:9544
 #, no-wrap
 msgid "kernel.org"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9447
+#: doc/guix.texi:9546
 msgid "the updater for packages hosted on kernel.org;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9449
+#: doc/guix.texi:9548
 msgid "the updater for @uref{https://elpa.gnu.org/, ELPA} packages;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9451
+#: doc/guix.texi:9550
 msgid "the updater for @uref{https://cran.r-project.org/, CRAN} packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9451
+#: doc/guix.texi:9550
 #, no-wrap
 msgid "bioconductor"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9453
+#: doc/guix.texi:9552
 msgid "the updater for @uref{https://www.bioconductor.org/, Bioconductor} R packages;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9455
+#: doc/guix.texi:9554
 msgid "the updater for @uref{https://www.cpan.org/, CPAN} packages;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9457
+#: doc/guix.texi:9556
 msgid "the updater for @uref{https://pypi.python.org, PyPI} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9459
+#: doc/guix.texi:9558
 msgid "the updater for @uref{https://rubygems.org, RubyGems} packages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9459
+#: doc/guix.texi:9558
 #, no-wrap
 msgid "github"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9461
+#: doc/guix.texi:9560
 msgid "the updater for @uref{https://github.com, GitHub} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9463
+#: doc/guix.texi:9562
 msgid "the updater for @uref{https://hackage.haskell.org, Hackage} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9465
+#: doc/guix.texi:9564
 msgid "the updater for @uref{https://www.stackage.org, Stackage} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9467
+#: doc/guix.texi:9566
 msgid "the updater for @uref{https://crates.io, Crates} packages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9467
+#: doc/guix.texi:9566
 #, no-wrap
 msgid "launchpad"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9469
+#: doc/guix.texi:9568
 msgid "the updater for @uref{https://launchpad.net, Launchpad} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9473
+#: doc/guix.texi:9572
 msgid "For instance, the following command only checks for updates of Emacs packages hosted at @code{elpa.gnu.org} and for updates of CRAN packages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9478
+#: doc/guix.texi:9577
 #, no-wrap
 msgid ""
 "$ guix refresh --type=elpa,cran\n"
@@ -17266,77 +17621,77 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9484
+#: doc/guix.texi:9583
 msgid "In addition, @command{guix refresh} can be passed one or more package names, as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9487
+#: doc/guix.texi:9586
 #, no-wrap
 msgid "$ ./pre-inst-env guix refresh -u emacs idutils gcc@@4.8\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9493
+#: doc/guix.texi:9592
 msgid "The command above specifically updates the @code{emacs} and @code{idutils} packages.  The @code{--select} option would have no effect in this case."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9498
+#: doc/guix.texi:9597
 msgid "When considering whether to upgrade a package, it is sometimes convenient to know which packages would be affected by the upgrade and should be checked for compatibility.  For this the following option may be used when passing @command{guix refresh} one or more package names:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9501
+#: doc/guix.texi:9600
 #, no-wrap
 msgid "--list-updaters"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9502
+#: doc/guix.texi:9601
 #, no-wrap
 msgid "-L"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9504
+#: doc/guix.texi:9603
 msgid "List available updaters and exit (see @option{--type} above.)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9507
+#: doc/guix.texi:9606
 msgid "For each updater, display the fraction of packages it covers; at the end, display the fraction of packages covered by all these updaters."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9508
+#: doc/guix.texi:9607
 #, no-wrap
 msgid "--list-dependent"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9509 doc/guix.texi:9757
+#: doc/guix.texi:9608 doc/guix.texi:9856
 #, no-wrap
 msgid "-l"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9512
+#: doc/guix.texi:9611
 msgid "List top-level dependent packages that would need to be rebuilt as a result of upgrading one or more packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9516
+#: doc/guix.texi:9615
 msgid "@xref{Invoking guix graph, the @code{reverse-package} type of @command{guix graph}}, for information on how to visualize the list of dependents of a package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9522
+#: doc/guix.texi:9621
 msgid "Be aware that the @code{--list-dependent} option only @emph{approximates} the rebuilds that would be required as a result of an upgrade.  More rebuilds might be required under some circumstances."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9527
+#: doc/guix.texi:9626
 #, no-wrap
 msgid ""
 "$ guix refresh --list-dependent flex\n"
@@ -17345,23 +17700,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9531
+#: doc/guix.texi:9630
 msgid "The command above lists a set of packages that could be built to check for compatibility with an upgraded @code{flex} package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9534
+#: doc/guix.texi:9633
 #, no-wrap
 msgid "--list-transitive"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9536
+#: doc/guix.texi:9635
 msgid "List all the packages which one or more packages depend upon."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9541
+#: doc/guix.texi:9640
 #, no-wrap
 msgid ""
 "$ guix refresh --list-transitive flex\n"
@@ -17370,60 +17725,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9547
+#: doc/guix.texi:9646
 msgid "The command above lists a set of packages which, when changed, would cause @code{flex} to be rebuilt."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9549
+#: doc/guix.texi:9648
 msgid "The following options can be used to customize GnuPG operation:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9552
+#: doc/guix.texi:9651
 #, no-wrap
 msgid "--gpg=@var{command}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9555
+#: doc/guix.texi:9654
 msgid "Use @var{command} as the GnuPG 2.x command.  @var{command} is searched for in @code{$PATH}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9556
+#: doc/guix.texi:9655
 #, no-wrap
 msgid "--keyring=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9562
+#: doc/guix.texi:9661
 msgid "Use @var{file} as the keyring for upstream keys.  @var{file} must be in the @dfn{keybox format}.  Keybox files usually have a name ending in @file{.kbx} and the GNU@tie{}Privacy Guard (GPG) can manipulate these files (@pxref{kbxutil, @command{kbxutil},, gnupg, Using the GNU Privacy Guard}, for information on a tool to manipulate keybox files)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9568
+#: doc/guix.texi:9667
 msgid "When this option is omitted, @command{guix refresh} uses @file{~/.config/guix/upstream/trustedkeys.kbx} as the keyring for upstream signing keys.  OpenPGP signatures are checked against keys from this keyring; missing keys are downloaded to this keyring as well (see @option{--key-download} below.)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9571
+#: doc/guix.texi:9670
 msgid "You can export keys from your default GPG keyring into a keybox file using commands like this one:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9574
+#: doc/guix.texi:9673
 #, no-wrap
 msgid "gpg --export rms@@gnu.org | kbxutil --import-openpgp >> mykeyring.kbx\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9577
+#: doc/guix.texi:9676
 msgid "Likewise, you can fetch keys to a specific keybox file like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9581
+#: doc/guix.texi:9680
 #, no-wrap
 msgid ""
 "gpg --no-default-keyring --keyring mykeyring.kbx \\\n"
@@ -17431,226 +17786,226 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9585
+#: doc/guix.texi:9684
 msgid "@ref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU Privacy Guard}, for more information on GPG's @option{--keyring} option."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9589
+#: doc/guix.texi:9688
 msgid "Handle missing OpenPGP keys according to @var{policy}, which may be one of:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9591 doc/guix.texi:17052
+#: doc/guix.texi:9690 doc/guix.texi:17209
 #, no-wrap
 msgid "always"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9594
+#: doc/guix.texi:9693
 msgid "Always download missing OpenPGP keys from the key server, and add them to the user's GnuPG keyring."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9595 doc/guix.texi:17054
+#: doc/guix.texi:9694 doc/guix.texi:17211
 #, no-wrap
 msgid "never"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9597
+#: doc/guix.texi:9696
 msgid "Never try to download missing OpenPGP keys.  Instead just bail out."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9598
+#: doc/guix.texi:9697
 #, no-wrap
 msgid "interactive"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9601
+#: doc/guix.texi:9700
 msgid "When a package signed with an unknown OpenPGP key is encountered, ask the user whether to download it or not.  This is the default behavior."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9603
+#: doc/guix.texi:9702
 #, no-wrap
 msgid "--key-server=@var{host}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9605
+#: doc/guix.texi:9704
 msgid "Use @var{host} as the OpenPGP key server when importing a public key."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9625
+#: doc/guix.texi:9724
 msgid "The @code{github} updater uses the @uref{https://developer.github.com/v3/, GitHub API} to query for new releases.  When used repeatedly e.g.@: when refreshing all packages, GitHub will eventually refuse to answer any further API requests.  By default 60 API requests per hour are allowed, and a full refresh on all GitHub packages in Guix requires more than this.  Authentication with GitHub through the use of an API token alleviates these limits.  To use an API token, set the environment variable @code{GUIX_GITHUB_TOKEN} to a token procured from @uref{https://github.com/settings/tokens} or otherwise."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:9628
+#: doc/guix.texi:9727
 #, no-wrap
 msgid "Invoking @command{guix lint}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:9630
+#: doc/guix.texi:9729
 #, no-wrap
 msgid "guix lint"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9631
+#: doc/guix.texi:9730
 #, no-wrap
 msgid "package, checking for errors"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9637
+#: doc/guix.texi:9736
 msgid "The @command{guix lint} command is meant to help package developers avoid common errors and use a consistent style.  It runs a number of checks on a given set of packages in order to find common mistakes in their definitions.  Available @dfn{checkers} include (see @code{--list-checkers} for a complete list):"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9643
+#: doc/guix.texi:9742
 msgid "Validate certain typographical and stylistic rules about package descriptions and synopses."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9644
+#: doc/guix.texi:9743
 #, no-wrap
 msgid "inputs-should-be-native"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9646
+#: doc/guix.texi:9745
 msgid "Identify inputs that should most likely be native inputs."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9649
+#: doc/guix.texi:9748
 #, no-wrap
 msgid "mirror-url"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9650
+#: doc/guix.texi:9749
 #, no-wrap
 msgid "github-url"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9651
+#: doc/guix.texi:9750
 #, no-wrap
 msgid "source-file-name"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9658
+#: doc/guix.texi:9757
 msgid "Probe @code{home-page} and @code{source} URLs and report those that are invalid.  Suggest a @code{mirror://} URL when applicable.  If the @code{source} URL redirects to a GitHub URL, recommend usage of the GitHub URL.  Check that the source file name is meaningful, e.g.@: is not just a version number or ``git-checkout'', without a declared @code{file-name} (@pxref{origin Reference})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9659
+#: doc/guix.texi:9758
 #, no-wrap
 msgid "source-unstable-tarball"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9663
+#: doc/guix.texi:9762
 msgid "Parse the @code{source} URL to determine if a tarball from GitHub is autogenerated or if it is a release tarball.  Unfortunately GitHub's autogenerated tarballs are sometimes regenerated."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9664
+#: doc/guix.texi:9763
 #, fuzzy, no-wrap
 #| msgid "archive"
 msgid "archival"
 msgstr "архив"
 
 #. type: cindex
-#: doc/guix.texi:9665
+#: doc/guix.texi:9764
 #, no-wrap
 msgid "Software Heritage, source code archive"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9666
+#: doc/guix.texi:9765
 #, no-wrap
 msgid "archival of source code, Software Heritage"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9669
+#: doc/guix.texi:9768
 msgid "Checks whether the package's source code is archived at @uref{https://www.softwareheritage.org, Software Heritage}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9677
+#: doc/guix.texi:9776
 msgid "When the source code that is not archived comes from a version-control system (VCS)---e.g., it's obtained with @code{git-fetch}, send Software Heritage a ``save'' request so that it eventually archives it.  This ensures that the source will remain available in the long term, and that Guix can fall back to Software Heritage should the source code disappear from its original host.  The status of recent ``save'' requests can be @uref{https://archive.softwareheritage.org/save/#requests, viewed on-line}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9682
+#: doc/guix.texi:9781
 msgid "When source code is a tarball obtained with @code{url-fetch}, simply print a message when it is not archived.  As of this writing, Software Heritage does not allow requests to save arbitrary tarballs; we are working on ways to ensure that non-VCS source code is also archived."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9688
+#: doc/guix.texi:9787
 msgid "Software Heritage @uref{https://archive.softwareheritage.org/api/#rate-limiting, limits the request rate per IP address}.  When the limit is reached, @command{guix lint} prints a message and the @code{archival} checker stops doing anything until that limit has been reset."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9689
+#: doc/guix.texi:9788
 #, no-wrap
 msgid "cve"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9690 doc/guix.texi:27830
+#: doc/guix.texi:9789 doc/guix.texi:28113
 #, no-wrap
 msgid "security vulnerabilities"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9691
+#: doc/guix.texi:9790
 #, no-wrap
 msgid "CVE, Common Vulnerabilities and Exposures"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9696
+#: doc/guix.texi:9795
 msgid "Report known vulnerabilities found in the Common Vulnerabilities and Exposures (CVE) databases of the current and past year @uref{https://nvd.nist.gov/vuln/data-feeds, published by the US NIST}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9698
+#: doc/guix.texi:9797
 msgid "To view information about a particular vulnerability, visit pages such as:"
 msgstr ""
 
 #. type: indicateurl{#1}
-#: doc/guix.texi:9702
+#: doc/guix.texi:9801
 msgid "https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-YYYY-ABCD"
 msgstr ""
 
 #. type: indicateurl{#1}
-#: doc/guix.texi:9704
+#: doc/guix.texi:9803
 msgid "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-YYYY-ABCD"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9709
+#: doc/guix.texi:9808
 msgid "where @code{CVE-YYYY-ABCD} is the CVE identifier---e.g., @code{CVE-2015-7554}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9714
+#: doc/guix.texi:9813
 msgid "Package developers can specify in package recipes the @uref{https://nvd.nist.gov/products/cpe,Common Platform Enumeration (CPE)} name and version of the package when they differ from the name or version that Guix uses, as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:9722
+#: doc/guix.texi:9821
 #, no-wrap
 msgid ""
 "(package\n"
@@ -17662,12 +18017,12 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9729
+#: doc/guix.texi:9828
 msgid "Some entries in the CVE database do not specify which version of a package they apply to, and would thus ``stick around'' forever.  Package developers who found CVE alerts and verified they can be ignored can declare them as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:9739
+#: doc/guix.texi:9838
 #, no-wrap
 msgid ""
 "(package\n"
@@ -17681,91 +18036,91 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9741
+#: doc/guix.texi:9840
 #, no-wrap
 msgid "formatting"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9744
+#: doc/guix.texi:9843
 msgid "Warn about obvious source code formatting issues: trailing white space, use of tabulations, etc."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9750
+#: doc/guix.texi:9849
 #, no-wrap
 msgid "guix lint @var{options} @var{package}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9754
+#: doc/guix.texi:9853
 msgid "If no package is given on the command line, then all packages are checked.  The @var{options} may be zero or more of the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9756
+#: doc/guix.texi:9855
 #, no-wrap
 msgid "--list-checkers"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9760
+#: doc/guix.texi:9859
 msgid "List and describe all the available checkers that will be run on packages and exit."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9761
+#: doc/guix.texi:9860
 #, no-wrap
 msgid "--checkers"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9762
+#: doc/guix.texi:9861
 #, no-wrap
 msgid "-c"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9765
+#: doc/guix.texi:9864
 msgid "Only enable the checkers specified in a comma-separated list using the names returned by @code{--list-checkers}."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:9777
+#: doc/guix.texi:9876
 #, no-wrap
 msgid "Invoking @command{guix size}"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:9779 doc/guix.texi:26927
+#: doc/guix.texi:9878 doc/guix.texi:27210
 #, no-wrap
 msgid "size"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9780
+#: doc/guix.texi:9879
 #, no-wrap
 msgid "package size"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:9782
+#: doc/guix.texi:9881
 #, no-wrap
 msgid "guix size"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9789
+#: doc/guix.texi:9888
 msgid "The @command{guix size} command helps package developers profile the disk usage of packages.  It is easy to overlook the impact of an additional dependency added to a package, or the impact of using a single output for a package that could easily be split (@pxref{Packages with Multiple Outputs}).  Such are the typical issues that @command{guix size} can highlight."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9794
+#: doc/guix.texi:9893
 msgid "The command can be passed one or more package specifications such as @code{gcc@@4.8} or @code{guile:debug}, or a file name in the store.  Consider this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9807
+#: doc/guix.texi:9906
 #, no-wrap
 msgid ""
 "$ guix size coreutils\n"
@@ -17782,43 +18137,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9813
+#: doc/guix.texi:9912
 msgid "The store items listed here constitute the @dfn{transitive closure} of Coreutils---i.e., Coreutils and all its dependencies, recursively---as would be returned by:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9816
+#: doc/guix.texi:9915
 #, no-wrap
 msgid "$ guix gc -R /gnu/store/@dots{}-coreutils-8.23\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9824
+#: doc/guix.texi:9923
 msgid "Here the output shows three columns next to store items.  The first column, labeled ``total'', shows the size in mebibytes (MiB) of the closure of the store item---that is, its own size plus the size of all its dependencies.  The next column, labeled ``self'', shows the size of the item itself.  The last column shows the ratio of the size of the item itself to the space occupied by all the items listed here."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9830
+#: doc/guix.texi:9929
 msgid "In this example, we see that the closure of Coreutils weighs in at 79@tie{}MiB, most of which is taken by libc and GCC's run-time support libraries.  (That libc and GCC's libraries represent a large fraction of the closure is not a problem @i{per se} because they are always available on the system anyway.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9839
+#: doc/guix.texi:9938
 msgid "When the package(s) passed to @command{guix size} are available in the store@footnote{More precisely, @command{guix size} looks for the @emph{ungrafted} variant of the given package(s), as returned by @code{guix build @var{package} --no-grafts}.  @xref{Security Updates}, for information on grafts.}, @command{guix size} queries the daemon to determine its dependencies, and measures its size in the store, similar to @command{du -ms --apparent-size} (@pxref{du invocation,,, coreutils, GNU Coreutils})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9844
+#: doc/guix.texi:9943
 msgid "When the given packages are @emph{not} in the store, @command{guix size} reports information based on the available substitutes (@pxref{Substitutes}).  This makes it possible it to profile disk usage of store items that are not even on disk, only available remotely."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9846
+#: doc/guix.texi:9945
 msgid "You can also specify several package names:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9856
+#: doc/guix.texi:9955
 #, no-wrap
 msgid ""
 "$ guix size coreutils grep sed bash\n"
@@ -17832,737 +18187,737 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9862
+#: doc/guix.texi:9961
 msgid "In this example we see that the combination of the four packages takes 102.3@tie{}MiB in total, which is much less than the sum of each closure since they have a lot of dependencies in common."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9864
+#: doc/guix.texi:9963
 msgid "The available options are:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9870
+#: doc/guix.texi:9969
 msgid "Use substitute information from @var{urls}.  @xref{client-substitute-urls, the same option for @code{guix build}}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9871
+#: doc/guix.texi:9970
 #, no-wrap
 msgid "--sort=@var{key}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9873
+#: doc/guix.texi:9972
 msgid "Sort lines according to @var{key}, one of the following options:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9875
+#: doc/guix.texi:9974
 #, no-wrap
 msgid "self"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9877
+#: doc/guix.texi:9976
 msgid "the size of each item (the default);"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9879
+#: doc/guix.texi:9978
 msgid "the total size of the item's closure."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9881
+#: doc/guix.texi:9980
 #, no-wrap
 msgid "--map-file=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9883
+#: doc/guix.texi:9982
 msgid "Write a graphical map of disk usage in PNG format to @var{file}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9885
+#: doc/guix.texi:9984
 msgid "For the example above, the map looks like this:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9888
+#: doc/guix.texi:9987
 msgid "@image{images/coreutils-size-map,5in,, map of Coreutils disk usage produced by @command{guix size}}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9893
+#: doc/guix.texi:9992
 msgid "This option requires that @uref{https://wingolog.org/software/guile-charting/, Guile-Charting} be installed and visible in Guile's module search path.  When that is not the case, @command{guix size} fails as it tries to load it."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9897
+#: doc/guix.texi:9996
 msgid "Consider packages for @var{system}---e.g., @code{x86_64-linux}."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:9908
+#: doc/guix.texi:10007
 #, no-wrap
 msgid "Invoking @command{guix graph}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9910
+#: doc/guix.texi:10009
 #, no-wrap
 msgid "DAG"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:9911
+#: doc/guix.texi:10010
 #, no-wrap
 msgid "guix graph"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9925
+#: doc/guix.texi:10024
 msgid "Packages and their dependencies form a @dfn{graph}, specifically a directed acyclic graph (DAG).  It can quickly become difficult to have a mental model of the package DAG, so the @command{guix graph} command provides a visual representation of the DAG.  By default, @command{guix graph} emits a DAG representation in the input format of @uref{https://www.graphviz.org/, Graphviz}, so its output can be passed directly to the @command{dot} command of Graphviz.  It can also emit an HTML page with embedded JavaScript code to display a ``chord diagram'' in a Web browser, using the @uref{https://d3js.org/, d3.js} library, or emit Cypher queries to construct a graph in a graph database supporting the @uref{https://www.opencypher.org/, openCypher} query language.  The general syntax is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9928
+#: doc/guix.texi:10027
 #, no-wrap
 msgid "guix graph @var{options} @var{package}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9933
+#: doc/guix.texi:10032
 msgid "For example, the following command generates a PDF file representing the package DAG for the GNU@tie{}Core Utilities, showing its build-time dependencies:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9936
+#: doc/guix.texi:10035
 #, no-wrap
 msgid "guix graph coreutils | dot -Tpdf > dag.pdf\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9939
+#: doc/guix.texi:10038
 msgid "The output looks like this:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9941
+#: doc/guix.texi:10040
 msgid "@image{images/coreutils-graph,2in,,Dependency graph of the GNU Coreutils}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9943
+#: doc/guix.texi:10042
 msgid "Nice little graph, no?"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9949
+#: doc/guix.texi:10048
 msgid "But there is more than one graph! The one above is concise: it is the graph of package objects, omitting implicit inputs such as GCC, libc, grep, etc.  It is often useful to have such a concise graph, but sometimes one may want to see more details.  @command{guix graph} supports several types of graphs, allowing you to choose the level of detail:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9955
+#: doc/guix.texi:10054
 msgid "This is the default type used in the example above.  It shows the DAG of package objects, excluding implicit dependencies.  It is concise, but filters out many details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9956
+#: doc/guix.texi:10055
 #, no-wrap
 msgid "reverse-package"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9958
+#: doc/guix.texi:10057
 msgid "This shows the @emph{reverse} DAG of packages.  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9961
+#: doc/guix.texi:10060
 #, no-wrap
 msgid "guix graph --type=reverse-package ocaml\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9966
+#: doc/guix.texi:10065
 msgid "...@: yields the graph of packages that @emph{explicitly} depend on OCaml (if you are also interested in cases where OCaml is an implicit dependency, see @code{reverse-bag} below.)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9971
+#: doc/guix.texi:10070
 msgid "Note that for core packages this can yield huge graphs.  If all you want is to know the number of packages that depend on a given package, use @command{guix refresh --list-dependent} (@pxref{Invoking guix refresh, @option{--list-dependent}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9972
+#: doc/guix.texi:10071
 #, no-wrap
 msgid "bag-emerged"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9974
+#: doc/guix.texi:10073
 msgid "This is the package DAG, @emph{including} implicit inputs."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9976
+#: doc/guix.texi:10075
 msgid "For instance, the following command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9979
+#: doc/guix.texi:10078
 #, no-wrap
 msgid "guix graph --type=bag-emerged coreutils | dot -Tpdf > dag.pdf\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9982
+#: doc/guix.texi:10081
 msgid "...@: yields this bigger graph:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9984
+#: doc/guix.texi:10083
 msgid "@image{images/coreutils-bag-graph,,5in,Detailed dependency graph of the GNU Coreutils}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9987
+#: doc/guix.texi:10086
 msgid "At the bottom of the graph, we see all the implicit inputs of @var{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9991
+#: doc/guix.texi:10090
 msgid "Now, note that the dependencies of these implicit inputs---that is, the @dfn{bootstrap dependencies} (@pxref{Bootstrapping})---are not shown here, for conciseness."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9992
+#: doc/guix.texi:10091
 #, no-wrap
 msgid "bag"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9995
+#: doc/guix.texi:10094
 msgid "Similar to @code{bag-emerged}, but this time including all the bootstrap dependencies."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9996
+#: doc/guix.texi:10095
 #, no-wrap
 msgid "bag-with-origins"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9998
+#: doc/guix.texi:10097
 msgid "Similar to @code{bag}, but also showing origins and their dependencies."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9999
+#: doc/guix.texi:10098
 #, no-wrap
 msgid "reverse-bag"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10002
+#: doc/guix.texi:10101
 msgid "This shows the @emph{reverse} DAG of packages.  Unlike @code{reverse-package}, it also takes implicit dependencies into account.  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10005
+#: doc/guix.texi:10104
 #, no-wrap
 msgid "guix graph -t reverse-bag dune\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10012
+#: doc/guix.texi:10111
 msgid "...@: yields the graph of all packages that depend on Dune, directly or indirectly.  Since Dune is an @emph{implicit} dependency of many packages @i{via} @code{dune-build-system}, this shows a large number of packages, whereas @code{reverse-package} would show very few if any."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10018
+#: doc/guix.texi:10117
 msgid "This is the most detailed representation: It shows the DAG of derivations (@pxref{Derivations}) and plain store items.  Compared to the above representation, many additional nodes are visible, including build scripts, patches, Guile modules, etc."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10021
+#: doc/guix.texi:10120
 msgid "For this type of graph, it is also possible to pass a @file{.drv} file name instead of a package name, as in:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10024
+#: doc/guix.texi:10123
 #, no-wrap
 msgid "guix graph -t derivation `guix system build -d my-config.scm`\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10026
+#: doc/guix.texi:10125
 #, no-wrap
 msgid "module"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10030
+#: doc/guix.texi:10129
 msgid "This is the graph of @dfn{package modules} (@pxref{Package Modules}).  For example, the following command shows the graph for the package module that defines the @code{guile} package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10033
+#: doc/guix.texi:10132
 #, no-wrap
 msgid "guix graph -t module guile | dot -Tpdf > module-graph.pdf\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10038
+#: doc/guix.texi:10137
 msgid "All the types above correspond to @emph{build-time dependencies}.  The following graph type represents the @emph{run-time dependencies}:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10043
+#: doc/guix.texi:10142
 msgid "This is the graph of @dfn{references} of a package output, as returned by @command{guix gc --references} (@pxref{Invoking guix gc})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10046
+#: doc/guix.texi:10145
 msgid "If the given package output is not available in the store, @command{guix graph} attempts to obtain dependency information from substitutes."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10050
+#: doc/guix.texi:10149
 msgid "Here you can also pass a store file name instead of a package name.  For example, the command below produces the reference graph of your profile (which can be big!):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10053
+#: doc/guix.texi:10152
 #, no-wrap
 msgid "guix graph -t references `readlink -f ~/.guix-profile`\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10055
+#: doc/guix.texi:10154
 #, no-wrap
 msgid "referrers"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10058
+#: doc/guix.texi:10157
 msgid "This is the graph of the @dfn{referrers} of a store item, as returned by @command{guix gc --referrers} (@pxref{Invoking guix gc})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10064
+#: doc/guix.texi:10163
 msgid "This relies exclusively on local information from your store.  For instance, let us suppose that the current Inkscape is available in 10 profiles on your machine; @command{guix graph -t referrers inkscape} will show a graph rooted at Inkscape and with those 10 profiles linked to it."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10067
+#: doc/guix.texi:10166
 msgid "It can help determine what is preventing a store item from being garbage collected."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10071
+#: doc/guix.texi:10170
 msgid "The available options are the following:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10077
+#: doc/guix.texi:10176
 msgid "Produce a graph output of @var{type}, where @var{type} must be one of the values listed above."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10078
+#: doc/guix.texi:10177
 #, no-wrap
 msgid "--list-types"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10080
+#: doc/guix.texi:10179
 msgid "List the supported graph types."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10081
+#: doc/guix.texi:10180
 #, no-wrap
 msgid "--backend=@var{backend}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10082
+#: doc/guix.texi:10181
 #, no-wrap
 msgid "-b @var{backend}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10084
+#: doc/guix.texi:10183
 msgid "Produce a graph using the selected @var{backend}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10085
+#: doc/guix.texi:10184
 #, no-wrap
 msgid "--list-backends"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10087
+#: doc/guix.texi:10186
 msgid "List the supported graph backends."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10089
+#: doc/guix.texi:10188
 msgid "Currently, the available backends are Graphviz and d3.js."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10098
+#: doc/guix.texi:10197
 #, no-wrap
 msgid "guix graph -e '(@@@@ (gnu packages commencement) gnu-make-final)'\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10103
+#: doc/guix.texi:10202
 msgid "Display the graph for @var{system}---e.g., @code{i686-linux}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10106
+#: doc/guix.texi:10205
 msgid "The package dependency graph is largely architecture-independent, but there are some architecture-dependent bits that this option allows you to visualize."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10122
+#: doc/guix.texi:10221
 msgid "On top of that, @command{guix graph} supports all the usual package transformation options (@pxref{Package Transformation Options}).  This makes it easy to view the effect of a graph-rewriting transformation such as @option{--with-input}.  For example, the command below outputs the graph of @code{git} once @code{openssl} has been replaced by @code{libressl} everywhere in the graph:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10125
+#: doc/guix.texi:10224
 #, no-wrap
 msgid "guix graph git --with-input=openssl=libressl\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10128
+#: doc/guix.texi:10227
 msgid "So many possibilities, so much fun!"
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:10130
+#: doc/guix.texi:10229
 #, no-wrap
 msgid "Invoking @command{guix publish}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:10132
+#: doc/guix.texi:10231
 #, no-wrap
 msgid "guix publish"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10136
+#: doc/guix.texi:10235
 msgid "The purpose of @command{guix publish} is to enable users to easily share their store with others, who can then use it as a substitute server (@pxref{Substitutes})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10142
+#: doc/guix.texi:10241
 msgid "When @command{guix publish} runs, it spawns an HTTP server which allows anyone with network access to obtain substitutes from it.  This means that any machine running Guix can also act as if it were a build farm, since the HTTP interface is compatible with Cuirass, the software behind the @code{@value{SUBSTITUTE-SERVER}} build farm."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10148
+#: doc/guix.texi:10247
 msgid "For security, each substitute is signed, allowing recipients to check their authenticity and integrity (@pxref{Substitutes}).  Because @command{guix publish} uses the signing key of the system, which is only readable by the system administrator, it must be started as root; the @code{--user} option makes it drop root privileges early on."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10152
+#: doc/guix.texi:10251
 msgid "The signing key pair must be generated before @command{guix publish} is launched, using @command{guix archive --generate-key} (@pxref{Invoking guix archive})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10157
+#: doc/guix.texi:10256
 #, no-wrap
 msgid "guix publish @var{options}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10161
+#: doc/guix.texi:10260
 msgid "Running @command{guix publish} without any additional arguments will spawn an HTTP server on port 8080:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10164
+#: doc/guix.texi:10263
 #, no-wrap
 msgid "guix publish\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10168
+#: doc/guix.texi:10267
 msgid "Once a publishing server has been authorized (@pxref{Invoking guix archive}), the daemon may download substitutes from it:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10171
+#: doc/guix.texi:10270
 #, no-wrap
 msgid "guix-daemon --substitute-urls=http://example.org:8080\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10180
+#: doc/guix.texi:10279
 msgid "By default, @command{guix publish} compresses archives on the fly as it serves them.  This ``on-the-fly'' mode is convenient in that it requires no setup and is immediately available.  However, when serving lots of clients, we recommend using the @option{--cache} option, which enables caching of the archives before they are sent to clients---see below for details.  The @command{guix weather} command provides a handy way to check what a server provides (@pxref{Invoking guix weather})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10187
+#: doc/guix.texi:10286
 msgid "As a bonus, @command{guix publish} also serves as a content-addressed mirror for source files referenced in @code{origin} records (@pxref{origin Reference}).  For instance, assuming @command{guix publish} is running on @code{example.org}, the following URL returns the raw @file{hello-2.10.tar.gz} file with the given SHA256 hash (represented in @code{nix-base32} format, @pxref{Invoking guix hash}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10190
+#: doc/guix.texi:10289
 #, no-wrap
 msgid "http://example.org/file/hello-2.10.tar.gz/sha256/0ssi1@dots{}ndq1i\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10194
+#: doc/guix.texi:10293
 msgid "Obviously, these URLs only work for files that are in the store; in other cases, they return 404 (``Not Found'')."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10195
+#: doc/guix.texi:10294
 #, no-wrap
 msgid "build logs, publication"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10197
+#: doc/guix.texi:10296
 msgid "Build logs are available from @code{/log} URLs like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10200
+#: doc/guix.texi:10299
 #, no-wrap
 msgid "http://example.org/log/gwspk@dots{}-guile-2.2.3\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10210
+#: doc/guix.texi:10309
 msgid "When @command{guix-daemon} is configured to save compressed build logs, as is the case by default (@pxref{Invoking guix-daemon}), @code{/log} URLs return the compressed log as-is, with an appropriate @code{Content-Type} and/or @code{Content-Encoding} header.  We recommend running @command{guix-daemon} with @code{--log-compression=gzip} since Web browsers can automatically decompress it, which is not the case with bzip2 compression."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10214
+#: doc/guix.texi:10313
 #, no-wrap
 msgid "--port=@var{port}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10215
+#: doc/guix.texi:10314
 #, no-wrap
 msgid "-p @var{port}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10217
+#: doc/guix.texi:10316
 msgid "Listen for HTTP requests on @var{port}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10218
+#: doc/guix.texi:10317
 #, no-wrap
 msgid "--listen=@var{host}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10221
+#: doc/guix.texi:10320
 msgid "Listen on the network interface for @var{host}.  The default is to accept connections from any interface."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10226
+#: doc/guix.texi:10325
 msgid "Change privileges to @var{user} as soon as possible---i.e., once the server socket is open and the signing key has been read."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10227
+#: doc/guix.texi:10326
 #, fuzzy, no-wrap
 #| msgid "--log-compression=@var{type}"
 msgid "--compression[=@var{method}[:@var{level}]]"
 msgstr "--log-compression=@var{type}"
 
 #. type: itemx
-#: doc/guix.texi:10228
+#: doc/guix.texi:10327
 #, no-wrap
 msgid "-C [@var{method}[:@var{level}]]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10232
+#: doc/guix.texi:10331
 msgid "Compress data using the given @var{method} and @var{level}.  @var{method} is one of @code{lzip} and @code{gzip}; when @var{method} is omitted, @code{gzip} is used."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10236
+#: doc/guix.texi:10335
 msgid "When @var{level} is zero, disable compression.  The range 1 to 9 corresponds to different compression levels: 1 is the fastest, and 9 is the best (CPU-intensive).  The default is 3."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10241
+#: doc/guix.texi:10340
 msgid "Usually, @code{lzip} compresses noticeably better than @code{gzip} for a small increase in CPU usage; see @uref{https://nongnu.org/lzip/lzip_benchmark.html,benchmarks on the lzip Web page}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10250
+#: doc/guix.texi:10349
 msgid "Unless @option{--cache} is used, compression occurs on the fly and the compressed streams are not cached.  Thus, to reduce load on the machine that runs @command{guix publish}, it may be a good idea to choose a low compression level, to run @command{guix publish} behind a caching proxy, or to use @option{--cache}.  Using @option{--cache} has the advantage that it allows @command{guix publish} to add @code{Content-Length} HTTP header to its responses."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10255
+#: doc/guix.texi:10354
 msgid "This option can be repeated, in which case every substitute gets compressed using all the selected methods, and all of them are advertised.  This is useful when users may not support all the compression methods: they can select the one they support."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10256
+#: doc/guix.texi:10355
 #, no-wrap
 msgid "--cache=@var{directory}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10257
+#: doc/guix.texi:10356
 #, no-wrap
 msgid "-c @var{directory}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10260
+#: doc/guix.texi:10359
 msgid "Cache archives and meta-data (@code{.narinfo} URLs) to @var{directory} and only serve archives that are in cache."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10268
+#: doc/guix.texi:10367
 msgid "When this option is omitted, archives and meta-data are created on-the-fly.  This can reduce the available bandwidth, especially when compression is enabled, since this may become CPU-bound.  Another drawback of the default mode is that the length of archives is not known in advance, so @command{guix publish} does not add a @code{Content-Length} HTTP header to its responses, which in turn prevents clients from knowing the amount of data being downloaded."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10276
+#: doc/guix.texi:10375
 msgid "Conversely, when @option{--cache} is used, the first request for a store item (@i{via} a @code{.narinfo} URL) returns 404 and triggers a background process to @dfn{bake} the archive---computing its @code{.narinfo} and compressing the archive, if needed.  Once the archive is cached in @var{directory}, subsequent requests succeed and are served directly from the cache, which guarantees that clients get the best possible bandwidth."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10280
+#: doc/guix.texi:10379
 msgid "The ``baking'' process is performed by worker threads.  By default, one thread per CPU core is created, but this can be customized.  See @option{--workers} below."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10283
+#: doc/guix.texi:10382
 msgid "When @option{--ttl} is used, cached entries are automatically deleted when they have expired."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10284
+#: doc/guix.texi:10383
 #, no-wrap
 msgid "--workers=@var{N}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10287
+#: doc/guix.texi:10386
 msgid "When @option{--cache} is used, request the allocation of @var{N} worker threads to ``bake'' archives."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10288
+#: doc/guix.texi:10387
 #, no-wrap
 msgid "--ttl=@var{ttl}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10292
+#: doc/guix.texi:10391
 msgid "Produce @code{Cache-Control} HTTP headers that advertise a time-to-live (TTL) of @var{ttl}.  @var{ttl} must denote a duration: @code{5d} means 5 days, @code{1m} means 1 month, and so on."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10297
+#: doc/guix.texi:10396
 msgid "This allows the user's Guix to keep substitute information in cache for @var{ttl}.  However, note that @code{guix publish} does not itself guarantee that the store items it provides will indeed remain available for as long as @var{ttl}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10301
+#: doc/guix.texi:10400
 msgid "Additionally, when @option{--cache} is used, cached entries that have not been accessed for @var{ttl} and that no longer have a corresponding item in the store, may be deleted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10302
+#: doc/guix.texi:10401
 #, no-wrap
 msgid "--nar-path=@var{path}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10305
+#: doc/guix.texi:10404
 msgid "Use @var{path} as the prefix for the URLs of ``nar'' files (@pxref{Invoking guix archive, normalized archives})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10309
+#: doc/guix.texi:10408
 msgid "By default, nars are served at a URL such as @code{/nar/gzip/@dots{}-coreutils-8.25}.  This option allows you to change the @code{/nar} part to @var{path}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10310
+#: doc/guix.texi:10409
 #, no-wrap
 msgid "--public-key=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10311
+#: doc/guix.texi:10410
 #, no-wrap
 msgid "--private-key=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10314
+#: doc/guix.texi:10413
 msgid "Use the specific @var{file}s as the public/private key pair used to sign the store items being published."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10321
+#: doc/guix.texi:10420
 msgid "The files must correspond to the same key pair (the private key is used for signing and the public key is merely advertised in the signature metadata).  They must contain keys in the canonical s-expression format as produced by @command{guix archive --generate-key} (@pxref{Invoking guix archive}).  By default, @file{/etc/guix/signing-key.pub} and @file{/etc/guix/signing-key.sec} are used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10322
+#: doc/guix.texi:10421
 #, no-wrap
 msgid "--repl[=@var{port}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10323
+#: doc/guix.texi:10422
 #, no-wrap
 msgid "-r [@var{port}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10327
+#: doc/guix.texi:10426
 msgid "Spawn a Guile REPL server (@pxref{REPL Servers,,, guile, GNU Guile Reference Manual}) on @var{port} (37146 by default).  This is used primarily for debugging a running @command{guix publish} server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10333
+#: doc/guix.texi:10432
 msgid "Enabling @command{guix publish} on Guix System is a one-liner: just instantiate a @code{guix-publish-service-type} service in the @code{services} field of the @code{operating-system} declaration (@pxref{guix-publish-service-type, @code{guix-publish-service-type}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10336
+#: doc/guix.texi:10435
 msgid "If you are instead running Guix on a ``foreign distro'', follow these instructions:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:10340
+#: doc/guix.texi:10439
 msgid "If your host distro uses the systemd init system:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10345
+#: doc/guix.texi:10444
 #, no-wrap
 msgid ""
 "# ln -s ~root/.guix-profile/lib/systemd/system/guix-publish.service \\\n"
@@ -18571,7 +18926,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10353
+#: doc/guix.texi:10452
 #, no-wrap
 msgid ""
 "# ln -s ~root/.guix-profile/lib/upstart/system/guix-publish.conf /etc/init/\n"
@@ -18579,56 +18934,56 @@ msgid ""
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:10357
+#: doc/guix.texi:10456
 msgid "Otherwise, proceed similarly with your distro's init system."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:10360
+#: doc/guix.texi:10459
 #, no-wrap
 msgid "Invoking @command{guix challenge}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10363
+#: doc/guix.texi:10462
 #, no-wrap
 msgid "verifiable builds"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:10364
+#: doc/guix.texi:10463
 #, no-wrap
 msgid "guix challenge"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10365
+#: doc/guix.texi:10464
 #, no-wrap
 msgid "challenge"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10370
+#: doc/guix.texi:10469
 msgid "Do the binaries provided by this server really correspond to the source code it claims to build? Is a package build process deterministic? These are the questions the @command{guix challenge} command attempts to answer."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10378
+#: doc/guix.texi:10477
 msgid "The former is obviously an important question: Before using a substitute server (@pxref{Substitutes}), one had better @emph{verify} that it provides the right binaries, and thus @emph{challenge} it.  The latter is what enables the former: If package builds are deterministic, then independent builds of the package should yield the exact same result, bit for bit; if a server provides a binary different from the one obtained locally, it may be either corrupt or malicious."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10387
+#: doc/guix.texi:10486
 msgid "We know that the hash that shows up in @file{/gnu/store} file names is the hash of all the inputs of the process that built the file or directory---compilers, libraries, build scripts, etc. (@pxref{Introduction}).  Assuming deterministic build processes, one store file name should map to exactly one build output.  @command{guix challenge} checks whether there is, indeed, a single mapping by comparing the build outputs of several independent builds of any given store item."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10389
+#: doc/guix.texi:10488
 msgid "The command output looks like this:"
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:10401
+#: doc/guix.texi:10500
 #, no-wrap
 msgid ""
 "$ guix challenge --substitute-urls=\"https://@value{SUBSTITUTE-SERVER} https://guix.example.org\"\n"
@@ -18645,7 +19000,7 @@ msgid ""
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:10408
+#: doc/guix.texi:10507
 #, no-wrap
 msgid ""
 "/gnu/store/@dots{}-git-2.5.0 contents differ:\n"
@@ -18658,7 +19013,7 @@ msgid ""
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:10415
+#: doc/guix.texi:10514
 #, no-wrap
 msgid ""
 "/gnu/store/@dots{}-pius-2.1.1 contents differ:\n"
@@ -18671,7 +19026,7 @@ msgid ""
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:10417
+#: doc/guix.texi:10516
 #, no-wrap
 msgid ""
 "@dots{}\n"
@@ -18679,7 +19034,7 @@ msgid ""
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:10422
+#: doc/guix.texi:10521
 #, no-wrap
 msgid ""
 "6,406 store items were analyzed:\n"
@@ -18689,28 +19044,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10430
+#: doc/guix.texi:10529
 msgid "In this example, @command{guix challenge} first scans the store to determine the set of locally-built derivations---as opposed to store items that were downloaded from a substitute server---and then queries all the substitute servers.  It then reports those store items for which the servers obtained a result different from the local build."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10431
+#: doc/guix.texi:10530
 #, no-wrap
 msgid "non-determinism, in package builds"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10442
+#: doc/guix.texi:10541
 msgid "As an example, @code{guix.example.org} always gets a different answer.  Conversely, @code{@value{SUBSTITUTE-SERVER}} agrees with local builds, except in the case of Git.  This might indicate that the build process of Git is non-deterministic, meaning that its output varies as a function of various things that Guix does not fully control, in spite of building packages in isolated environments (@pxref{Features}).  Most common sources of non-determinism include the addition of timestamps in build results, the inclusion of random numbers, and directory listings sorted by inode number.  See @uref{https://reproducible-builds.org/docs/}, for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10445
+#: doc/guix.texi:10544
 msgid "To find out what is wrong with this Git binary, the easiest approach is to run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10450
+#: doc/guix.texi:10549
 #, no-wrap
 msgid ""
 "guix challenge git \\\n"
@@ -18719,17 +19074,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10454
+#: doc/guix.texi:10553
 msgid "This automatically invokes @command{diffoscope}, which displays detailed information about files that differ."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10457
+#: doc/guix.texi:10556
 msgid "Alternately, we can do something along these lines (@pxref{Invoking guix archive}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10462
+#: doc/guix.texi:10561
 #, no-wrap
 msgid ""
 "$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0 \\\n"
@@ -18738,164 +19093,164 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10471
+#: doc/guix.texi:10570
 msgid "This command shows the difference between the files resulting from the local build, and the files resulting from the build on @code{@value{SUBSTITUTE-SERVER}} (@pxref{Overview, Comparing and Merging Files,, diffutils, Comparing and Merging Files}).  The @command{diff} command works great for text files.  When binary files differ, a better option is @uref{https://diffoscope.org/, Diffoscope}, a tool that helps visualize differences for all kinds of files."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10479
+#: doc/guix.texi:10578
 msgid "Once you have done that work, you can tell whether the differences are due to a non-deterministic build process or to a malicious server.  We try hard to remove sources of non-determinism in packages to make it easier to verify substitutes, but of course, this is a process that involves not just Guix, but a large part of the free software community.  In the meantime, @command{guix challenge} is one tool to help address the problem."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10483
+#: doc/guix.texi:10582
 msgid "If you are writing packages for Guix, you are encouraged to check whether @code{@value{SUBSTITUTE-SERVER}} and other substitute servers obtain the same build result as you did with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10486
+#: doc/guix.texi:10585
 #, no-wrap
 msgid "$ guix challenge @var{package}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10491
+#: doc/guix.texi:10590
 msgid "where @var{package} is a package specification such as @code{guile@@2.0} or @code{glibc:debug}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10496
+#: doc/guix.texi:10595
 #, no-wrap
 msgid "guix challenge @var{options} [@var{packages}@dots{}]\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10503
+#: doc/guix.texi:10602
 msgid "When a difference is found between the hash of a locally-built item and that of a server-provided substitute, or among substitutes provided by different servers, the command displays it as in the example above and its exit code is 2 (other non-zero exit codes denote other kinds of errors.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10505
+#: doc/guix.texi:10604
 msgid "The one option that matters is:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10511
+#: doc/guix.texi:10610
 msgid "Consider @var{urls} the whitespace-separated list of substitute source URLs to compare to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10512
+#: doc/guix.texi:10611
 #, fuzzy, no-wrap
 #| msgid "--load=@var{file}"
 msgid "--diff=@var{mode}"
 msgstr "--load=@var{file}"
 
 #. type: table
-#: doc/guix.texi:10514
+#: doc/guix.texi:10613
 msgid "Upon mismatches, show differences according to @var{mode}, one of:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10516
+#: doc/guix.texi:10615
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{simple} (the default)"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:10518
+#: doc/guix.texi:10617
 #, fuzzy
 #| msgid "Show the list of live store files and directories."
 msgid "Show the list of files that differ."
 msgstr "Вывести список живых файлов и директорий склада."
 
 #. type: code{#1}
-#: doc/guix.texi:10519
+#: doc/guix.texi:10618
 #, no-wrap
 msgid "diffoscope"
 msgstr ""
 
 #. type: var{#1}
-#: doc/guix.texi:10520
+#: doc/guix.texi:10619
 #, no-wrap
 msgid "command"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10523
+#: doc/guix.texi:10622
 msgid "Invoke @uref{https://diffoscope.org/, Diffoscope}, passing it two directories whose contents do not match."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10526
+#: doc/guix.texi:10625
 msgid "When @var{command} is an absolute file name, run @var{command} instead of Diffoscope."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10527 doc/guix.texi:13378 doc/guix.texi:14774
+#: doc/guix.texi:10626 doc/guix.texi:13535 doc/guix.texi:14931
 #, no-wrap
 msgid "none"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10529
+#: doc/guix.texi:10628
 msgid "Do not show further details about the differences."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10534
+#: doc/guix.texi:10633
 msgid "Thus, unless @code{--diff=none} is passed, @command{guix challenge} downloads the store items from the given substitute servers so that it can compare them."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10536
+#: doc/guix.texi:10635
 #, no-wrap
 msgid "-v"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10539
+#: doc/guix.texi:10638
 msgid "Show details about matches (identical contents) in addition to information about mismatches."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:10543
+#: doc/guix.texi:10642
 #, no-wrap
 msgid "Invoking @command{guix copy}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10545
+#: doc/guix.texi:10644
 #, no-wrap
 msgid "copy, of store items, over SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10546
+#: doc/guix.texi:10645
 #, no-wrap
 msgid "SSH, copy of store items"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10547
+#: doc/guix.texi:10646
 #, no-wrap
 msgid "sharing store items across machines"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10548
+#: doc/guix.texi:10647
 #, no-wrap
 msgid "transferring store items across machines"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10555
+#: doc/guix.texi:10654
 msgid "The @command{guix copy} command copies items from the store of one machine to that of another machine over a secure shell (SSH)  connection@footnote{This command is available only when Guile-SSH was found.  @xref{Requirements}, for details.}.  For example, the following command copies the @code{coreutils} package, the user's profile, and all their dependencies over to @var{host}, logged in as @var{user}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10559
+#: doc/guix.texi:10658
 #, no-wrap
 msgid ""
 "guix copy --to=@var{user}@@@var{host} \\\n"
@@ -18903,192 +19258,192 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10563
+#: doc/guix.texi:10662
 msgid "If some of the items to be copied are already present on @var{host}, they are not actually sent."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10566
+#: doc/guix.texi:10665
 msgid "The command below retrieves @code{libreoffice} and @code{gimp} from @var{host}, assuming they are available there:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10569
+#: doc/guix.texi:10668
 #, no-wrap
 msgid "guix copy --from=@var{host} libreoffice gimp\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10574
+#: doc/guix.texi:10673
 msgid "The SSH connection is established using the Guile-SSH client, which is compatible with OpenSSH: it honors @file{~/.ssh/known_hosts} and @file{~/.ssh/config}, and uses the SSH agent for authentication."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10580
+#: doc/guix.texi:10679
 msgid "The key used to sign items that are sent must be accepted by the remote machine.  Likewise, the key used by the remote machine to sign items you are retrieving must be in @file{/etc/guix/acl} so it is accepted by your own daemon.  @xref{Invoking guix archive}, for more information about store item authentication."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10585
+#: doc/guix.texi:10684
 #, no-wrap
 msgid "guix copy [--to=@var{spec}|--from=@var{spec}] @var{items}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10588
+#: doc/guix.texi:10687
 msgid "You must always specify one of the following options:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10590
+#: doc/guix.texi:10689
 #, no-wrap
 msgid "--to=@var{spec}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10591
+#: doc/guix.texi:10690
 #, no-wrap
 msgid "--from=@var{spec}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10595
+#: doc/guix.texi:10694
 msgid "Specify the host to send to or receive from.  @var{spec} must be an SSH spec such as @code{example.org}, @code{charlie@@example.org}, or @code{charlie@@example.org:2222}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10599
+#: doc/guix.texi:10698
 msgid "The @var{items} can be either package names, such as @code{gimp}, or store items, such as @file{/gnu/store/@dots{}-idutils-4.6}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10603
+#: doc/guix.texi:10702
 msgid "When specifying the name of a package to send, it is first built if needed, unless @option{--dry-run} was specified.  Common build options are supported (@pxref{Common Build Options})."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:10606
+#: doc/guix.texi:10705
 #, no-wrap
 msgid "Invoking @command{guix container}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:10608
+#: doc/guix.texi:10707
 #, no-wrap
 msgid "guix container"
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:10612
+#: doc/guix.texi:10711
 msgid "As of version @value{VERSION}, this tool is experimental.  The interface is subject to radical change in the future."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10619
+#: doc/guix.texi:10718
 msgid "The purpose of @command{guix container} is to manipulate processes running within an isolated environment, commonly known as a ``container'', typically created by the @command{guix environment} (@pxref{Invoking guix environment}) and @command{guix system container} (@pxref{Invoking guix system}) commands."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10624
+#: doc/guix.texi:10723
 #, no-wrap
 msgid "guix container @var{action} @var{options}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10628
+#: doc/guix.texi:10727
 msgid "@var{action} specifies the operation to perform with a container, and @var{options} specifies the context-specific arguments for the action."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10630
+#: doc/guix.texi:10729
 msgid "The following actions are available:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10632
+#: doc/guix.texi:10731
 #, no-wrap
 msgid "exec"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10634
+#: doc/guix.texi:10733
 msgid "Execute a command within the context of a running container."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10636
+#: doc/guix.texi:10735
 msgid "The syntax is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10639
+#: doc/guix.texi:10738
 #, no-wrap
 msgid "guix container exec @var{pid} @var{program} @var{arguments}@dots{}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10645
+#: doc/guix.texi:10744
 msgid "@var{pid} specifies the process ID of the running container.  @var{program} specifies an executable file name within the root file system of the container.  @var{arguments} are the additional options that will be passed to @var{program}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10649
+#: doc/guix.texi:10748
 msgid "The following command launches an interactive login shell inside a Guix system container, started by @command{guix system container}, and whose process ID is 9001:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10652
+#: doc/guix.texi:10751
 #, no-wrap
 msgid "guix container exec 9001 /run/current-system/profile/bin/bash --login\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10656
+#: doc/guix.texi:10755
 msgid "Note that the @var{pid} cannot be the parent process of a container.  It must be PID 1 of the container or one of its child processes."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:10660
+#: doc/guix.texi:10759
 #, no-wrap
 msgid "Invoking @command{guix weather}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10669
+#: doc/guix.texi:10768
 msgid "Occasionally you're grumpy because substitutes are lacking and you end up building packages by yourself (@pxref{Substitutes}).  The @command{guix weather} command reports on substitute availability on the specified servers so you can have an idea of whether you'll be grumpy today.  It can sometimes be useful info as a user, but it is primarily useful to people running @command{guix publish} (@pxref{Invoking guix publish})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10670
+#: doc/guix.texi:10769
 #, no-wrap
 msgid "statistics, for substitutes"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10671
+#: doc/guix.texi:10770
 #, no-wrap
 msgid "availability of substitutes"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10672
+#: doc/guix.texi:10771
 #, no-wrap
 msgid "substitute availability"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10673
+#: doc/guix.texi:10772
 #, no-wrap
 msgid "weather, substitute availability"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10675
+#: doc/guix.texi:10774
 msgid "Here's a sample run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10687
+#: doc/guix.texi:10786
 #, no-wrap
 msgid ""
 "$ guix weather --substitute-urls=https://guix.example.org\n"
@@ -19105,7 +19460,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10697
+#: doc/guix.texi:10796
 #, no-wrap
 msgid ""
 "  9.8% (342 out of 3,470) of the missing items are queued\n"
@@ -19120,67 +19475,81 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10699
+#: doc/guix.texi:10798
 #, no-wrap
 msgid "continuous integration, statistics"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10710
+#: doc/guix.texi:10809
 msgid "As you can see, it reports the fraction of all the packages for which substitutes are available on the server---regardless of whether substitutes are enabled, and regardless of whether this server's signing key is authorized.  It also reports the size of the compressed archives (``nars'') provided by the server, the size the corresponding store items occupy in the store (assuming deduplication is turned off), and the server's throughput.  The second part gives continuous integration (CI) statistics, if the server supports it.  In addition, using the @option{--coverage} option, @command{guix weather} can list ``important'' package substitutes missing on the server (see below)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10716
+#: doc/guix.texi:10815
 msgid "To achieve that, @command{guix weather} queries over HTTP(S) meta-data (@dfn{narinfos}) for all the relevant store items.  Like @command{guix challenge}, it ignores signatures on those substitutes, which is innocuous since the command only gathers statistics and cannot install those substitutes."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10721
+#: doc/guix.texi:10820
 #, fuzzy, no-wrap
 #| msgid "guix environment @var{options} @var{package}@dots{}\n"
 msgid "guix weather @var{options}@dots{} [@var{packages}@dots{}]\n"
 msgstr "guix environment @var{options} @var{package}@dots{}\n"
 
 #. type: Plain text
-#: doc/guix.texi:10728
-msgid "When @var{packages} is omitted, @command{guix weather} checks the availability of substitutes for @emph{all} the packages, or for those specified with @option{--manifest}; otherwise it only considers the specified packages.  It is also possible to query specific system types with @option{--system}.  The available options are listed below."
+#: doc/guix.texi:10828
+msgid "When @var{packages} is omitted, @command{guix weather} checks the availability of substitutes for @emph{all} the packages, or for those specified with @option{--manifest}; otherwise it only considers the specified packages.  It is also possible to query specific system types with @option{--system}.  @command{guix weather} exits with a non-zero code when the fraction of available substitutes is below 100%."
 msgstr ""
 
+#. type: Plain text
+#: doc/guix.texi:10830
+#, fuzzy
+#| msgid "The available options are summarized below."
+msgid "The available options are listed below."
+msgstr "Доступные опции резюмированы ниже."
+
 #. type: table
-#: doc/guix.texi:10734
+#: doc/guix.texi:10836
 msgid "@var{urls} is the space-separated list of substitute server URLs to query.  When this option is omitted, the default set of substitute servers is queried."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10740
+#: doc/guix.texi:10842
 msgid "Query substitutes for @var{system}---e.g., @code{aarch64-linux}.  This option can be repeated, in which case @command{guix weather} will query substitutes for several system types."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10746
+#: doc/guix.texi:10848
 msgid "Instead of querying substitutes for all the packages, only ask for those specified in @var{file}.  @var{file} must contain a @dfn{manifest}, as with the @code{-m} option of @command{guix package} (@pxref{Invoking guix package})."
 msgstr ""
 
+#. type: table
+#: doc/guix.texi:10851
+#, fuzzy
+#| msgid "Create an environment for the packages contained in the manifest object returned by the Scheme code in @var{file}."
+msgid "This option can be repeated several times, in which case the manifests are concatenated."
+msgstr "Создать окружение для пакетов, содержащихся в объекте манифеста, возвращаемого кодом Scheme в файле @var{file}."
+
 #. type: item
-#: doc/guix.texi:10747
+#: doc/guix.texi:10852
 #, no-wrap
 msgid "--coverage[=@var{count}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10748
+#: doc/guix.texi:10853
 #, no-wrap
 msgid "-c [@var{count}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10754
+#: doc/guix.texi:10859
 msgid "Report on substitute coverage for packages: list packages with at least @var{count} dependents (zero by default) for which substitutes are unavailable.  Dependent packages themselves are not listed: if @var{b} depends on @var{a} and @var{a} has no substitutes, only @var{a} is listed, even though @var{b} usually lacks substitutes as well.  The result looks like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10768
+#: doc/guix.texi:10873
 #, no-wrap
 msgid ""
 "$ guix weather --substitute-urls=@value{SUBSTITUTE-URL} -c 10\n"
@@ -19198,28 +19567,40 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10773
+#: doc/guix.texi:10878
 msgid "What this example shows is that @code{kcoreaddons} and presumably the 58 packages that depend on it have no substitutes at @code{ci.guix.info}; likewise for @code{qgpgme} and the 46 packages that depend on it."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10777
+#: doc/guix.texi:10882
 msgid "If you are a Guix developer, or if you are taking care of this build farm, you'll probably want to have a closer look at these packages: they may simply fail to build."
 msgstr ""
 
+#. type: item
+#: doc/guix.texi:10883
+#, fuzzy, no-wrap
+#| msgid "--missing"
+msgid "--display-missing"
+msgstr "--missing"
+
+#. type: table
+#: doc/guix.texi:10885
+msgid "Display the list of store items for which substitutes are missing."
+msgstr ""
+
 #. type: section
-#: doc/guix.texi:10780
+#: doc/guix.texi:10888
 #, no-wrap
 msgid "Invoking @command{guix processes}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10788
+#: doc/guix.texi:10896
 msgid "The @command{guix processes} command can be useful to developers and system administrators, especially on multi-user machines and on build farms: it lists the current sessions (connections to the daemon), as well as information about the processes involved@footnote{Remote sessions, when @command{guix-daemon} is started with @option{--listen} specifying a TCP endpoint, are @emph{not} listed.}.  Here's an example of the information it returns:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10794
+#: doc/guix.texi:10902
 #, no-wrap
 msgid ""
 "$ sudo guix processes\n"
@@ -19230,7 +19611,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10798
+#: doc/guix.texi:10906
 #, no-wrap
 msgid ""
 "SessionPID: 19402\n"
@@ -19240,7 +19621,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10808
+#: doc/guix.texi:10916
 #, no-wrap
 msgid ""
 "SessionPID: 19444\n"
@@ -19255,22 +19636,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10815
+#: doc/guix.texi:10923
 msgid "In this example we see that @command{guix-daemon} has three clients: @command{guix environment}, @command{guix publish}, and the Cuirass continuous integration tool; their process identifier (PID) is given by the @code{ClientPID} field.  The @code{SessionPID} field gives the PID of the @command{guix-daemon} sub-process of this particular session."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10822
+#: doc/guix.texi:10930
 msgid "The @code{LockHeld} fields show which store items are currently locked by this session, which corresponds to store items being built or substituted (the @code{LockHeld} field is not displayed when @command{guix processes} is not running as root.)  Last, by looking at the @code{ChildProcess} field, we understand that these three builds are being offloaded (@pxref{Daemon Offload Setup})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10827
+#: doc/guix.texi:10935
 msgid "The output is in Recutils format so we can use the handy @command{recsel} command to select sessions of interest (@pxref{Selection Expressions,,, recutils, GNU recutils manual}).  As an example, the command shows the command line and PID of the client that triggered the build of a Perl package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10833
+#: doc/guix.texi:10941
 #, no-wrap
 msgid ""
 "$ sudo guix processes | \\\n"
@@ -19280,90 +19661,90 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10838
+#: doc/guix.texi:10946
 #, no-wrap
 msgid "system configuration"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10844
+#: doc/guix.texi:10952
 msgid "Guix System supports a consistent whole-system configuration mechanism.  By that we mean that all aspects of the global system configuration---such as the available system services, timezone and locale settings, user accounts---are declared in a single place.  Such a @dfn{system configuration} can be @dfn{instantiated}---i.e., effected."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10854
+#: doc/guix.texi:10962
 msgid "One of the advantages of putting all the system configuration under the control of Guix is that it supports transactional system upgrades, and makes it possible to roll back to a previous system instantiation, should something go wrong with the new one (@pxref{Features}).  Another advantage is that it makes it easy to replicate the exact same configuration across different machines, or at different points in time, without having to resort to additional administration tools layered on top of the own tools of the system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10859
+#: doc/guix.texi:10967
 msgid "This section describes this mechanism.  First we focus on the system administrator's viewpoint---explaining how the system is configured and instantiated.  Then we show how this mechanism can be extended, for instance to support new system services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10888
+#: doc/guix.texi:10996
 msgid "The operating system is configured by providing an @code{operating-system} declaration in a file that can then be passed to the @command{guix system} command (@pxref{Invoking guix system}).  A simple setup, with the default system services, the default Linux-Libre kernel, initial RAM disk, and boot loader looks like this:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10889 doc/guix.texi:26866
+#: doc/guix.texi:10997 doc/guix.texi:27149
 #, no-wrap
 msgid "operating-system"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:10891
+#: doc/guix.texi:10999
 #, no-wrap
 msgid "os-config-bare-bones.texi"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10898
+#: doc/guix.texi:11006
 msgid "This example should be self-describing.  Some of the fields defined above, such as @code{host-name} and @code{bootloader}, are mandatory.  Others, such as @code{packages} and @code{services}, can be omitted, in which case they get a default value."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10903
+#: doc/guix.texi:11011
 msgid "Below we discuss the effect of some of the most important fields (@pxref{operating-system Reference}, for details about all the available fields), and how to @dfn{instantiate} the operating system using @command{guix system}."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:10904
+#: doc/guix.texi:11012
 #, no-wrap
 msgid "Bootloader"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10906
+#: doc/guix.texi:11014
 #, no-wrap
 msgid "legacy boot, on Intel machines"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10907
+#: doc/guix.texi:11015
 #, no-wrap
 msgid "BIOS boot, on Intel machines"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10908
+#: doc/guix.texi:11016
 #, no-wrap
 msgid "UEFI boot"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10909
+#: doc/guix.texi:11017
 #, no-wrap
 msgid "EFI boot"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10915
+#: doc/guix.texi:11023
 msgid "The @code{bootloader} field describes the method that will be used to boot your system.  Machines based on Intel processors can boot in ``legacy'' BIOS mode, as in the example above.  However, more recent machines rely instead on the @dfn{Unified Extensible Firmware Interface} (UEFI) to boot.  In that case, the @code{bootloader} field should contain something along these lines:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10920
+#: doc/guix.texi:11028
 #, no-wrap
 msgid ""
 "(bootloader-configuration\n"
@@ -19372,29 +19753,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10924
+#: doc/guix.texi:11032
 msgid "@xref{Bootloader Configuration}, for more information on the available configuration options."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:10925
+#: doc/guix.texi:11033
 #, no-wrap
 msgid "Globally-Visible Packages"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:10927
+#: doc/guix.texi:11035
 #, no-wrap
 msgid "%base-packages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10940
+#: doc/guix.texi:11048
 msgid "The @code{packages} field lists packages that will be globally visible on the system, for all user accounts---i.e., in every user's @code{PATH} environment variable---in addition to the per-user profiles (@pxref{Invoking guix package}).  The @code{%base-packages} variable provides all the tools one would expect for basic user and administrator tasks---including the GNU Core Utilities, the GNU Networking Utilities, the GNU Zile lightweight text editor, @command{find}, @command{grep}, etc.  The example above adds GNU@tie{}Screen to those, taken from the @code{(gnu packages screen)} module (@pxref{Package Modules}).  The @code{(list package output)} syntax can be used to add a specific output of a package:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10944
+#: doc/guix.texi:11052
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages))\n"
@@ -19403,7 +19784,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10949
+#: doc/guix.texi:11057
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -19413,18 +19794,18 @@ msgid ""
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:10951
+#: doc/guix.texi:11059
 #, no-wrap
 msgid "specification->package"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10960
+#: doc/guix.texi:11068
 msgid "Referring to packages by variable name, like @code{bind} above, has the advantage of being unambiguous; it also allows typos and such to be diagnosed right away as ``unbound variables''.  The downside is that one needs to know which module defines which package, and to augment the @code{use-package-modules} line accordingly.  To avoid that, one can use the @code{specification->package} procedure of the @code{(gnu packages)} module, which returns the best package for a given name or name and version:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10963
+#: doc/guix.texi:11071
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages))\n"
@@ -19432,7 +19813,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10969
+#: doc/guix.texi:11077
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -19443,52 +19824,52 @@ msgid ""
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:10971
+#: doc/guix.texi:11079
 #, no-wrap
 msgid "System Services"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10973 doc/guix.texi:25809 doc/guix.texi:27079
+#: doc/guix.texi:11081 doc/guix.texi:26072 doc/guix.texi:27362
 #, no-wrap
 msgid "services"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:10974
+#: doc/guix.texi:11082
 #, no-wrap
 msgid "%base-services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10984
+#: doc/guix.texi:11092
 msgid "The @code{services} field lists @dfn{system services} to be made available when the system starts (@pxref{Services}).  The @code{operating-system} declaration above specifies that, in addition to the basic services, we want the OpenSSH secure shell daemon listening on port 2222 (@pxref{Networking Services, @code{openssh-service-type}}).  Under the hood, @code{openssh-service-type} arranges so that @command{sshd} is started with the right command-line options, possibly with supporting configuration files generated as needed (@pxref{Defining Services})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10985
+#: doc/guix.texi:11093
 #, no-wrap
 msgid "customization, of services"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:10986
+#: doc/guix.texi:11094
 #, no-wrap
 msgid "modify-services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10990
+#: doc/guix.texi:11098
 msgid "Occasionally, instead of using the base services as is, you will want to customize them.  To do this, use @code{modify-services} (@pxref{Service Reference, @code{modify-services}}) to modify the list."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10995
+#: doc/guix.texi:11103
 msgid "For example, suppose you want to modify @code{guix-daemon} and Mingetty (the console log-in) in the @code{%base-services} list (@pxref{Base Services, @code{%base-services}}).  To do that, you can write the following in your operating system declaration:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11008
+#: doc/guix.texi:11116
 #, no-wrap
 msgid ""
 "(define %my-services\n"
@@ -19506,7 +19887,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11012
+#: doc/guix.texi:11120
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -19515,49 +19896,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11023
+#: doc/guix.texi:11131
 msgid "This changes the configuration---i.e., the service parameters---of the @code{guix-service-type} instance, and that of all the @code{mingetty-service-type} instances in the @code{%base-services} list.  Observe how this is accomplished: first, we arrange for the original configuration to be bound to the identifier @code{config} in the @var{body}, and then we write the @var{body} so that it evaluates to the desired configuration.  In particular, notice how we use @code{inherit} to create a new configuration which has the same values as the old configuration, but with a few modifications."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11030
+#: doc/guix.texi:11138
 msgid "The configuration for a typical ``desktop'' usage, with an encrypted root partition, the X11 display server, GNOME and Xfce (users can choose which of these desktop environments to use at the log-in screen by pressing @kbd{F1}), network management, power management, and more, would look like this:"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:11032
+#: doc/guix.texi:11140
 #, no-wrap
 msgid "os-config-desktop.texi"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11037
+#: doc/guix.texi:11145
 msgid "A graphical system with a choice of lightweight window managers instead of full-blown desktop environments would look like this:"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:11039
+#: doc/guix.texi:11147
 #, no-wrap
 msgid "os-config-lightweight-desktop.texi"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11045
+#: doc/guix.texi:11153
 msgid "This example refers to the @file{/boot/efi} file system by its UUID, @code{1234-ABCD}.  Replace this UUID with the right UUID on your system, as returned by the @command{blkid} command."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11049
+#: doc/guix.texi:11157
 msgid "@xref{Desktop Services}, for the exact list of services provided by @code{%desktop-services}.  @xref{X.509 Certificates}, for background information about the @code{nss-certs} package that is used here."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11056
+#: doc/guix.texi:11164
 msgid "Again, @code{%desktop-services} is just a list of service objects.  If you want to remove services from there, you can do so using the procedures for list filtering (@pxref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile Reference Manual}).  For instance, the following expression returns a list that contains all the services in @code{%desktop-services} minus the Avahi service:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11061
+#: doc/guix.texi:11169
 #, no-wrap
 msgid ""
 "(remove (lambda (service)\n"
@@ -19566,322 +19947,334 @@ msgid ""
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:11063
+#: doc/guix.texi:11171
 #, no-wrap
 msgid "Instantiating the System"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11070
+#: doc/guix.texi:11178
 msgid "Assuming the @code{operating-system} declaration is stored in the @file{my-system-config.scm} file, the @command{guix system reconfigure my-system-config.scm} command instantiates that configuration, and makes it the default GRUB boot entry (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11078
+#: doc/guix.texi:11186
 msgid "The normal way to change the system configuration is by updating this file and re-running @command{guix system reconfigure}.  One should never have to touch files in @file{/etc} or to run commands that modify the system state such as @command{useradd} or @command{grub-install}.  In fact, you must avoid that since that would not only void your warranty but also prevent you from rolling back to previous versions of your system, should you ever need to."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11079
+#: doc/guix.texi:11187
 #, no-wrap
 msgid "roll-back, of the operating system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11089
+#: doc/guix.texi:11197
 msgid "Speaking of roll-back, each time you run @command{guix system reconfigure}, a new @dfn{generation} of the system is created---without modifying or deleting previous generations.  Old system generations get an entry in the bootloader boot menu, allowing you to boot them in case something went wrong with the latest generation.  Reassuring, no? The @command{guix system list-generations} command lists the system generations available on disk.  It is also possible to roll back the system via the commands @command{guix system roll-back} and @command{guix system switch-generation}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11095
+#: doc/guix.texi:11203
 msgid "Although the @command{guix system reconfigure} command will not modify previous generations, you must take care when the current generation is not the latest (e.g., after invoking @command{guix system roll-back}), since the operation might overwrite a later generation (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:11096
+#: doc/guix.texi:11204
 #, no-wrap
 msgid "The Programming Interface"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11101
+#: doc/guix.texi:11209
 msgid "At the Scheme level, the bulk of an @code{operating-system} declaration is instantiated with the following monadic procedure (@pxref{The Store Monad}):"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11102
+#: doc/guix.texi:11210
 #, no-wrap
 msgid "{Monadic Procedure} operating-system-derivation os"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11105
+#: doc/guix.texi:11213
 msgid "Return a derivation that builds @var{os}, an @code{operating-system} object (@pxref{Derivations})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11109
+#: doc/guix.texi:11217
 msgid "The output of the derivation is a single directory that refers to all the packages, configuration files, and other supporting files needed to instantiate @var{os}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11114
+#: doc/guix.texi:11222
 msgid "This procedure is provided by the @code{(gnu system)} module.  Along with @code{(gnu services)} (@pxref{Services}), this module contains the guts of Guix System.  Make sure to visit it!"
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:11117
+#: doc/guix.texi:11225
 #, no-wrap
 msgid "@code{operating-system} Reference"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11122
+#: doc/guix.texi:11230
 msgid "This section summarizes all the options available in @code{operating-system} declarations (@pxref{Using the Configuration System})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11123
+#: doc/guix.texi:11231
 #, no-wrap
 msgid "{Data Type} operating-system"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11127
+#: doc/guix.texi:11235
 msgid "This is the data type representing an operating system configuration.  By that, we mean all the global system configuration, not per-user configuration (@pxref{Using the Configuration System})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11129
+#: doc/guix.texi:11237
 #, no-wrap
 msgid "@code{kernel} (default: @var{linux-libre})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11133
+#: doc/guix.texi:11241
 msgid "The package object of the operating system kernel to use@footnote{Currently only the Linux-libre kernel is supported.  In the future, it will be possible to use the GNU@tie{}Hurd.}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11134
+#: doc/guix.texi:11242
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{kernel-loadable-modules} (default: '())"
+msgstr "@code{features} (default: @code{'()})"
+
+#. type: table
+#: doc/guix.texi:11245
+msgid "A list of objects (usually packages) to collect loadable kernel modules from--e.g. @code{(list ddcci-driver-linux)}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11246
 #, no-wrap
 msgid "@code{kernel-arguments} (default: @code{'(\"quiet\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11137
+#: doc/guix.texi:11249
 msgid "List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., @code{(\"console=ttyS0\")}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11138 doc/guix.texi:26020 doc/guix.texi:26039
+#: doc/guix.texi:11250 doc/guix.texi:26283 doc/guix.texi:26302
 #, no-wrap
 msgid "bootloader"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11140
+#: doc/guix.texi:11252
 msgid "The system bootloader configuration object.  @xref{Bootloader Configuration}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11141 doc/guix.texi:26159
+#: doc/guix.texi:11253 doc/guix.texi:26422
 #, no-wrap
 msgid "label"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11144
+#: doc/guix.texi:11256
 msgid "This is the label (a string) as it appears in the bootloader's menu entry.  The default label includes the kernel name and version."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11145 doc/guix.texi:14599 doc/guix.texi:26089
+#: doc/guix.texi:11257 doc/guix.texi:14756 doc/guix.texi:26352
 #, no-wrap
 msgid "@code{keyboard-layout} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11149
+#: doc/guix.texi:11261
 msgid "This field specifies the keyboard layout to use in the console.  It can be either @code{#f}, in which case the default keyboard layout is used (usually US English), or a @code{} record."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11154
+#: doc/guix.texi:11266
 msgid "This keyboard layout is in effect as soon as the kernel has booted.  For instance, it is the keyboard layout in effect when you type a passphrase if your root file system is on a @code{luks-device-mapping} mapped device (@pxref{Mapped Devices})."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:11161
+#: doc/guix.texi:11273
 msgid "This does @emph{not} specify the keyboard layout used by the bootloader, nor that used by the graphical display server.  @xref{Bootloader Configuration}, for information on how to specify the bootloader's keyboard layout.  @xref{X Window}, for information on how to specify the keyboard layout used by the X Window System."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11163
+#: doc/guix.texi:11275
 #, no-wrap
 msgid "@code{initrd-modules} (default: @code{%base-initrd-modules})"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11164 doc/guix.texi:25846 doc/guix.texi:25949
-#: doc/guix.texi:26184
+#: doc/guix.texi:11276 doc/guix.texi:26109 doc/guix.texi:26212
+#: doc/guix.texi:26447
 #, no-wrap
 msgid "initrd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11165 doc/guix.texi:25847 doc/guix.texi:25950
+#: doc/guix.texi:11277 doc/guix.texi:26110 doc/guix.texi:26213
 #, no-wrap
 msgid "initial RAM disk"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11168
+#: doc/guix.texi:11280
 msgid "The list of Linux kernel modules that need to be available in the initial RAM disk.  @xref{Initial RAM Disk}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11169
+#: doc/guix.texi:11281
 #, no-wrap
 msgid "@code{initrd} (default: @code{base-initrd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11173
+#: doc/guix.texi:11285
 msgid "A procedure that returns an initial RAM disk for the Linux kernel.  This field is provided to support low-level customization and should rarely be needed for casual use.  @xref{Initial RAM Disk}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11174
+#: doc/guix.texi:11286
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{firmware} (default: @code{%base-firmware})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: cindex
-#: doc/guix.texi:11175
+#: doc/guix.texi:11287
 #, no-wrap
 msgid "firmware"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11177
+#: doc/guix.texi:11289
 msgid "List of firmware packages loadable by the operating system kernel."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11182
+#: doc/guix.texi:11294
 msgid "The default includes firmware needed for Atheros- and Broadcom-based WiFi devices (Linux-libre modules @code{ath9k} and @code{b43-open}, respectively).  @xref{Hardware Considerations}, for more info on supported hardware."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11183 doc/guix.texi:26885
+#: doc/guix.texi:11295 doc/guix.texi:27168
 #, no-wrap
 msgid "host-name"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11185
+#: doc/guix.texi:11297
 msgid "The host name."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11186
+#: doc/guix.texi:11298
 #, no-wrap
 msgid "hosts-file"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11187
+#: doc/guix.texi:11299
 #, no-wrap
 msgid "hosts file"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11192
+#: doc/guix.texi:11304
 msgid "A file-like object (@pxref{G-Expressions, file-like objects}) for use as @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}).  The default is a file with entries for @code{localhost} and @var{host-name}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11193
+#: doc/guix.texi:11305
 #, no-wrap
 msgid "@code{mapped-devices} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11195
+#: doc/guix.texi:11307
 msgid "A list of mapped devices.  @xref{Mapped Devices}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11196
+#: doc/guix.texi:11308
 #, no-wrap
 msgid "file-systems"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11198
+#: doc/guix.texi:11310
 msgid "A list of file systems.  @xref{File Systems}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11199
+#: doc/guix.texi:11311
 #, no-wrap
 msgid "@code{swap-devices} (default: @code{'()})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11200
+#: doc/guix.texi:11312
 #, no-wrap
 msgid "swap devices"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11207
+#: doc/guix.texi:11319
 msgid "A list of strings identifying devices or files to be used for ``swap space'' (@pxref{Memory Concepts,,, libc, The GNU C Library Reference Manual}).  For example, @code{'(\"/dev/sda3\")} or @code{'(\"/swapfile\")}.  It is possible to specify a swap file in a file system on a mapped device, provided that the necessary device mapping and file system are also specified.  @xref{Mapped Devices} and @ref{File Systems}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11208
+#: doc/guix.texi:11320
 #, no-wrap
 msgid "@code{users} (default: @code{%base-user-accounts})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:11209
+#: doc/guix.texi:11321
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{groups} (default: @code{%base-groups})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:11211
+#: doc/guix.texi:11323
 msgid "List of user accounts and groups.  @xref{User Accounts}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11214
+#: doc/guix.texi:11326
 msgid "If the @code{users} list lacks a user account with UID@tie{}0, a ``root'' account with UID@tie{}0 is automatically added."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11215
+#: doc/guix.texi:11327
 #, no-wrap
 msgid "@code{skeletons} (default: @code{(default-skeletons)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11219
+#: doc/guix.texi:11331
 msgid "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 the home directory of newly-created user accounts."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11221
+#: doc/guix.texi:11333
 msgid "For instance, a valid value may look like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11227
+#: doc/guix.texi:11339
 #, no-wrap
 msgid ""
 "`((\".bashrc\" ,(plain-file \"bashrc\" \"echo Hello\\n\"))\n"
@@ -19891,199 +20284,199 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11229
+#: doc/guix.texi:11341
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{issue} (default: @code{%default-issue})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:11232
+#: doc/guix.texi:11344
 msgid "A string denoting the contents of the @file{/etc/issue} file, which is displayed when users log in on a text console."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11233
+#: doc/guix.texi:11345
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{packages} (default: @code{%base-packages})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:11236
+#: doc/guix.texi:11348
 msgid "The set of packages installed in the global profile, which is accessible at @file{/run/current-system/profile}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11240
+#: doc/guix.texi:11352
 msgid "The default set includes core utilities and it is good practice to install non-core utilities in user profiles (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11241
+#: doc/guix.texi:11353
 #, no-wrap
 msgid "timezone"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11243
+#: doc/guix.texi:11355
 msgid "A timezone identifying string---e.g., @code{\"Europe/Paris\"}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11247
+#: doc/guix.texi:11359
 msgid "You can run the @command{tzselect} command to find out which timezone string corresponds to your region.  Choosing an invalid timezone name causes @command{guix system} to fail."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11248
+#: doc/guix.texi:11360
 #, no-wrap
 msgid "@code{locale} (default: @code{\"en_US.utf8\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11251
+#: doc/guix.texi:11363
 msgid "The name of the default locale (@pxref{Locale Names,,, libc, The GNU C Library Reference Manual}).  @xref{Locales}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11252
+#: doc/guix.texi:11364
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{locale-definitions} (default: @code{%default-locale-definitions})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:11255
+#: doc/guix.texi:11367
 msgid "The list of locale definitions to be compiled and that may be used at run time.  @xref{Locales}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11256
+#: doc/guix.texi:11368
 #, no-wrap
 msgid "@code{locale-libcs} (default: @code{(list @var{glibc})})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11260
+#: doc/guix.texi:11372
 msgid "The list of GNU@tie{}libc packages whose locale data and tools are used to build the locale definitions.  @xref{Locales}, for compatibility considerations that justify this option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11261
+#: doc/guix.texi:11373
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{name-service-switch} (default: @code{%default-nss})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:11265
+#: doc/guix.texi:11377
 msgid "Configuration of the libc name service switch (NSS)---a @code{} object.  @xref{Name Service Switch}, for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11266
+#: doc/guix.texi:11378
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{services} (default: @code{%base-services})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:11268
+#: doc/guix.texi:11380
 msgid "A list of service objects denoting system services.  @xref{Services}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11269
+#: doc/guix.texi:11381
 #, no-wrap
 msgid "essential services"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11270
+#: doc/guix.texi:11382
 #, no-wrap
 msgid "@code{essential-services} (default: ...)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11275
+#: doc/guix.texi:11387
 msgid "The list of ``essential services''---i.e., things like instances of @code{system-service-type} and @code{host-name-service-type} (@pxref{Service Reference}), which are derived from the operating system definition itself.  As a user you should @emph{never} need to touch this field."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11276
+#: doc/guix.texi:11388
 #, no-wrap
 msgid "@code{pam-services} (default: @code{(base-pam-services)})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11277
+#: doc/guix.texi:11389
 #, no-wrap
 msgid "PAM"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11278
+#: doc/guix.texi:11390
 #, no-wrap
 msgid "pluggable authentication modules"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11281
+#: doc/guix.texi:11393
 msgid "Linux @dfn{pluggable authentication module} (PAM) services."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11282
+#: doc/guix.texi:11394
 #, no-wrap
 msgid "@code{setuid-programs} (default: @var{%setuid-programs})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11285
+#: doc/guix.texi:11397
 msgid "List of string-valued G-expressions denoting setuid programs.  @xref{Setuid Programs}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11286
+#: doc/guix.texi:11398
 #, no-wrap
 msgid "@code{sudoers-file} (default: @var{%sudoers-specification})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11287
+#: doc/guix.texi:11399
 #, no-wrap
 msgid "sudoers file"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11290
+#: doc/guix.texi:11402
 msgid "The contents of the @file{/etc/sudoers} file as a file-like object (@pxref{G-Expressions, @code{local-file} and @code{plain-file}})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11295
+#: doc/guix.texi:11407
 msgid "This file specifies which users can use the @command{sudo} command, what they are allowed to do, and what privileges they may gain.  The default is that only @code{root} and members of the @code{wheel} group may use @code{sudo}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11298
+#: doc/guix.texi:11410
 #, no-wrap
 msgid "{Scheme Syntax} this-operating-system"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11301
+#: doc/guix.texi:11413
 msgid "When used in the @emph{lexical scope} of an operating system field definition, this identifier resolves to the operating system being defined."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11304
+#: doc/guix.texi:11416
 msgid "The example below shows how to refer to the operating system being defined in the definition of the @code{label} field:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11307 doc/guix.texi:14144
+#: doc/guix.texi:11419 doc/guix.texi:14301
 #, no-wrap
 msgid ""
 "(use-modules (gnu) (guix))\n"
@@ -20091,7 +20484,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11312
+#: doc/guix.texi:11424
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -20101,17 +20494,17 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11316
+#: doc/guix.texi:11428
 msgid "It is an error to refer to @code{this-operating-system} outside an operating system definition."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11327
+#: doc/guix.texi:11439
 msgid "The list of file systems to be mounted is specified in the @code{file-systems} field of the operating system declaration (@pxref{Using the Configuration System}).  Each file system is declared using the @code{file-system} form, like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11333
+#: doc/guix.texi:11445
 #, no-wrap
 msgid ""
 "(file-system\n"
@@ -20121,67 +20514,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11337
+#: doc/guix.texi:11449
 msgid "As usual, some of the fields are mandatory---those shown in the example above---while others can be omitted.  These are described below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11338
+#: doc/guix.texi:11450
 #, no-wrap
 msgid "{Data Type} file-system"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11341
+#: doc/guix.texi:11453
 msgid "Objects of this type represent file systems to be mounted.  They contain the following members:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11343 doc/guix.texi:11537
+#: doc/guix.texi:11455 doc/guix.texi:11649
 #, no-wrap
 msgid "type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11346
+#: doc/guix.texi:11458
 msgid "This is a string specifying the type of the file system---e.g., @code{\"ext4\"}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11347
+#: doc/guix.texi:11459
 #, no-wrap
 msgid "mount-point"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11349
+#: doc/guix.texi:11461
 msgid "This designates the place where the file system is to be mounted."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11350
+#: doc/guix.texi:11462
 #, no-wrap
 msgid "device"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11360
+#: doc/guix.texi:11472
 msgid "This names the ``source'' of the file system.  It can be one of three things: a file system label, a file system UUID, or the name of a @file{/dev} node.  Labels and UUIDs offer a way to refer to file systems without having to hard-code their actual device name@footnote{Note that, while it is tempting to use @file{/dev/disk/by-uuid} and similar device names to achieve the same result, this is not recommended: These special device nodes are created by the udev daemon and may be unavailable at the time the device is mounted.}."
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:11361
+#: doc/guix.texi:11473
 #, no-wrap
 msgid "file-system-label"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11366
+#: doc/guix.texi:11478
 msgid "File system labels are created using the @code{file-system-label} procedure, UUIDs are created using @code{uuid}, and @file{/dev} node are plain strings.  Here's an example of a file system referred to by its label, as shown by the @command{e2label} command:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11372
+#: doc/guix.texi:11484
 #, no-wrap
 msgid ""
 "(file-system\n"
@@ -20191,18 +20584,18 @@ msgid ""
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:11374
+#: doc/guix.texi:11486
 #, no-wrap
 msgid "uuid"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11382
+#: doc/guix.texi:11494
 msgid "UUIDs are converted from their string representation (as shown by the @command{tune2fs -l} command) using the @code{uuid} form@footnote{The @code{uuid} form expects 16-byte UUIDs as defined in @uref{https://tools.ietf.org/html/rfc4122, RFC@tie{}4122}.  This is the form of UUID used by the ext2 family of file systems and others, but it is different from ``UUIDs'' found in FAT file systems, for instance.}, like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11388
+#: doc/guix.texi:11500
 #, no-wrap
 msgid ""
 "(file-system\n"
@@ -20212,268 +20605,268 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11396
+#: doc/guix.texi:11508
 msgid "When the source of a file system is a mapped device (@pxref{Mapped Devices}), its @code{device} field @emph{must} refer to the mapped device name---e.g., @file{\"/dev/mapper/root-partition\"}.  This is required so that the system knows that mounting the file system depends on having the corresponding device mapping established."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11397
+#: doc/guix.texi:11509
 #, no-wrap
 msgid "@code{flags} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11407
+#: doc/guix.texi:11519
 msgid "This is a list of symbols denoting mount flags.  Recognized flags include @code{read-only}, @code{bind-mount}, @code{no-dev} (disallow access to special files), @code{no-suid} (ignore setuid and setgid bits), @code{no-atime} (do not update file access times), @code{strict-atime} (update file access time), @code{lazy-time} (only update time on the in-memory version of the file inode), and @code{no-exec} (disallow program execution).  @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual}, for more information on these flags."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11408
+#: doc/guix.texi:11520
 #, no-wrap
 msgid "@code{options} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11413
+#: doc/guix.texi:11525
 msgid "This is either @code{#f}, or a string denoting mount options passed to the file system driver.  @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual}, for details and run @command{man 8 mount} for options for various file systems."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11414
+#: doc/guix.texi:11526
 #, no-wrap
 msgid "@code{mount?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11419
+#: doc/guix.texi:11531
 msgid "This value indicates whether to automatically mount the file system when the system is brought up.  When set to @code{#f}, the file system gets an entry in @file{/etc/fstab} (read by the @command{mount} command) but is not automatically mounted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11420
+#: doc/guix.texi:11532
 #, no-wrap
 msgid "@code{needed-for-boot?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11425
+#: doc/guix.texi:11537
 msgid "This Boolean value indicates whether the file system is needed when booting.  If that is true, then the file system is mounted when the initial RAM disk (initrd) is loaded.  This is always the case, for instance, for the root file system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11426
+#: doc/guix.texi:11538
 #, no-wrap
 msgid "@code{check?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11429
+#: doc/guix.texi:11541
 msgid "This Boolean indicates whether the file system needs to be checked for errors before being mounted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11430
+#: doc/guix.texi:11542
 #, no-wrap
 msgid "@code{create-mount-point?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11432
+#: doc/guix.texi:11544
 msgid "When true, the mount point is created if it does not exist yet."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11433
+#: doc/guix.texi:11545
 #, no-wrap
 msgid "@code{dependencies} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11437
+#: doc/guix.texi:11549
 msgid "This is a list of @code{} or @code{} objects representing file systems that must be mounted or mapped devices that must be opened before (and unmounted or closed after) this one."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11441
+#: doc/guix.texi:11553
 msgid "As an example, consider a hierarchy of mounts: @file{/sys/fs/cgroup} is a dependency of @file{/sys/fs/cgroup/cpu} and @file{/sys/fs/cgroup/memory}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11444
+#: doc/guix.texi:11556
 msgid "Another example is a file system that depends on a mapped device, for example for an encrypted partition (@pxref{Mapped Devices})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11449
+#: doc/guix.texi:11561
 msgid "The @code{(gnu system file-systems)} exports the following useful variables."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11450
+#: doc/guix.texi:11562
 #, no-wrap
 msgid "{Scheme Variable} %base-file-systems"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11455
+#: doc/guix.texi:11567
 msgid "These are essential file systems that are required on normal systems, such as @var{%pseudo-terminal-file-system} and @var{%immutable-store} (see below.)  Operating system declarations should always contain at least these."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11457
+#: doc/guix.texi:11569
 #, no-wrap
 msgid "{Scheme Variable} %pseudo-terminal-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11463
+#: doc/guix.texi:11575
 msgid "This is the file system to be mounted as @file{/dev/pts}.  It supports @dfn{pseudo-terminals} created @i{via} @code{openpty} and similar functions (@pxref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}).  Pseudo-terminals are used by terminal emulators such as @command{xterm}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11465
+#: doc/guix.texi:11577
 #, no-wrap
 msgid "{Scheme Variable} %shared-memory-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11469
+#: doc/guix.texi:11581
 msgid "This file system is mounted as @file{/dev/shm} and is used to support memory sharing across processes (@pxref{Memory-mapped I/O, @code{shm_open},, libc, The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11471
+#: doc/guix.texi:11583
 #, no-wrap
 msgid "{Scheme Variable} %immutable-store"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11476
+#: doc/guix.texi:11588
 msgid "This file system performs a read-only ``bind mount'' of @file{/gnu/store}, making it read-only for all the users including @code{root}.  This prevents against accidental modification by software running as @code{root} or by system administrators."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11479
+#: doc/guix.texi:11591
 msgid "The daemon itself is still able to write to the store: it remounts it read-write in its own ``name space.''"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11481
+#: doc/guix.texi:11593
 #, no-wrap
 msgid "{Scheme Variable} %binary-format-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11485
+#: doc/guix.texi:11597
 msgid "The @code{binfmt_misc} file system, which allows handling of arbitrary executable file types to be delegated to user space.  This requires the @code{binfmt.ko} kernel module to be loaded."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11487
+#: doc/guix.texi:11599
 #, no-wrap
 msgid "{Scheme Variable} %fuse-control-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11491
+#: doc/guix.texi:11603
 msgid "The @code{fusectl} file system, which allows unprivileged users to mount and unmount user-space FUSE file systems.  This requires the @code{fuse.ko} kernel module to be loaded."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11496
+#: doc/guix.texi:11608
 #, no-wrap
 msgid "device mapping"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11497
+#: doc/guix.texi:11609
 #, no-wrap
 msgid "mapped devices"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11515
+#: doc/guix.texi:11627
 msgid "The Linux kernel has a notion of @dfn{device mapping}: a block device, such as a hard disk partition, can be @dfn{mapped} into another device, usually in @code{/dev/mapper/}, with additional processing over the data that flows through it@footnote{Note that the GNU@tie{}Hurd makes no difference between the concept of a ``mapped device'' and that of a file system: both boil down to @emph{translating} input/output operations made on a file to operations on its backing store.  Thus, the Hurd implements mapped devices, like file systems, using the generic @dfn{translator} mechanism (@pxref{Translators,,, hurd, The GNU Hurd Reference Manual}).}.  A typical example is encryption device mapping: all writes to the mapped device are encrypted, and all reads are deciphered, transparently.  Guix extends this notion by considering any device or set of devices that are @dfn{transformed} in some way to create a new device; for instance, RAID devices are obtained by @dfn{assembling} several other devices, such as hard disks or partitions, into a new one that behaves as one partition.  Other examples, not yet implemented, are LVM logical volumes."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11518
+#: doc/guix.texi:11630
 msgid "Mapped devices are declared using the @code{mapped-device} form, defined as follows; for examples, see below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11519
+#: doc/guix.texi:11631
 #, no-wrap
 msgid "{Data Type} mapped-device"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11522
+#: doc/guix.texi:11634
 msgid "Objects of this type represent device mappings that will be made when the system boots up."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11528
+#: doc/guix.texi:11640
 msgid "This is either a string specifying the name of the block device to be mapped, such as @code{\"/dev/sda3\"}, or a list of such strings when several devices need to be assembled for creating a new one."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11529 doc/guix.texi:26064
+#: doc/guix.texi:11641 doc/guix.texi:26327
 #, no-wrap
 msgid "target"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11536
+#: doc/guix.texi:11648
 msgid "This string specifies the name of the resulting mapped device.  For kernel mappers such as encrypted devices of type @code{luks-device-mapping}, specifying @code{\"my-partition\"} leads to the creation of the @code{\"/dev/mapper/my-partition\"} device.  For RAID devices of type @code{raid-device-mapping}, the full device name such as @code{\"/dev/md0\"} needs to be given."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11540
+#: doc/guix.texi:11652
 msgid "This must be a @code{mapped-device-kind} object, which specifies how @var{source} is mapped to @var{target}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11543
+#: doc/guix.texi:11655
 #, no-wrap
 msgid "{Scheme Variable} luks-device-mapping"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11547
+#: doc/guix.texi:11659
 msgid "This defines LUKS block device encryption using the @command{cryptsetup} command from the package with the same name.  It relies on the @code{dm-crypt} Linux kernel module."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11549
+#: doc/guix.texi:11661
 #, no-wrap
 msgid "{Scheme Variable} raid-device-mapping"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11554
+#: doc/guix.texi:11666
 msgid "This defines a RAID device, which is assembled using the @code{mdadm} command from the package with the same name.  It requires a Linux kernel module for the appropriate RAID level to be loaded, such as @code{raid456} for RAID-4, RAID-5 or RAID-6, or @code{raid10} for RAID-10."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11556
+#: doc/guix.texi:11668
 #, no-wrap
 msgid "disk encryption"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11557
+#: doc/guix.texi:11669
 #, no-wrap
 msgid "LUKS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11565
+#: doc/guix.texi:11677
 msgid "The following example specifies a mapping from @file{/dev/sda3} to @file{/dev/mapper/home} using LUKS---the @url{https://gitlab.com/cryptsetup/cryptsetup,Linux Unified Key Setup}, a standard mechanism for disk encryption.  The @file{/dev/mapper/home} device can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems})."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11571
+#: doc/guix.texi:11683
 #, no-wrap
 msgid ""
 "(mapped-device\n"
@@ -20483,23 +20876,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11576
+#: doc/guix.texi:11688
 msgid "Alternatively, to become independent of device numbering, one may obtain the LUKS UUID (@dfn{unique identifier}) of the source device by a command like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11579
+#: doc/guix.texi:11691
 #, no-wrap
 msgid "cryptsetup luksUUID /dev/sda3\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11582
+#: doc/guix.texi:11694
 msgid "and use it as follows:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11588
+#: doc/guix.texi:11700
 #, no-wrap
 msgid ""
 "(mapped-device\n"
@@ -20509,23 +20902,23 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11590
+#: doc/guix.texi:11702
 #, no-wrap
 msgid "swap encryption"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11596
+#: doc/guix.texi:11708
 msgid "It is also desirable to encrypt swap space, since swap space may contain sensitive data.  One way to accomplish that is to use a swap file in a file system on a device mapped via LUKS encryption.  In this way, the swap file is encrypted because the entire device is encrypted.  @xref{Preparing for Installation,,Disk Partitioning}, for an example."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11599
+#: doc/guix.texi:11711
 msgid "A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1} may be declared as follows:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11605
+#: doc/guix.texi:11717
 #, no-wrap
 msgid ""
 "(mapped-device\n"
@@ -20535,35 +20928,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11612
+#: doc/guix.texi:11724
 msgid "The @file{/dev/md0} device can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems}).  Note that the RAID level need not be given; it is chosen during the initial creation and formatting of the RAID device and is determined automatically later."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11617
+#: doc/guix.texi:11729
 #, no-wrap
 msgid "users"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11618
+#: doc/guix.texi:11730
 #, no-wrap
 msgid "accounts"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11619
+#: doc/guix.texi:11731
 #, no-wrap
 msgid "user accounts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11623
+#: doc/guix.texi:11735
 msgid "User accounts and groups are entirely managed through the @code{operating-system} declaration.  They are specified with the @code{user-account} and @code{user-group} forms:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11634
+#: doc/guix.texi:11746
 #, no-wrap
 msgid ""
 "(user-account\n"
@@ -20578,149 +20971,149 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11643
+#: doc/guix.texi:11755
 msgid "When booting or upon completion of @command{guix system reconfigure}, the system ensures that only the user accounts and groups specified in the @code{operating-system} declaration exist, and with the specified properties.  Thus, account or group creations or modifications made by directly invoking commands such as @command{useradd} are lost upon reconfiguration or reboot.  This ensures that the system remains exactly as declared."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11644
+#: doc/guix.texi:11756
 #, no-wrap
 msgid "{Data Type} user-account"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11647
+#: doc/guix.texi:11759
 msgid "Objects of this type represent user accounts.  The following members may be specified:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11651
+#: doc/guix.texi:11763
 msgid "The name of the user account."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:11652 doc/guix.texi:25800
+#: doc/guix.texi:11764 doc/guix.texi:26063
 #, no-wrap
 msgid "group"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11653 doc/guix.texi:11720
+#: doc/guix.texi:11765 doc/guix.texi:11832
 #, no-wrap
 msgid "groups"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11656
+#: doc/guix.texi:11768
 msgid "This is the name (a string) or identifier (a number) of the user group this account belongs to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11657
+#: doc/guix.texi:11769
 #, no-wrap
 msgid "@code{supplementary-groups} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11660
+#: doc/guix.texi:11772
 msgid "Optionally, this can be defined as a list of group names that this account belongs to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11661
+#: doc/guix.texi:11773
 #, no-wrap
 msgid "@code{uid} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11665
+#: doc/guix.texi:11777
 msgid "This is the user ID for this account (a number), or @code{#f}.  In the latter case, a number is automatically chosen by the system when the account is created."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11666
+#: doc/guix.texi:11778
 #, no-wrap
 msgid "@code{comment} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11668
+#: doc/guix.texi:11780
 msgid "A comment about the account, such as the account owner's full name."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11669
+#: doc/guix.texi:11781
 #, no-wrap
 msgid "home-directory"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11671
+#: doc/guix.texi:11783
 msgid "This is the name of the home directory for the account."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11672
+#: doc/guix.texi:11784
 #, no-wrap
 msgid "@code{create-home-directory?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11675
+#: doc/guix.texi:11787
 msgid "Indicates whether the home directory of this account should be created if it does not exist yet."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11676
+#: doc/guix.texi:11788
 #, no-wrap
 msgid "@code{shell} (default: Bash)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11679
+#: doc/guix.texi:11791
 msgid "This is a G-expression denoting the file name of a program to be used as the shell (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11680 doc/guix.texi:11738
+#: doc/guix.texi:11792 doc/guix.texi:11850
 #, no-wrap
 msgid "@code{system?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11684
+#: doc/guix.texi:11796
 msgid "This Boolean value indicates whether the account is a ``system'' account.  System accounts are sometimes treated specially; for instance, graphical login managers do not list them."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:11686
+#: doc/guix.texi:11798
 msgid "user-account-password"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11686
+#: doc/guix.texi:11798
 #, no-wrap
 msgid "password, for user accounts"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11687 doc/guix.texi:11742
+#: doc/guix.texi:11799 doc/guix.texi:11854
 #, no-wrap
 msgid "@code{password} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11693
+#: doc/guix.texi:11805
 msgid "You would normally leave this field to @code{#f}, initialize user passwords as @code{root} with the @command{passwd} command, and then let users change it with @command{passwd}.  Passwords set with @command{passwd} are of course preserved across reboot and reconfiguration."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11697
+#: doc/guix.texi:11809
 msgid "If you @emph{do} want to set an initial password for an account, then this field must contain the encrypted password, as a string.  You can use the @code{crypt} procedure for this purpose:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11702
+#: doc/guix.texi:11814
 #, no-wrap
 msgid ""
 "(user-account\n"
@@ -20730,7 +21123,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11705
+#: doc/guix.texi:11817
 #, no-wrap
 msgid ""
 "  ;; Specify a SHA-512-hashed initial password.\n"
@@ -20738,150 +21131,150 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:11711
+#: doc/guix.texi:11823
 msgid "The hash of this initial password will be available in a file in @file{/gnu/store}, readable by all the users, so this method must be used with care."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11716
+#: doc/guix.texi:11828
 msgid "@xref{Passphrase Storage,,, libc, The GNU C Library Reference Manual}, for more information on password encryption, and @ref{Encryption,,, guile, GNU Guile Reference Manual}, for information on Guile's @code{crypt} procedure."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11722
+#: doc/guix.texi:11834
 msgid "User group declarations are even simpler:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11725
+#: doc/guix.texi:11837
 #, no-wrap
 msgid "(user-group (name \"students\"))\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11727
+#: doc/guix.texi:11839
 #, no-wrap
 msgid "{Data Type} user-group"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11729
+#: doc/guix.texi:11841
 msgid "This type is for, well, user groups.  There are just a few fields:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11733
+#: doc/guix.texi:11845
 msgid "The name of the group."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11734
+#: doc/guix.texi:11846
 #, no-wrap
 msgid "@code{id} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11737
+#: doc/guix.texi:11849
 msgid "The group identifier (a number).  If @code{#f}, a new number is automatically allocated when the group is created."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11741
+#: doc/guix.texi:11853
 msgid "This Boolean value indicates whether the group is a ``system'' group.  System groups have low numerical IDs."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11745
+#: doc/guix.texi:11857
 msgid "What, user groups can have a password? Well, apparently yes.  Unless @code{#f}, this field specifies the password of the group."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11751
+#: doc/guix.texi:11863
 msgid "For convenience, a variable lists all the basic user groups one may expect:"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11752
+#: doc/guix.texi:11864
 #, no-wrap
 msgid "{Scheme Variable} %base-groups"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11757
+#: doc/guix.texi:11869
 msgid "This is the list of basic user groups that users and/or packages expect to be present on the system.  This includes groups such as ``root'', ``wheel'', and ``users'', as well as groups used to control access to specific devices such as ``audio'', ``disk'', and ``cdrom''."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11759
+#: doc/guix.texi:11871
 #, no-wrap
 msgid "{Scheme Variable} %base-user-accounts"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11762
+#: doc/guix.texi:11874
 msgid "This is the list of basic system accounts that programs may expect to find on a GNU/Linux system, such as the ``nobody'' account."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11765
+#: doc/guix.texi:11877
 msgid "Note that the ``root'' account is not included here.  It is a special-case and is automatically added whether or not it is specified."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11771
+#: doc/guix.texi:11883
 #, no-wrap
 msgid "keymap"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11779
+#: doc/guix.texi:11891
 msgid "To specify what each key of your keyboard does, you need to tell the operating system what @dfn{keyboard layout} you want to use.  The default, when nothing is specified, is the US English QWERTY layout for 105-key PC keyboards.  However, German speakers will usually prefer the German QWERTZ layout, French speakers will want the AZERTY layout, and so on; hackers might prefer Dvorak or bépo, and they might even want to further customize the effect of some of the keys.  This section explains how to get that done."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11780
+#: doc/guix.texi:11892
 #, no-wrap
 msgid "keyboard layout, definition"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11782
+#: doc/guix.texi:11894
 msgid "There are three components that will want to know about your keyboard layout:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11789
+#: doc/guix.texi:11901
 msgid "The @emph{bootloader} may want to know what keyboard layout you want to use (@pxref{Bootloader Configuration, @code{keyboard-layout}}).  This is useful if you want, for instance, to make sure that you can type the passphrase of your encrypted root partition using the right layout."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11794
+#: doc/guix.texi:11906
 msgid "The @emph{operating system kernel}, Linux, will need that so that the console is properly configured (@pxref{operating-system Reference, @code{keyboard-layout}})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11798
+#: doc/guix.texi:11910
 msgid "The @emph{graphical display server}, usually Xorg, also has its own idea of the keyboard layout (@pxref{X Window, @code{keyboard-layout}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11802
+#: doc/guix.texi:11914
 msgid "Guix allows you to configure all three separately but, fortunately, it allows you to share the same keyboard layout for all three components."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11803
+#: doc/guix.texi:11915
 #, no-wrap
 msgid "XKB, keyboard layouts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11811
+#: doc/guix.texi:11923
 msgid "Keyboard layouts are represented by records created by the @code{keyboard-layout} procedure of @code{(gnu system keyboard)}.  Following the X Keyboard extension (XKB), each layout has four attributes: a name (often a language code such as ``fi'' for Finnish or ``jp'' for Japanese), an optional variant name, an optional keyboard model name, and a possibly empty list of additional options.  In most cases the layout name is all you care about.  Here are a few example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11816
+#: doc/guix.texi:11928
 #, no-wrap
 msgid ""
 ";; The German QWERTZ layout.  Here we assume a standard\n"
@@ -20891,7 +21284,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11819
+#: doc/guix.texi:11931
 #, no-wrap
 msgid ""
 ";; The bépo variant of the French layout.\n"
@@ -20900,7 +21293,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11822
+#: doc/guix.texi:11934
 #, no-wrap
 msgid ""
 ";; The Catalan layout.\n"
@@ -20909,7 +21302,16 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11829
+#: doc/guix.texi:11937
+#, no-wrap
+msgid ""
+";; Arabic layout with \"Alt-Shift\" to switch to US layout.\n"
+"(keyboard-layout \"ar,us\" #:options '(\"grp:alt_shift_toggle\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:11944
 #, no-wrap
 msgid ""
 ";; The Latin American Spanish layout.  In addition, the\n"
@@ -20922,7 +21324,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11832
+#: doc/guix.texi:11947
 #, no-wrap
 msgid ""
 ";; The Russian layout for a ThinkPad keyboard.\n"
@@ -20931,7 +21333,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11837
+#: doc/guix.texi:11952
 #, no-wrap
 msgid ""
 ";; The \"US international\" layout, which is the US layout plus\n"
@@ -20941,29 +21343,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11841
+#: doc/guix.texi:11956
 msgid "See the @file{share/X11/xkb} directory of the @code{xkeyboard-config} package for a complete list of supported layouts, variants, and models."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11842
+#: doc/guix.texi:11957
 #, no-wrap
 msgid "keyboard layout, configuration"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11846
+#: doc/guix.texi:11961
 msgid "Let's say you want your system to use the Turkish keyboard layout throughout your system---bootloader, console, and Xorg.  Here's what your system configuration would look like:"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:11847
+#: doc/guix.texi:11962
 #, no-wrap
 msgid "set-xorg-configuration"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11851
+#: doc/guix.texi:11966
 #, no-wrap
 msgid ""
 ";; Using the Turkish layout for the bootloader, the console,\n"
@@ -20972,7 +21374,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11863
+#: doc/guix.texi:11978
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -20989,76 +21391,76 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11870
+#: doc/guix.texi:11985
 msgid "In the example above, for GRUB and for Xorg, we just refer to the @code{keyboard-layout} field defined above, but we could just as well refer to a different layout.  The @code{set-xorg-configuration} procedure communicates the desired Xorg configuration to the graphical log-in manager, by default GDM."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11873
+#: doc/guix.texi:11988
 msgid "We've discussed how to specify the @emph{default} keyboard layout of your system when it starts, but you can also adjust it at run time:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11878
+#: doc/guix.texi:11993
 msgid "If you're using GNOME, its settings panel has a ``Region & Language'' entry where you can select one or more keyboard layouts."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11883
+#: doc/guix.texi:11998
 msgid "Under Xorg, the @command{setxkbmap} command (from the same-named package)  allows you to change the current layout.  For example, this is how you would change the layout to US Dvorak:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11886
+#: doc/guix.texi:12001
 #, no-wrap
 msgid "setxkbmap us dvorak\n"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11893
+#: doc/guix.texi:12008
 msgid "The @code{loadkeys} command changes the keyboard layout in effect in the Linux console.  However, note that @code{loadkeys} does @emph{not} use the XKB keyboard layout categorization described above.  The command below loads the French bépo layout:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11896
+#: doc/guix.texi:12011
 #, no-wrap
 msgid "loadkeys fr-bepo\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11902
+#: doc/guix.texi:12017
 #, no-wrap
 msgid "locale"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11909
+#: doc/guix.texi:12024
 msgid "A @dfn{locale} defines cultural conventions for a particular language and region of the world (@pxref{Locales,,, libc, The GNU C Library Reference Manual}).  Each locale has a name that typically has the form @code{@var{language}_@var{territory}.@var{codeset}}---e.g., @code{fr_LU.utf8} designates the locale for the French language, with cultural conventions from Luxembourg, and using the UTF-8 encoding."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11910
+#: doc/guix.texi:12025
 #, no-wrap
 msgid "locale definition"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11914
+#: doc/guix.texi:12029
 msgid "Usually, you will want to specify the default locale for the machine using the @code{locale} field of the @code{operating-system} declaration (@pxref{operating-system Reference, @code{locale}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11923
+#: doc/guix.texi:12038
 msgid "The selected locale is automatically added to the @dfn{locale definitions} known to the system if needed, with its codeset inferred from its name---e.g., @code{bo_CN.utf8} will be assumed to use the @code{UTF-8} codeset.  Additional locale definitions can be specified in the @code{locale-definitions} slot of @code{operating-system}---this is useful, for instance, if the codeset could not be inferred from the locale name.  The default set of locale definitions includes some widely used locales, but not all the available locales, in order to save space."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11926
+#: doc/guix.texi:12041
 msgid "For instance, to add the North Frisian locale for Germany, the value of that field may be:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11931
+#: doc/guix.texi:12046
 #, no-wrap
 msgid ""
 "(cons (locale-definition\n"
@@ -21067,12 +21469,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11935
+#: doc/guix.texi:12050
 msgid "Likewise, to save space, one might want @code{locale-definitions} to list only the locales that are actually used, as in:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11940
+#: doc/guix.texi:12055
 #, no-wrap
 msgid ""
 "(list (locale-definition\n"
@@ -21081,114 +21483,114 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11949
+#: doc/guix.texi:12064
 msgid "The compiled locale definitions are available at @file{/run/current-system/locale/X.Y}, where @code{X.Y} is the libc version, which is the default location where the GNU@tie{}libc provided by Guix looks for locale data.  This can be overridden using the @code{LOCPATH} environment variable (@pxref{locales-and-locpath, @code{LOCPATH} and locale packages})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11952
+#: doc/guix.texi:12067
 msgid "The @code{locale-definition} form is provided by the @code{(gnu system locale)} module.  Details are given below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11953
+#: doc/guix.texi:12068
 #, no-wrap
 msgid "{Data Type} locale-definition"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11955
+#: doc/guix.texi:12070
 msgid "This is the data type of a locale definition."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11961
+#: doc/guix.texi:12076
 msgid "The name of the locale.  @xref{Locale Names,,, libc, The GNU C Library Reference Manual}, for more information on locale names."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11965
+#: doc/guix.texi:12080
 msgid "The name of the source for that locale.  This is typically the @code{@var{language}_@var{territory}} part of the locale name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11966
+#: doc/guix.texi:12081
 #, no-wrap
 msgid "@code{charset} (default: @code{\"UTF-8\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11970
+#: doc/guix.texi:12085
 msgid "The ``character set'' or ``code set'' for that locale, @uref{https://www.iana.org/assignments/character-sets, as defined by IANA}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11974
+#: doc/guix.texi:12089
 #, no-wrap
 msgid "{Scheme Variable} %default-locale-definitions"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11978
+#: doc/guix.texi:12093
 msgid "A list of commonly used UTF-8 locales, used as the default value of the @code{locale-definitions} field of @code{operating-system} declarations."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11979
+#: doc/guix.texi:12094
 #, no-wrap
 msgid "locale name"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11980
+#: doc/guix.texi:12095
 #, no-wrap
 msgid "normalized codeset in locale names"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11986
+#: doc/guix.texi:12101
 msgid "These locale definitions use the @dfn{normalized codeset} for the part that follows the dot in the name (@pxref{Using gettextized software, normalized codeset,, libc, The GNU C Library Reference Manual}).  So for instance it has @code{uk_UA.utf8} but @emph{not}, say, @code{uk_UA.UTF-8}."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:11988
+#: doc/guix.texi:12103
 #, no-wrap
 msgid "Locale Data Compatibility Considerations"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11990
+#: doc/guix.texi:12105
 #, no-wrap
 msgid "incompatibility, of locale data"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11997
+#: doc/guix.texi:12112
 msgid "@code{operating-system} declarations provide a @code{locale-libcs} field to specify the GNU@tie{}libc packages that are used to compile locale declarations (@pxref{operating-system Reference}).  ``Why would I care?'', you may ask.  Well, it turns out that the binary format of locale data is occasionally incompatible from one libc version to another."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12009
+#: doc/guix.texi:12124
 msgid "For instance, a program linked against libc version 2.21 is unable to read locale data produced with libc 2.22; worse, that program @emph{aborts} instead of simply ignoring the incompatible locale data@footnote{Versions 2.23 and later of GNU@tie{}libc will simply skip the incompatible locale data, which is already an improvement.}.  Similarly, a program linked against libc 2.22 can read most, but not all, of the locale data from libc 2.21 (specifically, @code{LC_COLLATE} data is incompatible); thus calls to @code{setlocale} may fail, but programs will not abort."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12014
+#: doc/guix.texi:12129
 msgid "The ``problem'' with Guix is that users have a lot of freedom: They can choose whether and when to upgrade software in their profiles, and might be using a libc version different from the one the system administrator used to build the system-wide locale data."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12018
+#: doc/guix.texi:12133
 msgid "Fortunately, unprivileged users can also install their own locale data and define @var{GUIX_LOCPATH} accordingly (@pxref{locales-and-locpath, @code{GUIX_LOCPATH} and locale packages})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12025
+#: doc/guix.texi:12140
 msgid "Still, it is best if the system-wide locale data at @file{/run/current-system/locale} is built for all the libc versions actually in use on the system, so that all the programs can access it---this is especially crucial on a multi-user system.  To do that, the administrator can specify several libc packages in the @code{locale-libcs} field of @code{operating-system}:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12028
+#: doc/guix.texi:12143
 #, no-wrap
 msgid ""
 "(use-package-modules base)\n"
@@ -21196,7 +21598,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12032
+#: doc/guix.texi:12147
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -21205,39 +21607,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12037
+#: doc/guix.texi:12152
 msgid "This example would lead to a system containing locale definitions for both libc 2.21 and the current version of libc in @file{/run/current-system/locale}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12042
+#: doc/guix.texi:12157
 #, no-wrap
 msgid "system services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12048
+#: doc/guix.texi:12163
 msgid "An important part of preparing an @code{operating-system} declaration is listing @dfn{system services} and their configuration (@pxref{Using the Configuration System}).  System services are typically daemons launched when the system boots, or other actions needed at that time---e.g., configuring network access."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12055
+#: doc/guix.texi:12170
 msgid "Guix has a broad definition of ``service'' (@pxref{Service Composition}), but many services are managed by the GNU@tie{}Shepherd (@pxref{Shepherd Services}).  On a running system, the @command{herd} command allows you to list the available services, show their status, start and stop them, or do other specific operations (@pxref{Jump Start,,, shepherd, The GNU Shepherd Manual}).  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12058
+#: doc/guix.texi:12173
 #, no-wrap
 msgid "# herd status\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12063
+#: doc/guix.texi:12178
 msgid "The above command, run as @code{root}, lists the currently defined services.  The @command{herd doc} command shows a synopsis of the given service and its associated actions:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12067
+#: doc/guix.texi:12182
 #, no-wrap
 msgid ""
 "# herd doc nscd\n"
@@ -21246,7 +21648,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12070
+#: doc/guix.texi:12185
 #, no-wrap
 msgid ""
 "# herd doc nscd action invalidate\n"
@@ -21254,12 +21656,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12075
+#: doc/guix.texi:12190
 msgid "The @command{start}, @command{stop}, and @command{restart} sub-commands have the effect you would expect.  For instance, the commands below stop the nscd service and restart the Xorg display server:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12082
+#: doc/guix.texi:12197
 #, no-wrap
 msgid ""
 "# herd stop nscd\n"
@@ -21270,56 +21672,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12087
+#: doc/guix.texi:12202
 msgid "The following sections document the available services, starting with the core services, that may be used in an @code{operating-system} declaration."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:12119 doc/guix.texi:19379 doc/guix.texi:19380
+#: doc/guix.texi:12234 doc/guix.texi:19536 doc/guix.texi:19537
 #, no-wrap
 msgid "LDAP Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:12119
+#: doc/guix.texi:12234
 msgid "LDAP services."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:12119 doc/guix.texi:25114 doc/guix.texi:25115
+#: doc/guix.texi:12234 doc/guix.texi:25335 doc/guix.texi:25336
 #, fuzzy, no-wrap
 #| msgid "Audio Services"
 msgid "Guix Services"
 msgstr "Сервисы аудио"
 
 #. type: menuentry
-#: doc/guix.texi:12119
+#: doc/guix.texi:12234
 msgid "Services relating specifically to Guix."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12127
+#: doc/guix.texi:12242
 msgid "The @code{(gnu services base)} module provides definitions for the basic services that one expects from the system.  The services exported by this module are listed below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12128
+#: doc/guix.texi:12243
 #, no-wrap
 msgid "{Scheme Variable} %base-services"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12134
+#: doc/guix.texi:12249
 msgid "This variable contains a list of basic services (@pxref{Service Types and Services}, for more information on service objects) one would expect from the system: a login service (mingetty) on each tty, syslogd, the libc name service cache daemon (nscd), the udev device manager, and more."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12139
+#: doc/guix.texi:12254
 msgid "This is the default value of the @code{services} field of @code{operating-system} declarations.  Usually, when customizing a system, you will want to append services to @code{%base-services}, like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12144
+#: doc/guix.texi:12259
 #, no-wrap
 msgid ""
 "(append (list (service avahi-service-type)\n"
@@ -21328,58 +21730,58 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12147
+#: doc/guix.texi:12262
 #, no-wrap
 msgid "{Scheme Variable} special-files-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12150
+#: doc/guix.texi:12265
 msgid "This is the service that sets up ``special files'' such as @file{/bin/sh}; an instance of it is part of @code{%base-services}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12154
+#: doc/guix.texi:12269
 msgid "The value associated with @code{special-files-service-type} services must be a list of tuples where the first element is the ``special file'' and the second element is its target.  By default it is:"
 msgstr ""
 
 #. type: file{#1}
-#: doc/guix.texi:12155
+#: doc/guix.texi:12270
 #, no-wrap
 msgid "/bin/sh"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12156
+#: doc/guix.texi:12271
 #, no-wrap
 msgid "@file{sh}, in @file{/bin}"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12159
+#: doc/guix.texi:12274
 #, no-wrap
 msgid "`((\"/bin/sh\" ,(file-append bash \"/bin/sh\")))\n"
 msgstr ""
 
 #. type: file{#1}
-#: doc/guix.texi:12161
+#: doc/guix.texi:12276
 #, no-wrap
 msgid "/usr/bin/env"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12162
+#: doc/guix.texi:12277
 #, no-wrap
 msgid "@file{env}, in @file{/usr/bin}"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12165
+#: doc/guix.texi:12280
 msgid "If you want to add, say, @code{/usr/bin/env} to your system, you can change it to:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12169
+#: doc/guix.texi:12284
 #, no-wrap
 msgid ""
 "`((\"/bin/sh\" ,(file-append bash \"/bin/sh\"))\n"
@@ -21387,28 +21789,28 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12176
+#: doc/guix.texi:12291
 msgid "Since this is part of @code{%base-services}, you can use @code{modify-services} to customize the set of special files (@pxref{Service Reference, @code{modify-services}}).  But the simple way to add a special file is @i{via} the @code{extra-special-file} procedure (see below.)"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12178
+#: doc/guix.texi:12293
 #, no-wrap
 msgid "{Scheme Procedure} extra-special-file @var{file} @var{target}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12180
+#: doc/guix.texi:12295
 msgid "Use @var{target} as the ``special file'' @var{file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12184
+#: doc/guix.texi:12299
 msgid "For example, adding the following lines to the @code{services} field of your operating system declaration leads to a @file{/usr/bin/env} symlink:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12188
+#: doc/guix.texi:12303
 #, no-wrap
 msgid ""
 "(extra-special-file \"/usr/bin/env\"\n"
@@ -21416,1152 +21818,1212 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12191
+#: doc/guix.texi:12306
 #, no-wrap
 msgid "{Scheme Procedure} host-name-service @var{name}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12193
+#: doc/guix.texi:12308
 msgid "Return a service that sets the host name to @var{name}."
 msgstr ""
 
+#. type: defvr
+#: doc/guix.texi:12310
+#, fuzzy, no-wrap
+#| msgid "{Scheme Procedure} sane-service-type"
+msgid "{Scheme Variable} console-font-service-type"
+msgstr "{Процедура Scheme} sane-service-type"
+
+#. type: defvr
+#: doc/guix.texi:12315
+msgid "Install the given fonts on the specified ttys (fonts are per virtual console on the kernel Linux).  The value of this service is a list of tty/font pairs.  The font can be the name of a font provided by the @code{kbd} package or any valid argument to @command{setfont}, as in this example:"
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:12324
+#, no-wrap
+msgid ""
+"`((\"tty1\" . \"LatGrkCyr-8x16\")\n"
+"  (\"tty2\" . ,(file-append\n"
+"                font-tamzen\n"
+"                \"/share/kbd/consolefonts/TamzenForPowerline10x20.psf\"))\n"
+"  (\"tty3\" . ,(file-append\n"
+"                font-terminus\n"
+"                \"/share/consolefonts/ter-132n\"))) ; for HDPI\n"
+msgstr ""
+
 #. type: deffn
-#: doc/guix.texi:12195
+#: doc/guix.texi:12327
 #, no-wrap
 msgid "{Scheme Procedure} login-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12199
+#: doc/guix.texi:12331
 msgid "Return a service to run login according to @var{config}, a @code{} object, which specifies the message of the day, among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12201
+#: doc/guix.texi:12333
 #, no-wrap
 msgid "{Data Type} login-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12203
+#: doc/guix.texi:12335
 msgid "This is the data type representing the configuration of login."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12206
+#: doc/guix.texi:12338
 #, no-wrap
 msgid "motd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12207
+#: doc/guix.texi:12339
 #, no-wrap
 msgid "message of the day"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12209
+#: doc/guix.texi:12341
 msgid "A file-like object containing the ``message of the day''."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12210 doc/guix.texi:14385
+#: doc/guix.texi:12342 doc/guix.texi:14542
 #, no-wrap
 msgid "@code{allow-empty-passwords?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12213
+#: doc/guix.texi:12345
 msgid "Allow empty passwords by default so that first-time users can log in when the 'root' account has just been created."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12217
+#: doc/guix.texi:12349
 #, no-wrap
 msgid "{Scheme Procedure} mingetty-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12221
+#: doc/guix.texi:12353
 msgid "Return a service to run mingetty according to @var{config}, a @code{} object, which specifies the tty to run, among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12223
+#: doc/guix.texi:12355
 #, no-wrap
 msgid "{Data Type} mingetty-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12226
+#: doc/guix.texi:12358
 msgid "This is the data type representing the configuration of Mingetty, which provides the default implementation of virtual console log-in."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12229 doc/guix.texi:12265
+#: doc/guix.texi:12361 doc/guix.texi:12397
 #, no-wrap
 msgid "tty"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12231
+#: doc/guix.texi:12363
 msgid "The name of the console this Mingetty runs on---e.g., @code{\"tty1\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12232 doc/guix.texi:12294 doc/guix.texi:12453
+#: doc/guix.texi:12364 doc/guix.texi:12426 doc/guix.texi:12585
 #, no-wrap
 msgid "@code{auto-login} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12236
+#: doc/guix.texi:12368
 msgid "When true, this field must be a string denoting the user name under which the system automatically logs in.  When it is @code{#f}, a user name and password must be entered to log in."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12237
+#: doc/guix.texi:12369
 #, no-wrap
 msgid "@code{login-program} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12241
+#: doc/guix.texi:12373
 msgid "This must be either @code{#f}, in which case the default log-in program is used (@command{login} from the Shadow tool suite), or a gexp denoting the name of the log-in program."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12242
+#: doc/guix.texi:12374
 #, no-wrap
 msgid "@code{login-pause?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12245
+#: doc/guix.texi:12377
 msgid "When set to @code{#t} in conjunction with @var{auto-login}, the user will have to press a key before the log-in shell is launched."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12246
+#: doc/guix.texi:12378
 #, no-wrap
 msgid "@code{mingetty} (default: @var{mingetty})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12248
+#: doc/guix.texi:12380
 msgid "The Mingetty package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12252
+#: doc/guix.texi:12384
 #, no-wrap
 msgid "{Scheme Procedure} agetty-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12256
+#: doc/guix.texi:12388
 msgid "Return a service to run agetty according to @var{config}, an @code{} object, which specifies the tty to run, among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12258
+#: doc/guix.texi:12390
 #, no-wrap
 msgid "{Data Type} agetty-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12262
+#: doc/guix.texi:12394
 msgid "This is the data type representing the configuration of agetty, which implements virtual and serial console log-in.  See the @code{agetty(8)} man page for more information."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12269
+#: doc/guix.texi:12401
 msgid "The name of the console this agetty runs on, as a string---e.g., @code{\"ttyS0\"}. This argument is optional, it will default to a reasonable default serial port used by the kernel Linux."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12273
+#: doc/guix.texi:12405
 msgid "For this, if there is a value for an option @code{agetty.tty} in the kernel command line, agetty will extract the device name of the serial port from it and use that."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12277
+#: doc/guix.texi:12409
 msgid "If not and if there is a value for an option @code{console} with a tty in the Linux command line, agetty will extract the device name of the serial port from it and use that."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12281
+#: doc/guix.texi:12413
 msgid "In both cases, agetty will leave the other serial device settings (baud rate etc.)@: alone---in the hope that Linux pinned them to the correct values."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12282 doc/guix.texi:25361
+#: doc/guix.texi:12414 doc/guix.texi:25624
 #, no-wrap
 msgid "@code{baud-rate} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12285
+#: doc/guix.texi:12417
 msgid "A string containing a comma-separated list of one or more baud rates, in descending order."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12286
+#: doc/guix.texi:12418
 #, no-wrap
 msgid "@code{term} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12289
+#: doc/guix.texi:12421
 msgid "A string containing the value used for the @code{TERM} environment variable."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12290
+#: doc/guix.texi:12422
 #, no-wrap
 msgid "@code{eight-bits?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12293
+#: doc/guix.texi:12425
 msgid "When @code{#t}, the tty is assumed to be 8-bit clean, and parity detection is disabled."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12297 doc/guix.texi:12456
+#: doc/guix.texi:12429 doc/guix.texi:12588
 msgid "When passed a login name, as a string, the specified user will be logged in automatically without prompting for their login name or password."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12298
+#: doc/guix.texi:12430
 #, no-wrap
 msgid "@code{no-reset?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12300
+#: doc/guix.texi:12432
 msgid "When @code{#t}, don't reset terminal cflags (control modes)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12301
+#: doc/guix.texi:12433
 #, no-wrap
 msgid "@code{host} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12304
+#: doc/guix.texi:12436
 msgid "This accepts a string containing the \"login_host\", which will be written into the @file{/var/run/utmpx} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12305
+#: doc/guix.texi:12437
 #, no-wrap
 msgid "@code{remote?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12309
+#: doc/guix.texi:12441
 msgid "When set to @code{#t} in conjunction with @var{host}, this will add an @code{-r} fakehost option to the command line of the login program specified in @var{login-program}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12310
+#: doc/guix.texi:12442
 #, no-wrap
 msgid "@code{flow-control?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12312
+#: doc/guix.texi:12444
 msgid "When set to @code{#t}, enable hardware (RTS/CTS) flow control."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12313
+#: doc/guix.texi:12445
 #, no-wrap
 msgid "@code{no-issue?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12316
+#: doc/guix.texi:12448
 msgid "When set to @code{#t}, the contents of the @file{/etc/issue} file will not be displayed before presenting the login prompt."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12317
+#: doc/guix.texi:12449
 #, no-wrap
 msgid "@code{init-string} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12320
+#: doc/guix.texi:12452
 msgid "This accepts a string that will be sent to the tty or modem before sending anything else.  It can be used to initialize a modem."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12321
+#: doc/guix.texi:12453
 #, no-wrap
 msgid "@code{no-clear?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12324
+#: doc/guix.texi:12456
 msgid "When set to @code{#t}, agetty will not clear the screen before showing the login prompt."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12325
+#: doc/guix.texi:12457
 #, no-wrap
 msgid "@code{login-program} (default: (file-append shadow \"/bin/login\"))"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12329
+#: doc/guix.texi:12461
 msgid "This must be either a gexp denoting the name of a log-in program, or unset, in which case the default value is the @command{login} from the Shadow tool suite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12330
+#: doc/guix.texi:12462
 #, no-wrap
 msgid "@code{local-line} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12334
+#: doc/guix.texi:12466
 msgid "Control the CLOCAL line flag.  This accepts one of three symbols as arguments, @code{'auto}, @code{'always}, or @code{'never}. If @code{#f}, the default value chosen by agetty is @code{'auto}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12335
+#: doc/guix.texi:12467
 #, no-wrap
 msgid "@code{extract-baud?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12338
+#: doc/guix.texi:12470
 msgid "When set to @code{#t}, instruct agetty to try to extract the baud rate from the status messages produced by certain types of modems."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12339
+#: doc/guix.texi:12471
 #, no-wrap
 msgid "@code{skip-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12343
+#: doc/guix.texi:12475
 msgid "When set to @code{#t}, do not prompt the user for a login name.  This can be used with @var{login-program} field to use non-standard login systems."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12344
+#: doc/guix.texi:12476
 #, no-wrap
 msgid "@code{no-newline?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12347
+#: doc/guix.texi:12479
 msgid "When set to @code{#t}, do not print a newline before printing the @file{/etc/issue} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12349
+#: doc/guix.texi:12481
 #, no-wrap
 msgid "@code{login-options} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12354
+#: doc/guix.texi:12486
 msgid "This option accepts a string containing options that are passed to the login program.  When used with the @var{login-program}, be aware that a malicious user could try to enter a login name containing embedded options that could be parsed by the login program."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12355
+#: doc/guix.texi:12487
 #, no-wrap
 msgid "@code{login-pause} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12359
+#: doc/guix.texi:12491
 msgid "When set to @code{#t}, wait for any key before showing the login prompt.  This can be used in conjunction with @var{auto-login} to save memory by lazily spawning shells."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12360
+#: doc/guix.texi:12492
 #, no-wrap
 msgid "@code{chroot} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12363
+#: doc/guix.texi:12495
 msgid "Change root to the specified directory.  This option accepts a directory path as a string."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12364
+#: doc/guix.texi:12496
 #, no-wrap
 msgid "@code{hangup?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12367
+#: doc/guix.texi:12499
 msgid "Use the Linux system call @code{vhangup} to do a virtual hangup of the specified terminal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12368
+#: doc/guix.texi:12500
 #, no-wrap
 msgid "@code{keep-baud?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12372
+#: doc/guix.texi:12504
 msgid "When set to @code{#t}, try to keep the existing baud rate.  The baud rates from @var{baud-rate} are used when agetty receives a @key{BREAK} character."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12373
+#: doc/guix.texi:12505
 #, no-wrap
 msgid "@code{timeout} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12376
+#: doc/guix.texi:12508
 msgid "When set to an integer value, terminate if no user name could be read within @var{timeout} seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12377
+#: doc/guix.texi:12509
 #, no-wrap
 msgid "@code{detect-case?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12383
+#: doc/guix.texi:12515
 msgid "When set to @code{#t}, turn on support for detecting an uppercase-only terminal.  This setting will detect a login name containing only uppercase letters as indicating an uppercase-only terminal and turn on some upper-to-lower case conversions.  Note that this will not support Unicode characters."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12384
+#: doc/guix.texi:12516
 #, no-wrap
 msgid "@code{wait-cr?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12389
+#: doc/guix.texi:12521
 msgid "When set to @code{#t}, wait for the user or modem to send a carriage-return or linefeed character before displaying @file{/etc/issue} or login prompt.  This is typically used with the @var{init-string} option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12390
+#: doc/guix.texi:12522
 #, no-wrap
 msgid "@code{no-hints?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12393
+#: doc/guix.texi:12525
 msgid "When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12394
+#: doc/guix.texi:12526
 #, no-wrap
 msgid "@code{no-hostname?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12397
+#: doc/guix.texi:12529
 msgid "By default, the hostname is printed.  When this option is set to @code{#t}, no hostname will be shown at all."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12398
+#: doc/guix.texi:12530
 #, no-wrap
 msgid "@code{long-hostname?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12402
+#: doc/guix.texi:12534
 msgid "By default, the hostname is only printed until the first dot.  When this option is set to @code{#t}, the fully qualified hostname by @code{gethostname} or @code{getaddrinfo} is shown."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12403
+#: doc/guix.texi:12535
 #, no-wrap
 msgid "@code{erase-characters} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12406
+#: doc/guix.texi:12538
 msgid "This option accepts a string of additional characters that should be interpreted as backspace when the user types their login name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12407
+#: doc/guix.texi:12539
 #, no-wrap
 msgid "@code{kill-characters} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12411
+#: doc/guix.texi:12543
 msgid "This option accepts a string that should be interpreted to mean \"ignore all previous characters\" (also called a \"kill\" character) when the user types their login name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12412
+#: doc/guix.texi:12544
 #, no-wrap
 msgid "@code{chdir} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12415
+#: doc/guix.texi:12547
 msgid "This option accepts, as a string, a directory path that will be changed to before login."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12416
+#: doc/guix.texi:12548
 #, no-wrap
 msgid "@code{delay} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12419
+#: doc/guix.texi:12551
 msgid "This options accepts, as an integer, the number of seconds to sleep before opening the tty and displaying the login prompt."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12420
+#: doc/guix.texi:12552
 #, no-wrap
 msgid "@code{nice} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12423
+#: doc/guix.texi:12555
 msgid "This option accepts, as an integer, the nice value with which to run the @command{login} program."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12424 doc/guix.texi:12655 doc/guix.texi:13448
-#: doc/guix.texi:20369
+#: doc/guix.texi:12556 doc/guix.texi:12787 doc/guix.texi:13605
+#: doc/guix.texi:20537 doc/guix.texi:22578
 #, no-wrap
 msgid "@code{extra-options} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12427
+#: doc/guix.texi:12559
 msgid "This option provides an \"escape hatch\" for the user to provide arbitrary command-line arguments to @command{agetty} as a list of strings."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12431
+#: doc/guix.texi:12563
 #, no-wrap
 msgid "{Scheme Procedure} kmscon-service-type @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12435
+#: doc/guix.texi:12567
 msgid "Return a service to run @uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} according to @var{config}, a @code{} object, which specifies the tty to run, among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12437
+#: doc/guix.texi:12569
 #, no-wrap
 msgid "{Data Type} kmscon-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12440
+#: doc/guix.texi:12572
 msgid "This is the data type representing the configuration of Kmscon, which implements virtual console log-in."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12443
+#: doc/guix.texi:12575
 #, no-wrap
 msgid "virtual-terminal"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12445
+#: doc/guix.texi:12577
 msgid "The name of the console this Kmscon runs on---e.g., @code{\"tty1\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12446
+#: doc/guix.texi:12578
 #, no-wrap
 msgid "@code{login-program} (default: @code{#~(string-append #$shadow \"/bin/login\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12449
+#: doc/guix.texi:12581
 msgid "A gexp denoting the name of the log-in program. The default log-in program is @command{login} from the Shadow tool suite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12450
+#: doc/guix.texi:12582
 #, no-wrap
 msgid "@code{login-arguments} (default: @code{'(\"-p\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12452
+#: doc/guix.texi:12584
 msgid "A list of arguments to pass to @command{login}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12457
+#: doc/guix.texi:12589
 #, no-wrap
 msgid "@code{hardware-acceleration?} (default: #f)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12459
+#: doc/guix.texi:12591
 msgid "Whether to use hardware acceleration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12460
+#: doc/guix.texi:12592
 #, no-wrap
 msgid "@code{kmscon} (default: @var{kmscon})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12462
+#: doc/guix.texi:12594
 msgid "The Kmscon package to use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12466
+#: doc/guix.texi:12598
 #, no-wrap
 msgid "name service cache daemon"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12467
+#: doc/guix.texi:12599
 #, no-wrap
 msgid "nscd"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12468
+#: doc/guix.texi:12600
 #, no-wrap
 msgid "{Scheme Procedure} nscd-service [@var{config}] [#:glibc glibc] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12473
+#: doc/guix.texi:12605
 msgid "[#:name-services '()] Return a service that runs the libc name service cache daemon (nscd) with the given @var{config}---an @code{} object.  @xref{Name Service Switch}, for an example."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12475
+#: doc/guix.texi:12607
 msgid "For convenience, the Shepherd service for nscd provides the following actions:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12477
+#: doc/guix.texi:12609
 #, no-wrap
 msgid "invalidate"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12478
+#: doc/guix.texi:12610
 #, no-wrap
 msgid "cache invalidation, nscd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12479
+#: doc/guix.texi:12611
 #, no-wrap
 msgid "nscd, cache invalidation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12481
+#: doc/guix.texi:12613
 msgid "This invalidate the given cache.  For instance, running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12484
+#: doc/guix.texi:12616
 #, no-wrap
 msgid "herd invalidate nscd hosts\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12488
+#: doc/guix.texi:12620
 msgid "invalidates the host name lookup cache of nscd."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12489
+#: doc/guix.texi:12621
 #, no-wrap
 msgid "statistics"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12492
+#: doc/guix.texi:12624
 msgid "Running @command{herd statistics nscd} displays information about nscd usage and caches."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12496
+#: doc/guix.texi:12628
 #, no-wrap
 msgid "{Scheme Variable} %nscd-default-configuration"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12500
+#: doc/guix.texi:12632
 msgid "This is the default @code{} value (see below) used by @code{nscd-service}.  It uses the caches defined by @var{%nscd-default-caches}; see below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12502
+#: doc/guix.texi:12634
 #, no-wrap
 msgid "{Data Type} nscd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12505
+#: doc/guix.texi:12637
 msgid "This is the data type representing the name service cache daemon (nscd)  configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12508
+#: doc/guix.texi:12640
 #, no-wrap
 msgid "@code{name-services} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12511
+#: doc/guix.texi:12643
 msgid "List of packages denoting @dfn{name services} that must be visible to the nscd---e.g., @code{(list @var{nss-mdns})}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12512
+#: doc/guix.texi:12644
 #, no-wrap
 msgid "@code{glibc} (default: @var{glibc})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12515
+#: doc/guix.texi:12647
 msgid "Package object denoting the GNU C Library providing the @command{nscd} command."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12516
+#: doc/guix.texi:12648
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/nscd.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12519
+#: doc/guix.texi:12651
 msgid "Name of the nscd log file.  This is where debugging output goes when @code{debug-level} is strictly positive."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12520
+#: doc/guix.texi:12652
 #, no-wrap
 msgid "@code{debug-level} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12523
+#: doc/guix.texi:12655
 msgid "Integer denoting the debugging levels.  Higher numbers mean that more debugging output is logged."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12524
+#: doc/guix.texi:12656
 #, no-wrap
 msgid "@code{caches} (default: @var{%nscd-default-caches})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12527
+#: doc/guix.texi:12659
 msgid "List of @code{} objects denoting things to be cached; see below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12531
+#: doc/guix.texi:12663
 #, no-wrap
 msgid "{Data Type} nscd-cache"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12533
+#: doc/guix.texi:12665
 msgid "Data type representing a cache database of nscd and its parameters."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12536 doc/guix.texi:16092
+#: doc/guix.texi:12668 doc/guix.texi:16249
 #, no-wrap
 msgid "database"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12541
+#: doc/guix.texi:12673
 msgid "This is a symbol representing the name of the database to be cached.  Valid values are @code{passwd}, @code{group}, @code{hosts}, and @code{services}, which designate the corresponding NSS database (@pxref{NSS Basics,,, libc, The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12542
+#: doc/guix.texi:12674
 #, no-wrap
 msgid "positive-time-to-live"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:12543
+#: doc/guix.texi:12675
 #, no-wrap
 msgid "@code{negative-time-to-live} (default: @code{20})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12546
+#: doc/guix.texi:12678
 msgid "A number representing the number of seconds during which a positive or negative lookup result remains in cache."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12547
+#: doc/guix.texi:12679
 #, no-wrap
 msgid "@code{check-files?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12550
+#: doc/guix.texi:12682
 msgid "Whether to check for updates of the files corresponding to @var{database}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12554
+#: doc/guix.texi:12686
 msgid "For instance, when @var{database} is @code{hosts}, setting this flag instructs nscd to check for updates in @file{/etc/hosts} and to take them into account."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12555
+#: doc/guix.texi:12687
 #, no-wrap
 msgid "@code{persistent?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12557
+#: doc/guix.texi:12689
 msgid "Whether the cache should be stored persistently on disk."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12558
+#: doc/guix.texi:12690
 #, no-wrap
 msgid "@code{shared?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12560
+#: doc/guix.texi:12692
 msgid "Whether the cache should be shared among users."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12561
+#: doc/guix.texi:12693
 #, no-wrap
 msgid "@code{max-database-size} (default: 32@tie{}MiB)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12563
+#: doc/guix.texi:12695
 msgid "Maximum size in bytes of the database cache."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12570
+#: doc/guix.texi:12702
 #, no-wrap
 msgid "{Scheme Variable} %nscd-default-caches"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12573
+#: doc/guix.texi:12705
 msgid "List of @code{} objects used by default by @code{nscd-configuration} (see above)."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12579
+#: doc/guix.texi:12711
 msgid "It enables persistent and aggressive caching of service and host name lookups.  The latter provides better host name lookup performance, resilience in the face of unreliable name servers, and also better privacy---often the result of host name lookups is in local cache, so external name servers do not even need to be queried."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:12582
+#: doc/guix.texi:12714
 msgid "syslog-configuration-type"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12582 doc/guix.texi:12598
+#: doc/guix.texi:12714 doc/guix.texi:12730
 #, no-wrap
 msgid "syslog"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12583 doc/guix.texi:13062
+#: doc/guix.texi:12715 doc/guix.texi:13209
 #, no-wrap
 msgid "logging"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12584
+#: doc/guix.texi:12716
 #, no-wrap
 msgid "{Data Type} syslog-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12586
+#: doc/guix.texi:12718
 msgid "This data type represents the configuration of the syslog daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12588
+#: doc/guix.texi:12720
 #, no-wrap
 msgid "@code{syslogd} (default: @code{#~(string-append #$inetutils \"/libexec/syslogd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12590
+#: doc/guix.texi:12722
 msgid "The syslog daemon to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12591
+#: doc/guix.texi:12723
 #, no-wrap
 msgid "@code{config-file} (default: @code{%default-syslog.conf})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12593
+#: doc/guix.texi:12725
 msgid "The syslog configuration file to use."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:12598
+#: doc/guix.texi:12730
 msgid "syslog-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12599
+#: doc/guix.texi:12731
 #, no-wrap
 msgid "{Scheme Procedure} syslog-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12601
+#: doc/guix.texi:12733
 msgid "Return a service that runs a syslog daemon according to @var{config}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12604
+#: doc/guix.texi:12736
 msgid "@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more information on the configuration file syntax."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12606
+#: doc/guix.texi:12738
 #, no-wrap
 msgid "{Scheme Variable} guix-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12610
+#: doc/guix.texi:12742
 msgid "This is the type of the service that runs the build daemon, @command{guix-daemon} (@pxref{Invoking guix-daemon}).  Its value must be a @code{guix-configuration} record as described below."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:12613
+#: doc/guix.texi:12745
 msgid "guix-configuration-type"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12613
+#: doc/guix.texi:12745
 #, no-wrap
 msgid "{Data Type} guix-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12616
+#: doc/guix.texi:12748
 msgid "This data type represents the configuration of the Guix build daemon.  @xref{Invoking guix-daemon}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12618
+#: doc/guix.texi:12750
 #, no-wrap
 msgid "@code{guix} (default: @var{guix})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12620 doc/guix.texi:12839
+#: doc/guix.texi:12752 doc/guix.texi:12986
 msgid "The Guix package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12621
+#: doc/guix.texi:12753
 #, no-wrap
 msgid "@code{build-group} (default: @code{\"guixbuild\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12623
+#: doc/guix.texi:12755
 msgid "Name of the group for build user accounts."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12624
+#: doc/guix.texi:12756
 #, no-wrap
 msgid "@code{build-accounts} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12626
+#: doc/guix.texi:12758
 msgid "Number of build user accounts to create."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12627
+#: doc/guix.texi:12759
 #, no-wrap
 msgid "@code{authorize-key?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12632
+#: doc/guix.texi:12764
 msgid "Whether to authorize the substitute keys listed in @code{authorized-keys}---by default that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes})."
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:12633
+#: doc/guix.texi:12765
 #, no-wrap
 msgid "%default-authorized-guix-keys"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12634
+#: doc/guix.texi:12766
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{authorized-keys} (default: @code{%default-authorized-guix-keys})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:12638
+#: doc/guix.texi:12770
 msgid "The list of authorized key files for archive imports, as a list of string-valued gexps (@pxref{Invoking guix archive}).  By default, it contains that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12639
+#: doc/guix.texi:12771
 #, no-wrap
 msgid "@code{use-substitutes?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12641
+#: doc/guix.texi:12773
 msgid "Whether to use substitutes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12642
+#: doc/guix.texi:12774
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{substitute-urls} (default: @code{%default-substitute-urls})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:12644
+#: doc/guix.texi:12776
 msgid "The list of URLs where to look for substitutes by default."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12645
+#: doc/guix.texi:12777
 #, no-wrap
 msgid "@code{max-silent-time} (default: @code{0})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:12646
+#: doc/guix.texi:12778
 #, no-wrap
 msgid "@code{timeout} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12650
+#: doc/guix.texi:12782
 msgid "The number of seconds of silence and the number of seconds of activity, respectively, after which a build process times out.  A value of zero disables the timeout."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12651
+#: doc/guix.texi:12783
 #, no-wrap
 msgid "@code{log-compression} (default: @code{'bzip2})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12654
+#: doc/guix.texi:12786
 msgid "The type of compression used for build logs---one of @code{gzip}, @code{bzip2}, or @code{none}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12657
+#: doc/guix.texi:12789
 msgid "List of extra command-line options for @command{guix-daemon}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12658
+#: doc/guix.texi:12790
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/guix-daemon.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12661
+#: doc/guix.texi:12793
 msgid "File where @command{guix-daemon}'s standard output and standard error are written."
 msgstr ""
 
+#. type: cindex
+#: doc/guix.texi:12794
+#, no-wrap
+msgid "HTTP proxy, for @code{guix-daemon}"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:12795
+#, no-wrap
+msgid "proxy, for @code{guix-daemon} HTTP access"
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:12662
+#: doc/guix.texi:12796
 #, no-wrap
 msgid "@code{http-proxy} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12665
-msgid "The HTTP proxy used for downloading fixed-output derivations and substitutes."
+#: doc/guix.texi:12799
+msgid "The URL of the HTTP and HTTPS proxy used for downloading fixed-output derivations and substitutes."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:12802
+msgid "It is also possible to change the daemon's proxy at run time through the @code{set-http-proxy} action, which restarts it:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:12805
+#, no-wrap
+msgid "herd set-http-proxy guix-daemon http://localhost:8118\n"
 msgstr ""
 
+#. type: table
+#: doc/guix.texi:12808
+msgid "To clear the proxy settings, run:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:12811
+#, fuzzy, no-wrap
+#| msgid "herd start ssh-daemon\n"
+msgid "herd set-http-proxy guix-daemon\n"
+msgstr "herd start ssh-daemon\n"
+
 #. type: item
-#: doc/guix.texi:12666
+#: doc/guix.texi:12813
 #, no-wrap
 msgid "@code{tmpdir} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12668
+#: doc/guix.texi:12815
 msgid "A directory path where the @command{guix-daemon} will perform builds."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12672
+#: doc/guix.texi:12819
 #, no-wrap
 msgid "{Scheme Procedure} udev-service [#:udev @var{eudev} #:rules @code{'()}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12677
+#: doc/guix.texi:12824
 msgid "Run @var{udev}, which populates the @file{/dev} directory dynamically.  udev rules can be provided as a list of files through the @var{rules} variable.  The procedures @code{udev-rule} and @code{file->udev-rule} from @code{(gnu services base)} simplify the creation of such rule files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12679
+#: doc/guix.texi:12826
 #, no-wrap
 msgid "{Scheme Procedure} udev-rule [@var{file-name} @var{contents}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12682
+#: doc/guix.texi:12829
 msgid "Return a udev-rule file named @var{file-name} containing the rules defined by the @var{contents} literal."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12686
+#: doc/guix.texi:12833
 msgid "In the following example, a rule for a USB device is defined to be stored in the file @file{90-usb-thing.rules}.  The rule runs a script upon detecting a USB device with a given product identifier."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12694
+#: doc/guix.texi:12841
 #, no-wrap
 msgid ""
 "(define %example-udev-rule\n"
@@ -22573,17 +23035,17 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12698
+#: doc/guix.texi:12845
 msgid "The @command{herd rules udev} command, as root, returns the name of the directory containing all the active udev rules."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12701
+#: doc/guix.texi:12848
 msgid "Here we show how the default @var{udev-service} can be extended with it."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12711
+#: doc/guix.texi:12858
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -22597,23 +23059,23 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12713
+#: doc/guix.texi:12860
 #, no-wrap
 msgid "{Scheme Procedure} file->udev-rule [@var{file-name} @var{file}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12716
+#: doc/guix.texi:12863
 msgid "Return a udev file named @var{file-name} containing the rules defined within @var{file}, a file-like object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12718
+#: doc/guix.texi:12865
 msgid "The following example showcases how we can use an existing rule file."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12723
+#: doc/guix.texi:12870
 #, no-wrap
 msgid ""
 "(use-modules (guix download)     ;for url-fetch\n"
@@ -22623,7 +23085,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12734
+#: doc/guix.texi:12881
 #, no-wrap
 msgid ""
 "(define %android-udev-rules\n"
@@ -22639,17 +23101,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12743
+#: doc/guix.texi:12890
 msgid "Additionally, Guix package definitions can be included in @var{rules} in order to extend the udev rules with the definitions found under their @file{lib/udev/rules.d} sub-directory.  In lieu of the previous @var{file->udev-rule} example, we could have used the @var{android-udev-rules} package which exists in Guix in the @code{(gnu packages android)} module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12752
+#: doc/guix.texi:12899
 msgid "The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices without root privileges.  It also details how to create the @code{adbusers} group, which is required for the proper functioning of the rules defined within the @var{android-udev-rules} package.  To create such a group, we must define it both as part of the @var{supplementary-groups} of our @var{user-account} declaration, as well as in the @var{groups} field of the @var{operating-system} record."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12757
+#: doc/guix.texi:12904
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages android)  ;for android-udev-rules\n"
@@ -22659,12 +23121,12 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12765
+#: doc/guix.texi:12912
 #, no-wrap
 msgid ""
 "(operating-system\n"
 "  ;; @dots{}\n"
-"  (users (cons (user-acount\n"
+"  (users (cons (user-account\n"
 "                ;; @dots{}\n"
 "                (supplementary-groups\n"
 "                 '(\"adbusers\"   ;for adb\n"
@@ -22673,7 +23135,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12768
+#: doc/guix.texi:12915
 #, no-wrap
 msgid ""
 "  (groups (cons (user-group (system? #t) (name \"adbusers\"))\n"
@@ -22682,7 +23144,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12770
+#: doc/guix.texi:12917
 #, no-wrap
 msgid ""
 "  ;; @dots{}\n"
@@ -22690,7 +23152,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12778
+#: doc/guix.texi:12925
 #, no-wrap
 msgid ""
 "  (services\n"
@@ -22703,289 +23165,289 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12780
+#: doc/guix.texi:12927
 #, no-wrap
 msgid "{Scheme Variable} urandom-seed-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12785
+#: doc/guix.texi:12932
 msgid "Save some entropy in @var{%random-seed-file} to seed @file{/dev/urandom} when rebooting.  It also tries to seed @file{/dev/urandom} from @file{/dev/hwrng} while booting, if @file{/dev/hwrng} exists and is readable."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12787
+#: doc/guix.texi:12934
 #, no-wrap
 msgid "{Scheme Variable} %random-seed-file"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12791
+#: doc/guix.texi:12938
 msgid "This is the name of the file where some random bytes are saved by @var{urandom-seed-service} to seed @file{/dev/urandom} when rebooting.  It defaults to @file{/var/lib/random-seed}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12793
+#: doc/guix.texi:12940
 #, no-wrap
 msgid "mouse"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12794
+#: doc/guix.texi:12941
 #, no-wrap
 msgid "gpm"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12795
+#: doc/guix.texi:12942
 #, no-wrap
 msgid "{Scheme Variable} gpm-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12800
+#: doc/guix.texi:12947
 msgid "This is the type of the service that runs GPM, the @dfn{general-purpose mouse daemon}, which provides mouse support to the Linux console.  GPM allows users to use the mouse in the console, notably to select, copy, and paste text."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12803
+#: doc/guix.texi:12950
 msgid "The value for services of this type must be a @code{gpm-configuration} (see below).  This service is not part of @code{%base-services}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12805
+#: doc/guix.texi:12952
 #, no-wrap
 msgid "{Data Type} gpm-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12807
+#: doc/guix.texi:12954
 msgid "Data type representing the configuration of GPM."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12809
+#: doc/guix.texi:12956
 #, no-wrap
 msgid "@code{options} (default: @code{%default-gpm-options})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12814
+#: doc/guix.texi:12961
 msgid "Command-line options passed to @command{gpm}.  The default set of options instruct @command{gpm} to listen to mouse events on @file{/dev/input/mice}.  @xref{Command Line,,, gpm, gpm manual}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12815
+#: doc/guix.texi:12962
 #, no-wrap
 msgid "@code{gpm} (default: @code{gpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12817
+#: doc/guix.texi:12964
 msgid "The GPM package to use."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:12822
+#: doc/guix.texi:12969
 msgid "guix-publish-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12822
+#: doc/guix.texi:12969
 #, no-wrap
 msgid "{Scheme Variable} guix-publish-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12826
+#: doc/guix.texi:12973
 msgid "This is the service type for @command{guix publish} (@pxref{Invoking guix publish}).  Its value must be a @code{guix-publish-configuration} object, as described below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12830
+#: doc/guix.texi:12977
 msgid "This assumes that @file{/etc/guix} already contains a signing key pair as created by @command{guix archive --generate-key} (@pxref{Invoking guix archive}).  If that is not the case, the service will fail to start."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12832
+#: doc/guix.texi:12979
 #, no-wrap
 msgid "{Data Type} guix-publish-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12835
+#: doc/guix.texi:12982
 msgid "Data type representing the configuration of the @code{guix publish} service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12837
+#: doc/guix.texi:12984
 #, no-wrap
 msgid "@code{guix} (default: @code{guix})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12840
+#: doc/guix.texi:12987
 #, no-wrap
 msgid "@code{port} (default: @code{80})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12842
+#: doc/guix.texi:12989
 msgid "The TCP port to listen for connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12843 doc/guix.texi:22338
+#: doc/guix.texi:12990 doc/guix.texi:22556
 #, no-wrap
 msgid "@code{host} (default: @code{\"localhost\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12846
+#: doc/guix.texi:12993
 msgid "The host (and thus, network interface) to listen to.  Use @code{\"0.0.0.0\"} to listen on all the network interfaces."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12847
+#: doc/guix.texi:12994
 #, fuzzy, no-wrap
 #| msgid "@code{compression-level} (default: @code{3})"
 msgid "@code{compression} (default: @code{'((\"gzip\" 3))})"
 msgstr "@code{compression-level} (default: @code{3})"
 
 #. type: table
-#: doc/guix.texi:12851
+#: doc/guix.texi:12998
 msgid "This is a list of compression method/level tuple used when compressing substitutes.  For example, to compress all substitutes with @emph{both} lzip at level 7 and gzip at level 9, write:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12854
+#: doc/guix.texi:13001
 #, no-wrap
 msgid "'((\"lzip\" 7) (\"gzip\" 9))\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12858
+#: doc/guix.texi:13005
 msgid "Level 9 achieves the best compression ratio at the expense of increased CPU usage, whereas level 1 achieves fast compression."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12860
+#: doc/guix.texi:13007
 msgid "An empty list disables compression altogether."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12861
+#: doc/guix.texi:13008
 #, no-wrap
 msgid "@code{nar-path} (default: @code{\"nar\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12864
+#: doc/guix.texi:13011
 msgid "The URL path at which ``nars'' can be fetched.  @xref{Invoking guix publish, @code{--nar-path}}, for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12865
+#: doc/guix.texi:13012
 #, no-wrap
 msgid "@code{cache} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12871
+#: doc/guix.texi:13018
 msgid "When it is @code{#f}, disable caching and instead generate archives on demand.  Otherwise, this should be the name of a directory---e.g., @code{\"/var/cache/guix/publish\"}---where @command{guix publish} caches archives and meta-data ready to be sent.  @xref{Invoking guix publish, @option{--cache}}, for more information on the tradeoffs involved."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12872
+#: doc/guix.texi:13019
 #, no-wrap
 msgid "@code{workers} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12876
+#: doc/guix.texi:13023
 msgid "When it is an integer, this is the number of worker threads used for caching; when @code{#f}, the number of processors is used.  @xref{Invoking guix publish, @option{--workers}}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12877
+#: doc/guix.texi:13024
 #, no-wrap
 msgid "@code{ttl} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12881
+#: doc/guix.texi:13028
 msgid "When it is an integer, this denotes the @dfn{time-to-live} in seconds of the published archives.  @xref{Invoking guix publish, @option{--ttl}}, for more information."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:12885
+#: doc/guix.texi:13032
 msgid "rngd-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12885
+#: doc/guix.texi:13032
 #, no-wrap
 msgid "{Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12890
+#: doc/guix.texi:13037
 msgid "[#:device \"/dev/hwrng\"] Return a service that runs the @command{rngd} program from @var{rng-tools} to add @var{device} to the kernel's entropy pool.  The service will fail if @var{device} does not exist."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:12893
+#: doc/guix.texi:13040
 msgid "pam-limits-service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12893
+#: doc/guix.texi:13040
 #, no-wrap
 msgid "session limits"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12894
+#: doc/guix.texi:13041
 #, no-wrap
 msgid "ulimit"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12895
+#: doc/guix.texi:13042
 #, no-wrap
 msgid "priority"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12896
+#: doc/guix.texi:13043
 #, no-wrap
 msgid "realtime"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12897
+#: doc/guix.texi:13044
 #, no-wrap
 msgid "jackd"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12898
+#: doc/guix.texi:13045
 #, no-wrap
 msgid "{Scheme Procedure} pam-limits-service [#:limits @code{'()}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12905
+#: doc/guix.texi:13052
 msgid "Return a service that installs a configuration file for the @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, @code{pam_limits} module}.  The procedure optionally takes a list of @code{pam-limits-entry} values, which can be used to specify @code{ulimit} limits and nice priority limits to user sessions."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12908
+#: doc/guix.texi:13055
 msgid "The following limits definition sets two hard and soft limits for all login sessions of users in the @code{realtime} group:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12914
+#: doc/guix.texi:13061
 #, no-wrap
 msgid ""
 "(pam-limits-service\n"
@@ -22995,40 +23457,40 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12920
+#: doc/guix.texi:13067
 msgid "The first entry increases the maximum realtime priority for non-privileged processes; the second entry lifts any restriction of the maximum address space that can be locked in memory.  These settings are commonly used for real-time audio systems."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12925
+#: doc/guix.texi:13072
 #, no-wrap
 msgid "cron"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12926
+#: doc/guix.texi:13073
 #, no-wrap
 msgid "mcron"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12927
+#: doc/guix.texi:13074
 #, no-wrap
 msgid "scheduling jobs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12934
+#: doc/guix.texi:13081
 msgid "The @code{(gnu services mcron)} module provides an interface to GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, mcron, GNU@tie{}mcron}).  GNU@tie{}mcron is similar to the traditional Unix @command{cron} daemon; the main difference is that it is implemented in Guile Scheme, which provides a lot of flexibility when specifying the scheduling of jobs and their actions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12942
+#: doc/guix.texi:13089
 msgid "The example below defines an operating system that runs the @command{updatedb} (@pxref{Invoking updatedb,,, find, Finding Files})  and the @command{guix gc} commands (@pxref{Invoking guix gc}) daily, as well as the @command{mkid} command on behalf of an unprivileged user (@pxref{mkid invocation,,, idutils, ID Database Utilities}).  It uses gexps to introduce job definitions that are passed to mcron (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12946
+#: doc/guix.texi:13093
 #, no-wrap
 msgid ""
 "(use-modules (guix) (gnu) (gnu services mcron))\n"
@@ -23037,7 +23499,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12955
+#: doc/guix.texi:13102
 #, no-wrap
 msgid ""
 "(define updatedb-job\n"
@@ -23052,7 +23514,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12961
+#: doc/guix.texi:13108
 #, no-wrap
 msgid ""
 "(define garbage-collector-job\n"
@@ -23064,7 +23526,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12968
+#: doc/guix.texi:13115
 #, no-wrap
 msgid ""
 "(define idutils-job\n"
@@ -23077,7 +23539,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12977
+#: doc/guix.texi:13124
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -23091,12 +23553,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12984
+#: doc/guix.texi:13131
 msgid "For more complex jobs defined in Scheme where you need control over the top level, for instance to introduce a @code{use-modules} form, you can move your code to a separate program using the @code{program-file} procedure of the @code{(guix gexp)} module (@pxref{G-Expressions}).  The example below illustrates that."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13011
+#: doc/guix.texi:13158
 #, no-wrap
 msgid ""
 "(define %battery-alert-job\n"
@@ -23127,211 +23589,224 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13016
+#: doc/guix.texi:13163
 msgid "@xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, for more information on mcron job specifications.  Below is the reference of the mcron service."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13019
+#: doc/guix.texi:13166
 msgid "On a running system, you can use the @code{schedule} action of the service to visualize the mcron jobs that will be executed next:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:13022
+#: doc/guix.texi:13169
 #, no-wrap
 msgid "# herd schedule mcron\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13027
+#: doc/guix.texi:13174
 msgid "The example above lists the next five tasks that will be executed, but you can also specify the number of tasks to display:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:13030
+#: doc/guix.texi:13177
 #, no-wrap
 msgid "# herd schedule mcron 10\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13032
+#: doc/guix.texi:13179
 #, no-wrap
 msgid "{Scheme Variable} mcron-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13035
+#: doc/guix.texi:13182
 msgid "This is the type of the @code{mcron} service, whose value is an @code{mcron-configuration} object."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13040
+#: doc/guix.texi:13187
 msgid "This service type can be the target of a service extension that provides it additional job specifications (@pxref{Service Composition}).  In other words, it is possible to define services that provide additional mcron jobs to run."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13042
+#: doc/guix.texi:13189
 #, no-wrap
 msgid "{Data Type} mcron-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13044
+#: doc/guix.texi:13191
 msgid "Data type representing the configuration of mcron."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13046
+#: doc/guix.texi:13193
 #, no-wrap
 msgid "@code{mcron} (default: @var{mcron})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13048
+#: doc/guix.texi:13195
 msgid "The mcron package to use."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:13049 doc/guix.texi:13108
+#: doc/guix.texi:13196 doc/guix.texi:13265
 #, no-wrap
 msgid "jobs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13053
+#: doc/guix.texi:13200
 msgid "This is a list of gexps (@pxref{G-Expressions}), where each gexp corresponds to an mcron job specification (@pxref{Syntax, mcron job specifications,, mcron, GNU@tie{}mcron})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13060
+#: doc/guix.texi:13207
 #, no-wrap
 msgid "rottlog"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13061
+#: doc/guix.texi:13208
 #, no-wrap
 msgid "log rotation"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13068
+#: doc/guix.texi:13215
 msgid "Log files such as those found in @file{/var/log} tend to grow endlessly, so it's a good idea to @dfn{rotate} them once in a while---i.e., archive their contents in separate files, possibly compressed.  The @code{(gnu services admin)} module provides an interface to GNU@tie{}Rot[t]log, a log rotation tool (@pxref{Top,,, rottlog, GNU Rot[t]log Manual})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13071
-msgid "The example below defines an operating system that provides log rotation with the default settings, for commonly encountered log files."
+#: doc/guix.texi:13221
+msgid "This service is part of @code{%base-services}, and thus enabled by default, with the default settings, for commonly encountered log files.  The example below shows how to extend it with an additional @dfn{rotation}, should you need to do that (usually, services that produce log files already take care of that):"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13076
+#: doc/guix.texi:13225
 #, no-wrap
 msgid ""
 "(use-modules (guix) (gnu))\n"
-"(use-service-modules admin mcron)\n"
-"(use-package-modules base idutils)\n"
+"(use-service-modules admin)\n"
 "\n"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13081
+#: doc/guix.texi:13229
+#, no-wrap
+msgid ""
+"(define my-log-files\n"
+"  ;; Log files that I want to rotate.\n"
+"  '(\"/var/log/something.log\" \"/var/log/another.log\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:13238
 #, no-wrap
 msgid ""
 "(operating-system\n"
 "  ;; @dots{}\n"
-"  (services (cons (service rottlog-service-type)\n"
+"  (services (cons (simple-service 'rotate-my-stuff\n"
+"                                  rottlog-service-type\n"
+"                                  (list (log-rotation\n"
+"                                         (frequency 'daily)\n"
+"                                         (files my-log-files))))\n"
 "                  %base-services)))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13083
+#: doc/guix.texi:13240
 #, no-wrap
 msgid "{Scheme Variable} rottlog-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13086
+#: doc/guix.texi:13243
 msgid "This is the type of the Rottlog service, whose value is a @code{rottlog-configuration} object."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13089
+#: doc/guix.texi:13246
 msgid "Other services can extend this one with new @code{log-rotation} objects (see below), thereby augmenting the set of files to be rotated."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13092
+#: doc/guix.texi:13249
 msgid "This service type can define mcron jobs (@pxref{Scheduled Job Execution}) to run the rottlog service."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13094
+#: doc/guix.texi:13251
 #, no-wrap
 msgid "{Data Type} rottlog-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13096
+#: doc/guix.texi:13253
 msgid "Data type representing the configuration of rottlog."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13098
+#: doc/guix.texi:13255
 #, no-wrap
 msgid "@code{rottlog} (default: @code{rottlog})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13100
+#: doc/guix.texi:13257
 msgid "The Rottlog package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13101
+#: doc/guix.texi:13258
 #, no-wrap
 msgid "@code{rc-file} (default: @code{(file-append rottlog \"/etc/rc\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13104
+#: doc/guix.texi:13261
 msgid "The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13105
+#: doc/guix.texi:13262
 #, no-wrap
 msgid "@code{rotations} (default: @code{%default-rotations})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13107
+#: doc/guix.texi:13264
 msgid "A list of @code{log-rotation} objects as defined below."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13111
+#: doc/guix.texi:13268
 msgid "This is a list of gexps where each gexp corresponds to an mcron job specification (@pxref{Scheduled Job Execution})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13114
+#: doc/guix.texi:13271
 #, no-wrap
 msgid "{Data Type} log-rotation"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13116
+#: doc/guix.texi:13273
 msgid "Data type representing the rotation of a group of log files."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13120
+#: doc/guix.texi:13277
 msgid "Taking an example from the Rottlog manual (@pxref{Period Related File Examples,,, rottlog, GNU Rot[t]log Manual}), a log rotation might be defined like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13129
+#: doc/guix.texi:13286
 #, no-wrap
 msgid ""
 "(log-rotation\n"
@@ -23344,111 +23819,111 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13132
+#: doc/guix.texi:13289
 msgid "The list of fields is as follows:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13134
+#: doc/guix.texi:13291
 #, no-wrap
 msgid "@code{frequency} (default: @code{'weekly})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13136
+#: doc/guix.texi:13293
 msgid "The log rotation frequency, a symbol."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:13137
+#: doc/guix.texi:13294
 #, no-wrap
 msgid "files"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13139
+#: doc/guix.texi:13296
 msgid "The list of files or file glob patterns to rotate."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13140
+#: doc/guix.texi:13297
 #, no-wrap
 msgid "@code{options} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13143
+#: doc/guix.texi:13300
 msgid "The list of rottlog options for this rotation (@pxref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13144
+#: doc/guix.texi:13301
 #, no-wrap
 msgid "@code{post-rotate} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13146
+#: doc/guix.texi:13303
 msgid "Either @code{#f} or a gexp to execute once the rotation has completed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13149
+#: doc/guix.texi:13306
 #, no-wrap
 msgid "{Scheme Variable} %default-rotations"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13152
+#: doc/guix.texi:13309
 msgid "Specifies weekly rotation of @var{%rotated-files} and of @file{/var/log/guix-daemon.log}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13154
+#: doc/guix.texi:13311
 #, no-wrap
 msgid "{Scheme Variable} %rotated-files"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13158
+#: doc/guix.texi:13315
 msgid "The list of syslog-controlled files to be rotated.  By default it is: @code{'(\"/var/log/messages\" \"/var/log/secure\" \"/var/log/debug\" \\ \"/var/log/maillog\")}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13165
+#: doc/guix.texi:13322
 msgid "The @code{(gnu services networking)} module provides services to configure the network interface."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13166
+#: doc/guix.texi:13323
 #, no-wrap
 msgid "DHCP, networking service"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13167
+#: doc/guix.texi:13324
 #, no-wrap
 msgid "{Scheme Variable} dhcp-client-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13171
+#: doc/guix.texi:13328
 msgid "This is the type of services that run @var{dhcp}, a Dynamic Host Configuration Protocol (DHCP) client, on all the non-loopback network interfaces.  Its value is the DHCP client package to use, @code{isc-dhcp} by default."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13173
+#: doc/guix.texi:13330
 #, no-wrap
 msgid "{Scheme Procedure} dhcpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13177
+#: doc/guix.texi:13334
 msgid "This type defines a service that runs a DHCP daemon.  To create a service of this type, you must supply a @code{}.  For example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13183
+#: doc/guix.texi:13340
 #, no-wrap
 msgid ""
 "(service dhcpd-service-type\n"
@@ -23458,111 +23933,111 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13186
+#: doc/guix.texi:13343
 #, no-wrap
 msgid "{Data Type} dhcpd-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13188
+#: doc/guix.texi:13345
 #, no-wrap
 msgid "@code{package} (default: @code{isc-dhcp})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13193
+#: doc/guix.texi:13350
 msgid "The package that provides the DHCP daemon.  This package is expected to provide the daemon at @file{sbin/dhcpd} relative to its output directory.  The default package is the @uref{https://www.isc.org/products/DHCP, ISC's DHCP server}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13193 doc/guix.texi:13445 doc/guix.texi:17682
+#: doc/guix.texi:13350 doc/guix.texi:13602 doc/guix.texi:17839
 #, no-wrap
 msgid "@code{config-file} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13198
+#: doc/guix.texi:13355
 msgid "The configuration file to use.  This is required.  It will be passed to @code{dhcpd} via its @code{-cf} option.  This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects}).  See @code{man dhcpd.conf} for details on the configuration file syntax."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13198
+#: doc/guix.texi:13355
 #, no-wrap
 msgid "@code{version} (default: @code{\"4\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13203
+#: doc/guix.texi:13360
 msgid "The DHCP version to use.  The ISC DHCP server supports the values ``4'', ``6'', and ``4o6''.  These correspond to the @code{dhcpd} program options @code{-4}, @code{-6}, and @code{-4o6}.  See @code{man dhcpd} for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13203
+#: doc/guix.texi:13360
 #, no-wrap
 msgid "@code{run-directory} (default: @code{\"/run/dhcpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13206
+#: doc/guix.texi:13363
 msgid "The run directory to use.  At service activation time, this directory will be created if it does not exist."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13206
+#: doc/guix.texi:13363
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/run/dhcpd/dhcpd.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13209
+#: doc/guix.texi:13366
 msgid "The PID file to use.  This corresponds to the @code{-pf} option of @code{dhcpd}.  See @code{man dhcpd} for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13209
+#: doc/guix.texi:13366
 #, no-wrap
 msgid "@code{interfaces} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13215
+#: doc/guix.texi:13372
 msgid "The names of the network interfaces on which dhcpd should listen for broadcasts.  If this list is not empty, then its elements (which must be strings) will be appended to the @code{dhcpd} invocation when starting the daemon.  It may not be necessary to explicitly specify any interfaces here; see @code{man dhcpd} for details."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13218
+#: doc/guix.texi:13375
 #, no-wrap
 msgid "{Scheme Variable} static-networking-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13221
+#: doc/guix.texi:13378
 msgid "This is the type for statically-configured network interfaces."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13223
+#: doc/guix.texi:13380
 #, no-wrap
 msgid "{Scheme Procedure} static-networking-service @var{interface} @var{ip} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13231
+#: doc/guix.texi:13388
 msgid "[#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] @ [#:requirement @code{'(udev)}] Return a service that starts @var{interface} with address @var{ip}.  If @var{netmask} is true, use it as the network mask.  If @var{gateway} is true, it must be a string specifying the default network gateway.  @var{requirement} can be used to declare a dependency on another service before configuring the interface."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13236
+#: doc/guix.texi:13393
 msgid "This procedure can be called several times, one for each network interface of interest.  Behind the scenes what it does is extend @code{static-networking-service-type} with additional network interfaces to handle."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13238
+#: doc/guix.texi:13395
 msgid "For example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13243
+#: doc/guix.texi:13400
 #, no-wrap
 msgid ""
 "(static-networking-service \"eno1\" \"192.168.1.82\"\n"
@@ -23571,235 +24046,235 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13246
+#: doc/guix.texi:13403
 #, no-wrap
 msgid "wicd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13249
+#: doc/guix.texi:13406
 #, no-wrap
 msgid "network management"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13250
+#: doc/guix.texi:13407
 #, no-wrap
 msgid "{Scheme Procedure} wicd-service [#:wicd @var{wicd}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13253
+#: doc/guix.texi:13410
 msgid "Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a network management daemon that aims to simplify wired and wireless networking."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13258
+#: doc/guix.texi:13415
 msgid "This service adds the @var{wicd} package to the global profile, providing several commands to interact with the daemon and configure networking: @command{wicd-client}, a graphical user interface, and the @command{wicd-cli} and @command{wicd-curses} user interfaces."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13260
+#: doc/guix.texi:13417
 #, no-wrap
 msgid "ModemManager"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13262
+#: doc/guix.texi:13419
 #, no-wrap
 msgid "{Scheme Variable} modem-manager-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13267
+#: doc/guix.texi:13424
 msgid "This is the service type for the @uref{https://wiki.gnome.org/Projects/ModemManager, ModemManager} service. The value for this service type is a @code{modem-manager-configuration} record."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13270 doc/guix.texi:13298 doc/guix.texi:13330
+#: doc/guix.texi:13427 doc/guix.texi:13455 doc/guix.texi:13487
 msgid "This service is part of @code{%desktop-services} (@pxref{Desktop Services})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13272
+#: doc/guix.texi:13429
 #, no-wrap
 msgid "{Data Type} modem-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13274
+#: doc/guix.texi:13431
 msgid "Data type representing the configuration of ModemManager."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13276
+#: doc/guix.texi:13433
 #, no-wrap
 msgid "@code{modem-manager} (default: @code{modem-manager})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13278
+#: doc/guix.texi:13435
 msgid "The ModemManager package to use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13282
+#: doc/guix.texi:13439
 #, no-wrap
 msgid "USB_ModeSwitch"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13283
+#: doc/guix.texi:13440
 #, no-wrap
 msgid "Modeswitching"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13285
+#: doc/guix.texi:13442
 #, no-wrap
 msgid "{Scheme Variable} usb-modeswitch-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13289
-msgid "This is the service type for the @uref{http://www.draisberghof.de/usb_modeswitch/, USB_ModeSwitch} service. The value for this service type is a @code{usb-modeswitch-configuration} record."
+#: doc/guix.texi:13446
+msgid "This is the service type for the @uref{https://www.draisberghof.de/usb_modeswitch/, USB_ModeSwitch} service. The value for this service type is a @code{usb-modeswitch-configuration} record."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13295
+#: doc/guix.texi:13452
 msgid "When plugged in, some USB modems (and other USB devices) initially present themselves as a read-only storage medium and not as a modem.  They need to be @dfn{modeswitched} before they are usable.  The USB_ModeSwitch service type installs udev rules to automatically modeswitch these devices when they are plugged in."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13300
+#: doc/guix.texi:13457
 #, no-wrap
 msgid "{Data Type} usb-modeswitch-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13302
+#: doc/guix.texi:13459
 msgid "Data type representing the configuration of USB_ModeSwitch."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13304
+#: doc/guix.texi:13461
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{usb-modeswitch} (default: @code{usb-modeswitch})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:13306
+#: doc/guix.texi:13463
 msgid "The USB_ModeSwitch package providing the binaries for modeswitching."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13307
+#: doc/guix.texi:13464
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{usb-modeswitch-data} (default: @code{usb-modeswitch-data})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:13310
+#: doc/guix.texi:13467
 msgid "The package providing the device data and udev rules file used by USB_ModeSwitch."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13311
+#: doc/guix.texi:13468
 #, no-wrap
 msgid "@code{config-file} (default: @code{#~(string-append #$usb-modeswitch:dispatcher \"/etc/usb_modeswitch.conf\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13316
+#: doc/guix.texi:13473
 msgid "Which config file to use for the USB_ModeSwitch dispatcher.  By default the config file shipped with USB_ModeSwitch is used which disables logging to @file{/var/log} among other default settings.  If set to @code{#f}, no config file is used."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13320
+#: doc/guix.texi:13477
 #, no-wrap
 msgid "NetworkManager"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13322
+#: doc/guix.texi:13479
 #, no-wrap
 msgid "{Scheme Variable} network-manager-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13327
+#: doc/guix.texi:13484
 msgid "This is the service type for the @uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager} service. The value for this service type is a @code{network-manager-configuration} record."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13332
+#: doc/guix.texi:13489
 #, no-wrap
 msgid "{Data Type} network-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13334
+#: doc/guix.texi:13491
 msgid "Data type representing the configuration of NetworkManager."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13336
+#: doc/guix.texi:13493
 #, no-wrap
 msgid "@code{network-manager} (default: @code{network-manager})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13338
+#: doc/guix.texi:13495
 msgid "The NetworkManager package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13339
+#: doc/guix.texi:13496
 #, no-wrap
 msgid "@code{dns} (default: @code{\"default\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13342
+#: doc/guix.texi:13499
 msgid "Processing mode for DNS, which affects how NetworkManager uses the @code{resolv.conf} configuration file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13344
+#: doc/guix.texi:13501
 #, no-wrap
 msgid "default"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13347
+#: doc/guix.texi:13504
 msgid "NetworkManager will update @code{resolv.conf} to reflect the nameservers provided by currently active connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13348
+#: doc/guix.texi:13505
 #, no-wrap
 msgid "dnsmasq"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13352
+#: doc/guix.texi:13509
 msgid "NetworkManager will run @code{dnsmasq} as a local caching nameserver, using a @dfn{conditional forwarding} configuration if you are connected to a VPN, and then update @code{resolv.conf} to point to the local nameserver."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13358
+#: doc/guix.texi:13515
 msgid "With this setting, you can share your network connection.  For example when you want to share your network connection to another laptop @i{via} an Ethernet cable, you can open @command{nm-connection-editor} and configure the Wired connection's method for IPv4 and IPv6 to be ``Shared to other computers'' and reestablish the connection (or reboot)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13365
+#: doc/guix.texi:13522
 msgid "You can also set up a @dfn{host-to-guest connection} to QEMU VMs (@pxref{Installing Guix in a VM}).  With a host-to-guest connection, you can e.g.@: access a Web server running on the VM (@pxref{Web Services}) from a Web browser on your host system, or connect to the VM @i{via} SSH (@pxref{Networking Services, @code{openssh-service-type}}).  To set up a host-to-guest connection, run this command once:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:13372
+#: doc/guix.texi:13529
 #, no-wrap
 msgid ""
 "nmcli connection add type tun \\\n"
@@ -23810,50 +24285,50 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13377
+#: doc/guix.texi:13534
 msgid "Then each time you launch your QEMU VM (@pxref{Running Guix in a VM}), pass @option{-nic tap,ifname=tap0,script=no,downscript=no} to @command{qemu-system-...}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13380
+#: doc/guix.texi:13537
 msgid "NetworkManager will not modify @code{resolv.conf}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13382
+#: doc/guix.texi:13539
 #, no-wrap
 msgid "@code{vpn-plugins} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13386
+#: doc/guix.texi:13543
 msgid "This is the list of available plugins for virtual private networks (VPNs).  An example of this is the @code{network-manager-openvpn} package, which allows NetworkManager to manage VPNs @i{via} OpenVPN."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13390
+#: doc/guix.texi:13547
 #, no-wrap
 msgid "Connman"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13391
+#: doc/guix.texi:13548
 #, no-wrap
 msgid "{Scheme Variable} connman-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13394
+#: doc/guix.texi:13551
 msgid "This is the service type to run @url{https://01.org/connman,Connman}, a network connection manager."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13397
+#: doc/guix.texi:13554
 msgid "Its value must be an @code{connman-configuration} record as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13402
+#: doc/guix.texi:13559
 #, no-wrap
 msgid ""
 "(service connman-service-type\n"
@@ -23862,149 +24337,149 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13405
+#: doc/guix.texi:13562
 msgid "See below for details about @code{connman-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13407
+#: doc/guix.texi:13564
 #, no-wrap
 msgid "{Data Type} connman-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13409
+#: doc/guix.texi:13566
 msgid "Data Type representing the configuration of connman."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13411
+#: doc/guix.texi:13568
 #, no-wrap
 msgid "@code{connman} (default: @var{connman})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13413
+#: doc/guix.texi:13570
 msgid "The connman package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13414
+#: doc/guix.texi:13571
 #, no-wrap
 msgid "@code{disable-vpn?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13416
+#: doc/guix.texi:13573
 msgid "When true, disable connman's vpn plugin."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13419
+#: doc/guix.texi:13576
 #, no-wrap
 msgid "WPA Supplicant"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13420
+#: doc/guix.texi:13577
 #, no-wrap
 msgid "{Scheme Variable} wpa-supplicant-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13424
+#: doc/guix.texi:13581
 msgid "This is the service type to run @url{https://w1.fi/wpa_supplicant/,WPA supplicant}, an authentication daemon required to authenticate against encrypted WiFi or ethernet networks."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13426
+#: doc/guix.texi:13583
 #, no-wrap
 msgid "{Data Type} wpa-supplicant-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13428
+#: doc/guix.texi:13585
 msgid "Data type representing the configuration of WPA Supplicant."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13430 doc/guix.texi:25047
+#: doc/guix.texi:13587 doc/guix.texi:25268
 msgid "It takes the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13432
+#: doc/guix.texi:13589
 #, no-wrap
 msgid "@code{wpa-supplicant} (default: @code{wpa-supplicant})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13434
+#: doc/guix.texi:13591
 msgid "The WPA Supplicant package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13435
+#: doc/guix.texi:13592
 #, no-wrap
 msgid "@code{dbus?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13437
+#: doc/guix.texi:13594
 msgid "Whether to listen for requests on D-Bus."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13438
+#: doc/guix.texi:13595
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/wpa_supplicant.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13440
+#: doc/guix.texi:13597
 msgid "Where to store the PID file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13441
+#: doc/guix.texi:13598
 #, no-wrap
 msgid "@code{interface} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13444
+#: doc/guix.texi:13601
 msgid "If this is set, it must specify the name of a network interface that WPA supplicant will control."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13447
+#: doc/guix.texi:13604
 msgid "Optional configuration file to use."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13450
+#: doc/guix.texi:13607
 msgid "List of additional command-line arguments to pass to the daemon."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13453
+#: doc/guix.texi:13610
 #, no-wrap
 msgid "iptables"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13454
+#: doc/guix.texi:13611
 #, no-wrap
 msgid "{Scheme Variable} iptables-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13460
+#: doc/guix.texi:13617
 msgid "This is the service type to set up an iptables configuration.  iptables is a packet filtering framework supported by the Linux kernel.  This service supports configuring iptables for both IPv4 and IPv6.  A simple example configuration rejecting all incoming connections except those to the ssh port 22 is shown below."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13480
+#: doc/guix.texi:13637
 #, no-wrap
 msgid ""
 "(service iptables-service-type\n"
@@ -24028,249 +24503,249 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13483
+#: doc/guix.texi:13640
 #, no-wrap
 msgid "{Data Type} iptables-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13485
+#: doc/guix.texi:13642
 msgid "The data type representing the configuration of iptables."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13487
+#: doc/guix.texi:13644
 #, no-wrap
 msgid "@code{iptables} (default: @code{iptables})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13490
+#: doc/guix.texi:13647
 msgid "The iptables package that provides @code{iptables-restore} and @code{ip6tables-restore}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13490
+#: doc/guix.texi:13647
 #, no-wrap
 msgid "@code{ipv4-rules} (default: @code{%iptables-accept-all-rules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13494
+#: doc/guix.texi:13651
 msgid "The iptables rules to use.  It will be passed to @code{iptables-restore}.  This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13494
+#: doc/guix.texi:13651
 #, no-wrap
 msgid "@code{ipv6-rules} (default: @code{%iptables-accept-all-rules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13498
+#: doc/guix.texi:13655
 msgid "The ip6tables rules to use.  It will be passed to @code{ip6tables-restore}.  This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13501
+#: doc/guix.texi:13658
 #, no-wrap
 msgid "nftables"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13502
+#: doc/guix.texi:13659
 #, no-wrap
 msgid "{Scheme Variable} nftables-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13510
+#: doc/guix.texi:13667
 msgid "This is the service type to set up a nftables configuration.  nftables is a netfilter project that aims to replace the existing iptables, ip6tables, arptables and ebtables framework.  It provides a new packet filtering framework, a new user-space utility @command{nft}, and a compatibility layer for iptables.  This service comes with a default ruleset @code{%default-nftables-ruleset} that rejecting all incomming connections except those to the ssh port 22.  To use it, simply write:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13513
+#: doc/guix.texi:13670
 #, no-wrap
 msgid "(service nftables-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13516
+#: doc/guix.texi:13673
 #, fuzzy, no-wrap
 #| msgid "{Data Type} build-machine"
 msgid "{Data Type} nftables-configuration"
 msgstr "{Тип данных} build-machine"
 
 #. type: deftp
-#: doc/guix.texi:13518
+#: doc/guix.texi:13675
 #, fuzzy
 #| msgid "Manage the operating system configuration."
 msgid "The data type representing the configuration of nftables."
 msgstr "Управление конфигурацией операционной системы."
 
 #. type: item
-#: doc/guix.texi:13520
+#: doc/guix.texi:13677
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{package} (default: @code{nftables})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:13522
+#: doc/guix.texi:13679
 msgid "The nftables package that provides @command{nft}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13522
+#: doc/guix.texi:13679
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{ruleset} (default: @code{%default-nftables-ruleset})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:13525
+#: doc/guix.texi:13682
 msgid "The nftables ruleset to use.  This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13528
+#: doc/guix.texi:13685
 #, no-wrap
 msgid "NTP (Network Time Protocol), service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13529
+#: doc/guix.texi:13686
 #, no-wrap
 msgid "ntpd, service for the Network Time Protocol daemon"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13530
+#: doc/guix.texi:13687
 #, no-wrap
 msgid "real time clock"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13531
+#: doc/guix.texi:13688
 #, no-wrap
 msgid "{Scheme Variable} ntp-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13535
-msgid "This is the type of the service running the @uref{http://www.ntp.org, Network Time Protocol (NTP)} daemon, @command{ntpd}.  The daemon will keep the system clock synchronized with that of the specified NTP servers."
+#: doc/guix.texi:13692
+msgid "This is the type of the service running the @uref{https://www.ntp.org, Network Time Protocol (NTP)} daemon, @command{ntpd}.  The daemon will keep the system clock synchronized with that of the specified NTP servers."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13538
+#: doc/guix.texi:13695
 msgid "The value of this service is an @code{ntpd-configuration} object, as described below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13540
+#: doc/guix.texi:13697
 #, no-wrap
 msgid "{Data Type} ntp-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13542
+#: doc/guix.texi:13699
 msgid "This is the data type for the NTP service configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13544
+#: doc/guix.texi:13701
 #, no-wrap
 msgid "@code{servers} (default: @code{%ntp-servers})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13548
+#: doc/guix.texi:13705
 msgid "This is the list of servers (@code{} records) with which @command{ntpd} will be synchronized.  See the @code{ntp-server} data type definition below."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13549
+#: doc/guix.texi:13706
 #, fuzzy, no-wrap
 #| msgid "@code{parallel-builds} (default: @code{1})"
 msgid "@code{allow-large-adjustment?} (default: @code{#t})"
 msgstr "@code{parallel-builds} (default: @code{1})"
 
 #. type: table
-#: doc/guix.texi:13552
+#: doc/guix.texi:13709
 msgid "This determines whether @command{ntpd} is allowed to make an initial adjustment of more than 1,000 seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13553
+#: doc/guix.texi:13710
 #, no-wrap
 msgid "@code{ntp} (default: @code{ntp})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13555
+#: doc/guix.texi:13712
 msgid "The NTP package to use."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13558
+#: doc/guix.texi:13715
 #, no-wrap
 msgid "{Scheme Variable} %ntp-servers"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13561
+#: doc/guix.texi:13718
 msgid "List of host names used as the default NTP servers.  These are servers of the @uref{https://www.ntppool.org/en/, NTP Pool Project}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13563
+#: doc/guix.texi:13720
 #, no-wrap
 msgid "{Data Type} ntp-server"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13565
+#: doc/guix.texi:13722
 msgid "The data type representing the configuration of a NTP server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13567
+#: doc/guix.texi:13724
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{type} (default: @code{'server})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:13570
+#: doc/guix.texi:13727
 msgid "The type of the NTP server, given as a symbol. One of @code{'pool}, @code{'server}, @code{'peer}, @code{'broadcast} or @code{'manycastclient}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:13571
+#: doc/guix.texi:13728
 #, no-wrap
 msgid "address"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13573
+#: doc/guix.texi:13730
 #, fuzzy
 #| msgid "The ordering of the drives matters."
 msgid "The address of the server, as a string."
 msgstr "Порядок следования устройств имеет значение."
 
 #. type: code{#1}
-#: doc/guix.texi:13574 doc/guix.texi:25419 doc/guix.texi:25439
+#: doc/guix.texi:13731 doc/guix.texi:25682 doc/guix.texi:25702
 #, no-wrap
 msgid "options"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13579
+#: doc/guix.texi:13736
 msgid "NTPD options to use with that specific server, given as a list of option names and/or of option names and values tuples. The following example define a server to use with the options @option{iburst} and @option{prefer}, as well as @option{version} 3 and a @option{maxpoll} time of 16 seconds."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:13585
+#: doc/guix.texi:13742
 #, no-wrap
 msgid ""
 "(ntp-server\n"
@@ -24280,24 +24755,24 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13589
+#: doc/guix.texi:13746
 #, no-wrap
 msgid "OpenNTPD"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13590
+#: doc/guix.texi:13747
 #, no-wrap
 msgid "{Scheme Procedure} openntpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13594
+#: doc/guix.texi:13751
 msgid "Run the @command{ntpd}, the Network Time Protocol (NTP) daemon, as implemented by @uref{http://www.openntpd.org, OpenNTPD}.  The daemon will keep the system clock synchronized with that of the given servers."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13604
+#: doc/guix.texi:13761
 #, no-wrap
 msgid ""
 "(service\n"
@@ -24312,147 +24787,147 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13608
+#: doc/guix.texi:13765
 #, no-wrap
 msgid "{Scheme Variable} %openntpd-servers"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13611
+#: doc/guix.texi:13768
 msgid "This variable is a list of the server addresses defined in @var{%ntp-servers}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13613
+#: doc/guix.texi:13770
 #, no-wrap
 msgid "{Data Type} openntpd-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13615
+#: doc/guix.texi:13772
 #, no-wrap
 msgid "@code{openntpd} (default: @code{(file-append openntpd \"/sbin/ntpd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13617
+#: doc/guix.texi:13774
 msgid "The openntpd executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13617
+#: doc/guix.texi:13774
 #, no-wrap
 msgid "@code{listen-on} (default: @code{'(\"127.0.0.1\" \"::1\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13619
+#: doc/guix.texi:13776
 msgid "A list of local IP addresses or hostnames the ntpd daemon should listen on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13619
+#: doc/guix.texi:13776
 #, no-wrap
 msgid "@code{query-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13621
+#: doc/guix.texi:13778
 msgid "A list of local IP address the ntpd daemon should use for outgoing queries."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13621
+#: doc/guix.texi:13778
 #, no-wrap
 msgid "@code{sensor} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13626
+#: doc/guix.texi:13783
 msgid "Specify a list of timedelta sensor devices ntpd should use.  @code{ntpd} will listen to each sensor that actually exists and ignore non-existent ones.  See @uref{https://man.openbsd.org/ntpd.conf, upstream documentation} for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13626
+#: doc/guix.texi:13783
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{server} (default: @code{'()})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:13628
+#: doc/guix.texi:13785
 msgid "Specify a list of IP addresses or hostnames of NTP servers to synchronize to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13628
+#: doc/guix.texi:13785
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{servers} (default: @var{%openntp-servers})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:13630
+#: doc/guix.texi:13787
 msgid "Specify a list of IP addresses or hostnames of NTP pools to synchronize to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13630
+#: doc/guix.texi:13787
 #, no-wrap
 msgid "@code{constraint-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13637
+#: doc/guix.texi:13794
 msgid "@code{ntpd} can be configured to query the ‘Date’ from trusted HTTPS servers via TLS.  This time information is not used for precision but acts as an authenticated constraint, thereby reducing the impact of unauthenticated NTP man-in-the-middle attacks.  Specify a list of URLs, IP addresses or hostnames of HTTPS servers to provide a constraint."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13637
+#: doc/guix.texi:13794
 #, no-wrap
 msgid "@code{constraints-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13641
+#: doc/guix.texi:13798
 msgid "As with constraint from, specify a list of URLs, IP addresses or hostnames of HTTPS servers to provide a constraint.  Should the hostname resolve to multiple IP addresses, @code{ntpd} will calculate a median constraint from all of them."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13641
+#: doc/guix.texi:13798
 #, no-wrap
 msgid "@code{allow-large-adjustment?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13644
+#: doc/guix.texi:13801
 msgid "Determines if @code{ntpd} is allowed to make an initial adjustment of more than 180 seconds."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13647
+#: doc/guix.texi:13804
 #, no-wrap
 msgid "inetd"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13648
+#: doc/guix.texi:13805
 #, no-wrap
 msgid "{Scheme variable} inetd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13653
+#: doc/guix.texi:13810
 msgid "This service runs the @command{inetd} (@pxref{inetd invocation,,, inetutils, GNU Inetutils}) daemon.  @command{inetd} listens for connections on internet sockets, and lazily starts the specified server program when a connection is made on one of these sockets."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13659
+#: doc/guix.texi:13816
 msgid "The value of this service is an @code{inetd-configuration} object.  The following example configures the @command{inetd} daemon to provide the built-in @command{echo} service, as well as an smtp service which forwards smtp traffic over ssh to a server @code{smtp-server} behind a gateway @code{hostname}:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13682
+#: doc/guix.texi:13839
 #, no-wrap
 msgid ""
 "(service\n"
@@ -24479,220 +24954,220 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13685
+#: doc/guix.texi:13842
 msgid "See below for more details about @code{inetd-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13687
+#: doc/guix.texi:13844
 #, no-wrap
 msgid "{Data Type} inetd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13689
+#: doc/guix.texi:13846
 msgid "Data type representing the configuration of @command{inetd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13691
+#: doc/guix.texi:13848
 #, no-wrap
 msgid "@code{program} (default: @code{(file-append inetutils \"/libexec/inetd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13693
+#: doc/guix.texi:13850
 msgid "The @command{inetd} executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13694 doc/guix.texi:21177
+#: doc/guix.texi:13851 doc/guix.texi:21373
 #, no-wrap
 msgid "@code{entries} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13697
+#: doc/guix.texi:13854
 msgid "A list of @command{inetd} service entries.  Each entry should be created by the @code{inetd-entry} constructor."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13700
+#: doc/guix.texi:13857
 #, no-wrap
 msgid "{Data Type} inetd-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13704
+#: doc/guix.texi:13861
 msgid "Data type representing an entry in the @command{inetd} configuration.  Each entry corresponds to a socket where @command{inetd} will listen for requests."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13706
+#: doc/guix.texi:13863
 #, no-wrap
 msgid "@code{node} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13711
+#: doc/guix.texi:13868
 msgid "Optional string, a comma-separated list of local addresses @command{inetd} should use when listening for this service.  @xref{Configuration file,,, inetutils, GNU Inetutils} for a complete description of all options."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13713
+#: doc/guix.texi:13870
 msgid "A string, the name must correspond to an entry in @code{/etc/services}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:13713
+#: doc/guix.texi:13870
 #, no-wrap
 msgid "socket-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13716
+#: doc/guix.texi:13873
 msgid "One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or @code{'seqpacket}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:13716
+#: doc/guix.texi:13873
 #, no-wrap
 msgid "protocol"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13718
+#: doc/guix.texi:13875
 msgid "A string, must correspond to an entry in @code{/etc/protocols}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13718
+#: doc/guix.texi:13875
 #, no-wrap
 msgid "@code{wait?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13721
+#: doc/guix.texi:13878
 msgid "Whether @command{inetd} should wait for the server to exit before listening to new service requests."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13726
+#: doc/guix.texi:13883
 msgid "A string containing the user (and, optionally, group) name of the user as whom the server should run.  The group name can be specified in a suffix, separated by a colon or period, i.e.@: @code{\"user\"}, @code{\"user:group\"} or @code{\"user.group\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13726
+#: doc/guix.texi:13883
 #, no-wrap
 msgid "@code{program} (default: @code{\"internal\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13729
+#: doc/guix.texi:13886
 msgid "The server program which will serve the requests, or @code{\"internal\"} if @command{inetd} should use a built-in service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13734
+#: doc/guix.texi:13891
 msgid "A list strings or file-like objects, which are the server program's arguments, starting with the zeroth argument, i.e.@: the name of the program itself.  For @command{inetd}'s internal services, this entry must be @code{'()} or @code{'(\"internal\")}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13738
+#: doc/guix.texi:13895
 msgid "@xref{Configuration file,,, inetutils, GNU Inetutils} for a more detailed discussion of each configuration field."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13740
+#: doc/guix.texi:13897
 #, no-wrap
 msgid "Tor"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13741
+#: doc/guix.texi:13898
 #, no-wrap
 msgid "{Scheme Variable} tor-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13746
+#: doc/guix.texi:13903
 msgid "This is the type for a service that runs the @uref{https://torproject.org, Tor} anonymous networking daemon.  The service is configured using a @code{} record.  By default, the Tor daemon runs as the @code{tor} unprivileged user, which is a member of the @code{tor} group."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13749
+#: doc/guix.texi:13906
 #, no-wrap
 msgid "{Data Type} tor-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13751
+#: doc/guix.texi:13908
 #, no-wrap
 msgid "@code{tor} (default: @code{tor})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13756
+#: doc/guix.texi:13913
 msgid "The package that provides the Tor daemon.  This package is expected to provide the daemon at @file{bin/tor} relative to its output directory.  The default package is the @uref{https://www.torproject.org, Tor Project's} implementation."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13757
+#: doc/guix.texi:13914
 #, no-wrap
 msgid "@code{config-file} (default: @code{(plain-file \"empty\" \"\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13763
+#: doc/guix.texi:13920
 msgid "The configuration file to use.  It will be appended to a default configuration file, and the final configuration file will be passed to @code{tor} via its @code{-f} option.  This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects}).  See @code{man tor} for details on the configuration file syntax."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13764
+#: doc/guix.texi:13921
 #, no-wrap
 msgid "@code{hidden-services} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13770
+#: doc/guix.texi:13927
 msgid "The list of @code{} records to use.  For any hidden service you include in this list, appropriate configuration to enable the hidden service will be automatically added to the default configuration file.  You may conveniently create @code{} records using the @code{tor-hidden-service} procedure described below."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13771
+#: doc/guix.texi:13928
 #, no-wrap
 msgid "@code{socks-socket-type} (default: @code{'tcp})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13778
+#: doc/guix.texi:13935
 msgid "The default socket type that Tor should use for its SOCKS socket.  This must be either @code{'tcp} or @code{'unix}.  If it is @code{'tcp}, then by default Tor will listen on TCP port 9050 on the loopback interface (i.e., localhost).  If it is @code{'unix}, then Tor will listen on the UNIX domain socket @file{/var/run/tor/socks-sock}, which will be made writable by members of the @code{tor} group."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13783
+#: doc/guix.texi:13940
 msgid "If you want to customize the SOCKS socket in more detail, leave @code{socks-socket-type} at its default value of @code{'tcp} and use @code{config-file} to override the default by providing your own @code{SocksPort} option."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13786
+#: doc/guix.texi:13943
 #, no-wrap
 msgid "hidden service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13787
+#: doc/guix.texi:13944
 #, no-wrap
 msgid "{Scheme Procedure} tor-hidden-service @var{name} @var{mapping}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13790
+#: doc/guix.texi:13947
 msgid "Define a new Tor @dfn{hidden service} called @var{name} and implementing @var{mapping}.  @var{mapping} is a list of port/host tuples, such as:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:13794
+#: doc/guix.texi:13951
 #, no-wrap
 msgid ""
 " '((22 \"127.0.0.1:22\")\n"
@@ -24700,288 +25175,288 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13798
+#: doc/guix.texi:13955
 msgid "In this example, port 22 of the hidden service is mapped to local port 22, and port 80 is mapped to local port 8080."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13802
+#: doc/guix.texi:13959
 msgid "This creates a @file{/var/lib/tor/hidden-services/@var{name}} directory, where the @file{hostname} file contains the @code{.onion} host name for the hidden service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13805
+#: doc/guix.texi:13962
 msgid "See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the Tor project's documentation} for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13808
+#: doc/guix.texi:13965
 msgid "The @code{(gnu services rsync)} module provides the following services:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13812
+#: doc/guix.texi:13969
 msgid "You might want an rsync daemon if you have files that you want available so anyone (or just yourself) can download existing files or upload new files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13813
+#: doc/guix.texi:13970
 #, no-wrap
 msgid "{Scheme Variable} rsync-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13817
+#: doc/guix.texi:13974
 msgid "This is the service type for the @uref{https://rsync.samba.org, rsync} daemon, The value for this service type is a @command{rsync-configuration} record as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13820
+#: doc/guix.texi:13977
 #, no-wrap
 msgid "(service rsync-service-type)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13823
+#: doc/guix.texi:13980
 msgid "See below for details about @code{rsync-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13825
+#: doc/guix.texi:13982
 #, no-wrap
 msgid "{Data Type} rsync-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13827
+#: doc/guix.texi:13984
 msgid "Data type representing the configuration for @code{rsync-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13829
+#: doc/guix.texi:13986
 #, no-wrap
 msgid "@code{package} (default: @var{rsync})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13831
+#: doc/guix.texi:13988
 msgid "@code{rsync} package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13832
+#: doc/guix.texi:13989
 #, no-wrap
 msgid "@code{port-number} (default: @code{873})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13836
+#: doc/guix.texi:13993
 msgid "TCP port on which @command{rsync} listens for incoming connections.  If port is less than @code{1024} @command{rsync} needs to be started as the @code{root} user and group."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13837
+#: doc/guix.texi:13994
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/rsyncd/rsyncd.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13839
+#: doc/guix.texi:13996
 msgid "Name of the file where @command{rsync} writes its PID."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13840
+#: doc/guix.texi:13997
 #, no-wrap
 msgid "@code{lock-file} (default: @code{\"/var/run/rsyncd/rsyncd.lock\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13842
+#: doc/guix.texi:13999
 msgid "Name of the file where @command{rsync} writes its lock file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13843
+#: doc/guix.texi:14000
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/rsyncd.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13845
+#: doc/guix.texi:14002
 msgid "Name of the file where @command{rsync} writes its log file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13846
+#: doc/guix.texi:14003
 #, no-wrap
 msgid "@code{use-chroot?} (default: @var{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13848
+#: doc/guix.texi:14005
 msgid "Whether to use chroot for @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13849
+#: doc/guix.texi:14006
 #, no-wrap
 msgid "@code{share-path} (default: @file{/srv/rsync})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13851
+#: doc/guix.texi:14008
 msgid "Location of the @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13852
+#: doc/guix.texi:14009
 #, no-wrap
 msgid "@code{share-comment} (default: @code{\"Rsync share\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13854
+#: doc/guix.texi:14011
 msgid "Comment of the @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13855
+#: doc/guix.texi:14012
 #, no-wrap
 msgid "@code{read-only?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13857
+#: doc/guix.texi:14014
 msgid "Read-write permissions to shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13858
+#: doc/guix.texi:14015
 #, no-wrap
 msgid "@code{timeout} (default: @code{300})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13860
+#: doc/guix.texi:14017
 msgid "I/O timeout in seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13861
+#: doc/guix.texi:14018
 #, no-wrap
 msgid "@code{user} (default: @var{\"root\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13863
+#: doc/guix.texi:14020
 msgid "Owner of the @code{rsync} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13864
+#: doc/guix.texi:14021
 #, no-wrap
 msgid "@code{group} (default: @var{\"root\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13866
+#: doc/guix.texi:14023
 msgid "Group of the @code{rsync} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13867
+#: doc/guix.texi:14024
 #, no-wrap
 msgid "@code{uid} (default: @var{\"rsyncd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13870
+#: doc/guix.texi:14027
 msgid "User name or user ID that file transfers to and from that module should take place as when the daemon was run as @code{root}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13871
+#: doc/guix.texi:14028
 #, no-wrap
 msgid "@code{gid} (default: @var{\"rsyncd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13873
+#: doc/guix.texi:14030
 msgid "Group name or group ID that will be used when accessing the module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13878
+#: doc/guix.texi:14035
 msgid "Furthermore, @code{(gnu services ssh)} provides the following services."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13878 doc/guix.texi:13917 doc/guix.texi:27020
+#: doc/guix.texi:14035 doc/guix.texi:14074 doc/guix.texi:27303
 #, no-wrap
 msgid "SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13879 doc/guix.texi:13918 doc/guix.texi:27021
+#: doc/guix.texi:14036 doc/guix.texi:14075 doc/guix.texi:27304
 #, no-wrap
 msgid "SSH server"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13881
+#: doc/guix.texi:14038
 #, no-wrap
 msgid "{Scheme Procedure} lsh-service [#:host-key \"/etc/lsh/host-key\"] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13890
+#: doc/guix.texi:14047
 msgid "[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @ [#:allow-empty-passwords? #f] [#:root-login? #f] @ [#:syslog-output? #t] [#:x11-forwarding? #t] @ [#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @ [#:public-key-authentication? #t] [#:initialize? #t] Run the @command{lshd} program from @var{lsh} to listen on port @var{port-number}.  @var{host-key} must designate a file containing the host key, and readable only by root."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13896
+#: doc/guix.texi:14053
 msgid "When @var{daemonic?} is true, @command{lshd} will detach from the controlling terminal and log its output to syslogd, unless one sets @var{syslog-output?} to false.  Obviously, it also makes lsh-service depend on existence of syslogd service.  When @var{pid-file?} is true, @command{lshd} writes its PID to the file called @var{pid-file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13900
+#: doc/guix.texi:14057
 msgid "When @var{initialize?} is true, automatically create the seed and host key upon service activation if they do not exist yet.  This may take long and require interaction."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13905
+#: doc/guix.texi:14062
 msgid "When @var{initialize?} is false, it is up to the user to initialize the randomness generator (@pxref{lsh-make-seed,,, lsh, LSH Manual}), and to create a key pair with the private key stored in file @var{host-key} (@pxref{lshd basics,,, lsh, LSH Manual})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13909
+#: doc/guix.texi:14066
 msgid "When @var{interfaces} is empty, lshd listens for connections on all the network interfaces; otherwise, @var{interfaces} must be a list of host names or addresses."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13913
+#: doc/guix.texi:14070
 msgid "@var{allow-empty-passwords?} specifies whether to accept log-ins with empty passwords, and @var{root-login?} specifies whether to accept log-ins as root."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13915
+#: doc/guix.texi:14072
 msgid "The other options should be self-descriptive."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13919
+#: doc/guix.texi:14076
 #, no-wrap
 msgid "{Scheme Variable} openssh-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13923
+#: doc/guix.texi:14080
 msgid "This is the type for the @uref{http://www.openssh.org, OpenSSH} secure shell daemon, @command{sshd}.  Its value must be an @code{openssh-configuration} record as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13932
+#: doc/guix.texi:14089
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -24994,17 +25469,17 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13935
+#: doc/guix.texi:14092
 msgid "See below for details about @code{openssh-configuration}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13938
+#: doc/guix.texi:14095
 msgid "This service can be extended with extra authorized keys, as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13943
+#: doc/guix.texi:14100
 #, no-wrap
 msgid ""
 "(service-extension openssh-service-type\n"
@@ -25013,192 +25488,192 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13946
+#: doc/guix.texi:14103
 #, no-wrap
 msgid "{Data Type} openssh-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13948
+#: doc/guix.texi:14105
 msgid "This is the configuration record for OpenSSH's @command{sshd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13950
+#: doc/guix.texi:14107
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/sshd.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13952
+#: doc/guix.texi:14109
 msgid "Name of the file where @command{sshd} writes its PID."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13953
+#: doc/guix.texi:14110
 #, no-wrap
 msgid "@code{port-number} (default: @code{22})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13955
+#: doc/guix.texi:14112
 msgid "TCP port on which @command{sshd} listens for incoming connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13956
+#: doc/guix.texi:14113
 #, no-wrap
 msgid "@code{permit-root-login} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13961
+#: doc/guix.texi:14118
 msgid "This field determines whether and when to allow logins as root.  If @code{#f}, root logins are disallowed; if @code{#t}, they are allowed.  If it's the symbol @code{'without-password}, then root logins are permitted but not with password-based authentication."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13962 doc/guix.texi:14123
+#: doc/guix.texi:14119 doc/guix.texi:14280
 #, no-wrap
 msgid "@code{allow-empty-passwords?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13965
+#: doc/guix.texi:14122
 msgid "When true, users with empty passwords may log in.  When false, they may not."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13966 doc/guix.texi:14126
+#: doc/guix.texi:14123 doc/guix.texi:14283
 #, no-wrap
 msgid "@code{password-authentication?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13969
+#: doc/guix.texi:14126
 msgid "When true, users may log in with their password.  When false, they have other authentication methods."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13970
+#: doc/guix.texi:14127
 #, no-wrap
 msgid "@code{public-key-authentication?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13973
+#: doc/guix.texi:14130
 msgid "When true, users may log in using public key authentication.  When false, users have to use other authentication method."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13976
+#: doc/guix.texi:14133
 msgid "Authorized public keys are stored in @file{~/.ssh/authorized_keys}.  This is used only by protocol version 2."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13977
+#: doc/guix.texi:14134
 #, no-wrap
 msgid "@code{x11-forwarding?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13981
+#: doc/guix.texi:14138
 msgid "When true, forwarding of X11 graphical client connections is enabled---in other words, @command{ssh} options @option{-X} and @option{-Y} will work."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13982
+#: doc/guix.texi:14139
 #, no-wrap
 msgid "@code{allow-agent-forwarding?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13984
+#: doc/guix.texi:14141
 msgid "Whether to allow agent forwarding."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13985
+#: doc/guix.texi:14142
 #, no-wrap
 msgid "@code{allow-tcp-forwarding?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13987
+#: doc/guix.texi:14144
 msgid "Whether to allow TCP forwarding."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13988
+#: doc/guix.texi:14145
 #, no-wrap
 msgid "@code{gateway-ports?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13990
+#: doc/guix.texi:14147
 msgid "Whether to allow gateway ports."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13991
+#: doc/guix.texi:14148
 #, no-wrap
 msgid "@code{challenge-response-authentication?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13994
+#: doc/guix.texi:14151
 msgid "Specifies whether challenge response authentication is allowed (e.g.@: via PAM)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13995
+#: doc/guix.texi:14152
 #, no-wrap
 msgid "@code{use-pam?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14001
+#: doc/guix.texi:14158
 msgid "Enables the Pluggable Authentication Module interface.  If set to @code{#t}, this will enable PAM authentication using @code{challenge-response-authentication?} and @code{password-authentication?}, in addition to PAM account and session module processing for all authentication types."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14006
+#: doc/guix.texi:14163
 msgid "Because PAM challenge response authentication usually serves an equivalent role to password authentication, you should disable either @code{challenge-response-authentication?} or @code{password-authentication?}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14007
+#: doc/guix.texi:14164
 #, no-wrap
 msgid "@code{print-last-log?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14010
+#: doc/guix.texi:14167
 msgid "Specifies whether @command{sshd} should print the date and time of the last user login when a user logs in interactively."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14011
+#: doc/guix.texi:14168
 #, no-wrap
 msgid "@code{subsystems} (default: @code{'((\"sftp\" \"internal-sftp\"))})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14013
+#: doc/guix.texi:14170
 msgid "Configures external subsystems (e.g.@: file transfer daemon)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14017
+#: doc/guix.texi:14174
 msgid "This is a list of two-element lists, each of which containing the subsystem name and a command (with optional arguments) to execute upon subsystem request."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14020
+#: doc/guix.texi:14177
 msgid "The command @command{internal-sftp} implements an in-process SFTP server.  Alternately, one can specify the @command{sftp-server} command:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14025
+#: doc/guix.texi:14182
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -25208,28 +25683,28 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14027
+#: doc/guix.texi:14184
 #, no-wrap
 msgid "@code{accepted-environment} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14029
+#: doc/guix.texi:14186
 msgid "List of strings describing which environment variables may be exported."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14032
+#: doc/guix.texi:14189
 msgid "Each string gets on its own line.  See the @code{AcceptEnv} option in @code{man sshd_config}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14037
-msgid "This example allows ssh-clients to export the @code{COLORTERM} variable.  It is set by terminal emulators, which support colors.  You can use it in your shell's ressource file to enable colors for the prompt and commands if this variable is set."
+#: doc/guix.texi:14194
+msgid "This example allows ssh-clients to export the @code{COLORTERM} variable.  It is set by terminal emulators, which support colors.  You can use it in your shell's resource file to enable colors for the prompt and commands if this variable is set."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14042
+#: doc/guix.texi:14199
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -25238,30 +25713,30 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14044
+#: doc/guix.texi:14201
 #, no-wrap
 msgid "@code{authorized-keys} (default: @code{'()})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14045
+#: doc/guix.texi:14202
 #, no-wrap
 msgid "authorized keys, SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14046
+#: doc/guix.texi:14203
 #, no-wrap
 msgid "SSH authorized keys"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14050
+#: doc/guix.texi:14207
 msgid "This is the list of authorized keys.  Each element of the list is a user name followed by one or more file-like objects that represent SSH public keys.  For example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14057
+#: doc/guix.texi:14214
 #, no-wrap
 msgid ""
 "(openssh-configuration\n"
@@ -25272,44 +25747,44 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14062
+#: doc/guix.texi:14219
 msgid "registers the specified public keys for user accounts @code{rekado}, @code{chris}, and @code{root}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14065
+#: doc/guix.texi:14222
 msgid "Additional authorized keys can be specified @i{via} @code{service-extension}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14068
+#: doc/guix.texi:14225
 msgid "Note that this does @emph{not} interfere with the use of @file{~/.ssh/authorized_keys}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14069
+#: doc/guix.texi:14226
 #, no-wrap
 msgid "@code{log-level} (default: @code{'info})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14073
+#: doc/guix.texi:14230
 msgid "This is a symbol specifying the logging level: @code{quiet}, @code{fatal}, @code{error}, @code{info}, @code{verbose}, @code{debug}, etc.  See the man page for @file{sshd_config} for the full list of level names."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14074 doc/guix.texi:20180
+#: doc/guix.texi:14231 doc/guix.texi:20348
 #, no-wrap
 msgid "@code{extra-content} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14079
+#: doc/guix.texi:14236
 msgid "This field can be used to append arbitrary text to the configuration file.  It is especially useful for elaborate configurations that cannot be expressed otherwise.  This configuration, for example, would generally disable root logins, but permit them from one specific IP address:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14085
+#: doc/guix.texi:14242
 #, no-wrap
 msgid ""
 "(openssh-configuration\n"
@@ -25319,23 +25794,23 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14090
+#: doc/guix.texi:14247
 #, no-wrap
 msgid "{Scheme Procedure} dropbear-service [@var{config}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14094
+#: doc/guix.texi:14251
 msgid "Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH daemon} with the given @var{config}, a @code{} object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14097
+#: doc/guix.texi:14254
 msgid "For example, to specify a Dropbear service listening on port 1234, add this call to the operating system's @code{services} field:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14101
+#: doc/guix.texi:14258
 #, no-wrap
 msgid ""
 "(dropbear-service (dropbear-configuration\n"
@@ -25343,99 +25818,99 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14104
+#: doc/guix.texi:14261
 #, no-wrap
 msgid "{Data Type} dropbear-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14106
+#: doc/guix.texi:14263
 msgid "This data type represents the configuration of a Dropbear SSH daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14108
+#: doc/guix.texi:14265
 #, no-wrap
 msgid "@code{dropbear} (default: @var{dropbear})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14110
+#: doc/guix.texi:14267
 msgid "The Dropbear package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14111
+#: doc/guix.texi:14268
 #, no-wrap
 msgid "@code{port-number} (default: 22)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14113
+#: doc/guix.texi:14270
 msgid "The TCP port where the daemon waits for incoming connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14114
+#: doc/guix.texi:14271
 #, no-wrap
 msgid "@code{syslog-output?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14116
+#: doc/guix.texi:14273
 msgid "Whether to enable syslog output."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14117
+#: doc/guix.texi:14274
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/dropbear.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14119
+#: doc/guix.texi:14276
 msgid "File name of the daemon's PID file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14120
+#: doc/guix.texi:14277
 #, no-wrap
 msgid "@code{root-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14122
+#: doc/guix.texi:14279
 msgid "Whether to allow @code{root} logins."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14125
+#: doc/guix.texi:14282
 msgid "Whether to allow empty passwords."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14128
+#: doc/guix.texi:14285
 msgid "Whether to enable password-based authentication."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14131
+#: doc/guix.texi:14288
 #, no-wrap
 msgid "{Scheme Variable} %facebook-host-aliases"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14137
+#: doc/guix.texi:14294
 msgid "This variable contains a string for use in @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}).  Each line contains a entry that maps a known server name of the Facebook on-line service---e.g., @code{www.facebook.com}---to the local host---@code{127.0.0.1} or its IPv6 equivalent, @code{::1}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14141
+#: doc/guix.texi:14298
 msgid "This variable is typically used in the @code{hosts-file} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @file{/etc/hosts}}):"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14154
+#: doc/guix.texi:14311
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -25450,176 +25925,176 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14158
+#: doc/guix.texi:14315
 msgid "This mechanism can prevent programs running locally, such as Web browsers, from accessing Facebook."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14161
+#: doc/guix.texi:14318
 msgid "The @code{(gnu services avahi)} provides the following definition."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14162
+#: doc/guix.texi:14319
 #, no-wrap
 msgid "{Scheme Variable} avahi-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14167
+#: doc/guix.texi:14324
 msgid "This is the service that runs @command{avahi-daemon}, a system-wide mDNS/DNS-SD responder that allows for service discovery and ``zero-configuration'' host name lookups (see @uref{https://avahi.org/}).  Its value must be a @code{zero-configuration} record---see below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14172
-msgid "This service extends the name service cache daemon (nscd) so that it can resolve @code{.local} host names using @uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}.  @xref{Name Service Switch}, for information on host name resolution."
+#: doc/guix.texi:14329
+msgid "This service extends the name service cache daemon (nscd) so that it can resolve @code{.local} host names using @uref{https://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}.  @xref{Name Service Switch}, for information on host name resolution."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14175
+#: doc/guix.texi:14332
 msgid "Additionally, add the @var{avahi} package to the system profile so that commands such as @command{avahi-browse} are directly usable."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14177
+#: doc/guix.texi:14334
 #, no-wrap
 msgid "{Data Type} avahi-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14179
+#: doc/guix.texi:14336
 msgid "Data type representation the configuration for Avahi."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14182
+#: doc/guix.texi:14339
 #, no-wrap
 msgid "@code{host-name} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14185
+#: doc/guix.texi:14342
 msgid "If different from @code{#f}, use that as the host name to publish for this machine; otherwise, use the machine's actual host name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14186
+#: doc/guix.texi:14343
 #, no-wrap
 msgid "@code{publish?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14189
+#: doc/guix.texi:14346
 msgid "When true, allow host names and services to be published (broadcast) over the network."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14190
+#: doc/guix.texi:14347
 #, no-wrap
 msgid "@code{publish-workstation?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14194
+#: doc/guix.texi:14351
 msgid "When true, @command{avahi-daemon} publishes the machine's host name and IP address via mDNS on the local network.  To view the host names published on your local network, you can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14197
+#: doc/guix.texi:14354
 #, no-wrap
 msgid "avahi-browse _workstation._tcp\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14199
+#: doc/guix.texi:14356
 #, no-wrap
 msgid "@code{wide-area?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14201
+#: doc/guix.texi:14358
 msgid "When true, DNS-SD over unicast DNS is enabled."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14202
+#: doc/guix.texi:14359
 #, no-wrap
 msgid "@code{ipv4?} (default: @code{#t})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:14203
+#: doc/guix.texi:14360
 #, no-wrap
 msgid "@code{ipv6?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14205
+#: doc/guix.texi:14362
 msgid "These fields determine whether to use IPv4/IPv6 sockets."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14206
+#: doc/guix.texi:14363
 #, no-wrap
 msgid "@code{domains-to-browse} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14208
+#: doc/guix.texi:14365
 msgid "This is a list of domains to browse."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14211
+#: doc/guix.texi:14368
 #, no-wrap
 msgid "{Scheme Variable} openvswitch-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14215
+#: doc/guix.texi:14372
 msgid "This is the type of the @uref{https://www.openvswitch.org, Open vSwitch} service, whose value should be an @code{openvswitch-configuration} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14217
+#: doc/guix.texi:14374
 #, no-wrap
 msgid "{Data Type} openvswitch-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14221
+#: doc/guix.texi:14378
 msgid "Data type representing the configuration of Open vSwitch, a multilayer virtual switch which is designed to enable massive network automation through programmatic extension."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14223
+#: doc/guix.texi:14380
 #, no-wrap
 msgid "@code{package} (default: @var{openvswitch})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14225
+#: doc/guix.texi:14382
 msgid "Package object of the Open vSwitch."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14229
+#: doc/guix.texi:14386
 #, no-wrap
 msgid "{Scheme Variable} pagekite-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14234
+#: doc/guix.texi:14391
 msgid "This is the service type for the @uref{https://pagekite.net, PageKite} service, a tunneling solution for making localhost servers publicly visible, even from behind restrictive firewalls or NAT without forwarded ports.  The value for this service type is a @code{pagekite-configuration} record."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14236
+#: doc/guix.texi:14393
 msgid "Here's an example exposing the local HTTP and SSH daemons:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14243
+#: doc/guix.texi:14400
 #, no-wrap
 msgid ""
 "(service pagekite-service-type\n"
@@ -25630,290 +26105,290 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14246
+#: doc/guix.texi:14403
 #, no-wrap
 msgid "{Data Type} pagekite-configuration"
 msgstr "{Data Type} pagekite-configuration"
 
 #. type: deftp
-#: doc/guix.texi:14248
+#: doc/guix.texi:14405
 #, fuzzy
 #| msgid "Manage the operating system configuration."
 msgid "Data type representing the configuration of PageKite."
 msgstr "Управление конфигурацией операционной системы."
 
 #. type: item
-#: doc/guix.texi:14250
+#: doc/guix.texi:14407
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{package} (default: @var{pagekite})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:14252
+#: doc/guix.texi:14409
 msgid "Package object of PageKite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14253
+#: doc/guix.texi:14410
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{kitename} (default: @code{#f})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:14255
+#: doc/guix.texi:14412
 msgid "PageKite name for authenticating to the frontend server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14256
+#: doc/guix.texi:14413
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{kitesecret} (default: @code{#f})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:14259
+#: doc/guix.texi:14416
 msgid "Shared secret for authenticating to the frontend server.  You should probably put this inside @code{extra-file} instead."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14260
+#: doc/guix.texi:14417
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{frontend} (default: @code{#f})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:14263
+#: doc/guix.texi:14420
 msgid "Connect to the named PageKite frontend server instead of the @uref{https://pagekite.net,,pagekite.net} service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14264
+#: doc/guix.texi:14421
 #, no-wrap
 msgid "@code{kites} (default: @code{'(\"http:@@kitename:localhost:80:@@kitesecret\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14267
+#: doc/guix.texi:14424
 msgid "List of service kites to use.  Exposes HTTP on port 80 by default. The format is @code{proto:kitename:host:port:secret}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14268
+#: doc/guix.texi:14425
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{extra-file} (default: @code{#f})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:14271
+#: doc/guix.texi:14428
 msgid "Extra configuration file to read, which you are expected to create manually.  Use this to add additional options and manage shared secrets out-of-band."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14278
+#: doc/guix.texi:14435
 #, no-wrap
 msgid "X11"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14279
+#: doc/guix.texi:14436
 #, no-wrap
 msgid "X Window System"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14280 doc/guix.texi:14532
+#: doc/guix.texi:14437 doc/guix.texi:14689
 #, no-wrap
 msgid "login manager"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14285
+#: doc/guix.texi:14442
 msgid "Support for the X Window graphical display system---specifically Xorg---is provided by the @code{(gnu services xorg)} module.  Note that there is no @code{xorg-service} procedure.  Instead, the X server is started by the @dfn{login manager}, by default the GNOME Display Manager (GDM)."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14286
+#: doc/guix.texi:14443
 #, no-wrap
 msgid "GDM"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14287
+#: doc/guix.texi:14444
 #, no-wrap
 msgid "GNOME, login manager"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14291
+#: doc/guix.texi:14448
 msgid "GDM of course allows users to log in into window managers and desktop environments other than GNOME; for those using GNOME, GDM is required for features such as automatic screen locking."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14292
+#: doc/guix.texi:14449
 #, no-wrap
 msgid "window manager"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14297
+#: doc/guix.texi:14454
 msgid "To use X11, you must install at least one @dfn{window manager}---for example the @code{windowmaker} or @code{openbox} packages---preferably by adding it to the @code{packages} field of your operating system definition (@pxref{operating-system Reference, system-wide packages})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14298
+#: doc/guix.texi:14455
 #, no-wrap
 msgid "{Scheme Variable} gdm-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14303
+#: doc/guix.texi:14460
 msgid "This is the type for the @uref{https://wiki.gnome.org/Projects/GDM/, GNOME Desktop Manager} (GDM), a program that manages graphical display servers and handles graphical user logins.  Its value must be a @code{gdm-configuration} (see below.)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14304
+#: doc/guix.texi:14461
 #, no-wrap
 msgid "session types (X11)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14305
+#: doc/guix.texi:14462
 #, no-wrap
 msgid "X11 session types"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14311
+#: doc/guix.texi:14468
 msgid "GDM looks for @dfn{session types} described by the @file{.desktop} files in @file{/run/current-system/profile/share/xsessions} and allows users to choose a session from the log-in screen.  Packages such as @code{gnome}, @code{xfce}, and @code{i3} provide @file{.desktop} files; adding them to the system-wide set of packages automatically makes them available at the log-in screen."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14315
+#: doc/guix.texi:14472
 msgid "In addition, @file{~/.xsession} files are honored.  When available, @file{~/.xsession} must be an executable that starts a window manager and/or other X clients."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14317
+#: doc/guix.texi:14474
 #, no-wrap
 msgid "{Data Type} gdm-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14319 doc/guix.texi:14388
+#: doc/guix.texi:14476 doc/guix.texi:14545
 #, no-wrap
 msgid "@code{auto-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:14320
+#: doc/guix.texi:14477
 #, no-wrap
 msgid "@code{default-user} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14322
+#: doc/guix.texi:14479
 msgid "When @code{auto-login?} is false, GDM presents a log-in screen."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14325
+#: doc/guix.texi:14482
 msgid "When @code{auto-login?} is true, GDM logs in directly as @code{default-user}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14326 doc/guix.texi:18829 doc/guix.texi:20497
+#: doc/guix.texi:14483 doc/guix.texi:18986 doc/guix.texi:20665
 #, no-wrap
 msgid "@code{debug?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14328
+#: doc/guix.texi:14485
 msgid "When true, GDM writes debug messages to its log."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14329
+#: doc/guix.texi:14486
 #, no-wrap
 msgid "@code{gnome-shell-assets} (default: ...)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14331
+#: doc/guix.texi:14488
 msgid "List of GNOME Shell assets needed by GDM: icon theme, fonts, etc."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14332
+#: doc/guix.texi:14489
 #, no-wrap
 msgid "@code{xorg-configuration} (default: @code{(xorg-configuration)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14334 doc/guix.texi:14415 doc/guix.texi:14498
+#: doc/guix.texi:14491 doc/guix.texi:14572 doc/guix.texi:14655
 msgid "Configuration of the Xorg graphical server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14335
+#: doc/guix.texi:14492
 #, no-wrap
 msgid "@code{xsession} (default: @code{(xinitrc)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14337 doc/guix.texi:14513
+#: doc/guix.texi:14494 doc/guix.texi:14670
 msgid "Script to run before starting a X session."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14338
+#: doc/guix.texi:14495
 #, no-wrap
 msgid "@code{dbus-daemon} (default: @code{dbus-daemon-wrapper})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14340
+#: doc/guix.texi:14497
 msgid "File name of the @code{dbus-daemon} executable."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14341
+#: doc/guix.texi:14498
 #, no-wrap
 msgid "@code{gdm} (default: @code{gdm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14343
+#: doc/guix.texi:14500
 msgid "The GDM package to use."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14346
+#: doc/guix.texi:14503
 #, no-wrap
 msgid "{Scheme Variable} slim-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14348
+#: doc/guix.texi:14505
 msgid "This is the type for the SLiM graphical login manager for X11."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14352
+#: doc/guix.texi:14509
 msgid "Like GDM, SLiM looks for session types described by @file{.desktop} files and allows users to choose a session from the log-in screen using @kbd{F1}.  It also honors @file{~/.xsession} files."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14359
+#: doc/guix.texi:14516
 msgid "Unlike GDM, SLiM does not spawn the user session on a different VT after logging in, which means that you can only start one graphical session.  If you want to be able to run multiple graphical sessions at the same time you have to add multiple SLiM services to your system services.  The following example shows how to replace the default GDM service with two SLiM services on tty7 and tty8."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14365
+#: doc/guix.texi:14522
 #, fuzzy, no-wrap
 #| msgid ""
 #| "(use-modules (guix inferior) (guix channels)\n"
@@ -25931,7 +26406,7 @@ msgstr ""
 "\n"
 
 #. type: lisp
-#: doc/guix.texi:14377
+#: doc/guix.texi:14534
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -25948,484 +26423,484 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14381
+#: doc/guix.texi:14538
 #, no-wrap
 msgid "{Data Type} slim-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14383
+#: doc/guix.texi:14540
 msgid "Data type representing the configuration of @code{slim-service-type}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14387
+#: doc/guix.texi:14544
 msgid "Whether to allow logins with empty passwords."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:14389
+#: doc/guix.texi:14546
 #, no-wrap
 msgid "@code{default-user} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14391
+#: doc/guix.texi:14548
 msgid "When @code{auto-login?} is false, SLiM presents a log-in screen."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14394
+#: doc/guix.texi:14551
 msgid "When @code{auto-login?} is true, SLiM logs in directly as @code{default-user}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14395
+#: doc/guix.texi:14552
 #, no-wrap
 msgid "@code{theme} (default: @code{%default-slim-theme})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:14396
+#: doc/guix.texi:14553
 #, no-wrap
 msgid "@code{theme-name} (default: @code{%default-slim-theme-name})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14398
+#: doc/guix.texi:14555
 msgid "The graphical theme to use and its name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14399
+#: doc/guix.texi:14556
 #, no-wrap
 msgid "@code{auto-login-session} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14402
+#: doc/guix.texi:14559
 msgid "If true, this must be the name of the executable to start as the default session---e.g., @code{(file-append windowmaker \"/bin/windowmaker\")}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14406
+#: doc/guix.texi:14563
 msgid "If false, a session described by one of the available @file{.desktop} files in @code{/run/current-system/profile} and @code{~/.guix-profile} will be used."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:14411
+#: doc/guix.texi:14568
 msgid "You must install at least one window manager in the system profile or in your user profile.  Failing to do that, if @code{auto-login-session} is false, you will be unable to log in."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14413 doc/guix.texi:14496
+#: doc/guix.texi:14570 doc/guix.texi:14653
 #, no-wrap
 msgid "@code{xorg-configuration} (default @code{(xorg-configuration)})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14416
+#: doc/guix.texi:14573
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{display} (default @code{\":0\"})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:14418
+#: doc/guix.texi:14575
 msgid "The display on which to start the Xorg graphical server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14419
+#: doc/guix.texi:14576
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{vt} (default @code{\"vt7\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:14421
+#: doc/guix.texi:14578
 msgid "The VT on which to start the Xorg graphical server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14422
+#: doc/guix.texi:14579
 #, no-wrap
 msgid "@code{xauth} (default: @code{xauth})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14424
+#: doc/guix.texi:14581
 msgid "The XAuth package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14425
+#: doc/guix.texi:14582
 #, no-wrap
 msgid "@code{shepherd} (default: @code{shepherd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14428
+#: doc/guix.texi:14585
 msgid "The Shepherd package used when invoking @command{halt} and @command{reboot}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14429
+#: doc/guix.texi:14586
 #, no-wrap
 msgid "@code{sessreg} (default: @code{sessreg})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14431
+#: doc/guix.texi:14588
 msgid "The sessreg package used in order to register the session."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14432
+#: doc/guix.texi:14589
 #, no-wrap
 msgid "@code{slim} (default: @code{slim})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14434
+#: doc/guix.texi:14591
 msgid "The SLiM package to use."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14437 doc/guix.texi:26217
+#: doc/guix.texi:14594 doc/guix.texi:26480
 #, no-wrap
 msgid "{Scheme Variable} %default-theme"
 msgstr ""
 
 #. type: defvrx
-#: doc/guix.texi:14438
+#: doc/guix.texi:14595
 #, no-wrap
 msgid "{Scheme Variable} %default-theme-name"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14440
+#: doc/guix.texi:14597
 msgid "The default SLiM theme and its name."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14443 doc/guix.texi:14549
+#: doc/guix.texi:14600 doc/guix.texi:14706
 #, no-wrap
 msgid "{Data Type} sddm-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14445
+#: doc/guix.texi:14602
 msgid "This is the data type representing the sddm service configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14447
+#: doc/guix.texi:14604
 #, no-wrap
 msgid "@code{display-server} (default: \"x11\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14450
+#: doc/guix.texi:14607
 msgid "Select display server to use for the greeter. Valid values are \"x11\" or \"wayland\"."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14451
+#: doc/guix.texi:14608
 #, no-wrap
 msgid "@code{numlock} (default: \"on\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14453
+#: doc/guix.texi:14610
 msgid "Valid values are \"on\", \"off\" or \"none\"."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14454
+#: doc/guix.texi:14611
 #, no-wrap
 msgid "@code{halt-command} (default @code{#~(string-apppend #$shepherd \"/sbin/halt\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14456
+#: doc/guix.texi:14613
 msgid "Command to run when halting."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14457
+#: doc/guix.texi:14614
 #, no-wrap
 msgid "@code{reboot-command} (default @code{#~(string-append #$shepherd \"/sbin/reboot\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14459
+#: doc/guix.texi:14616
 msgid "Command to run when rebooting."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14460
+#: doc/guix.texi:14617
 #, no-wrap
 msgid "@code{theme} (default \"maldives\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14462
-msgid "Theme to use. Default themes provided by SDDM are \"elarun\" or \"maldives\"."
+#: doc/guix.texi:14619
+msgid "Theme to use. Default themes provided by SDDM are \"elarun\", \"maldives\" or \"maya\"."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14463
+#: doc/guix.texi:14620
 #, no-wrap
 msgid "@code{themes-directory} (default \"/run/current-system/profile/share/sddm/themes\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14465
+#: doc/guix.texi:14622
 msgid "Directory to look for themes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14466
+#: doc/guix.texi:14623
 #, no-wrap
 msgid "@code{faces-directory} (default \"/run/current-system/profile/share/sddm/faces\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14468
+#: doc/guix.texi:14625
 msgid "Directory to look for faces."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14469
+#: doc/guix.texi:14626
 #, no-wrap
 msgid "@code{default-path} (default \"/run/current-system/profile/bin\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14471
+#: doc/guix.texi:14628
 msgid "Default PATH to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14472
+#: doc/guix.texi:14629
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{minimum-uid} (default: 1000)"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:14474
+#: doc/guix.texi:14631
 msgid "Minimum UID displayed in SDDM and allowed for log-in."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14475
+#: doc/guix.texi:14632
 #, fuzzy, no-wrap
 #| msgid "@code{parallel-builds} (default: @code{1})"
 msgid "@code{maximum-uid} (default: 2000)"
 msgstr "@code{parallel-builds} (default: @code{1})"
 
 #. type: table
-#: doc/guix.texi:14477
+#: doc/guix.texi:14634
 msgid "Maximum UID to display in SDDM."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14478
+#: doc/guix.texi:14635
 #, no-wrap
 msgid "@code{remember-last-user?} (default #t)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14480
+#: doc/guix.texi:14637
 msgid "Remember last user."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14481
+#: doc/guix.texi:14638
 #, no-wrap
 msgid "@code{remember-last-session?} (default #t)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14483
+#: doc/guix.texi:14640
 msgid "Remember last session."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14484
+#: doc/guix.texi:14641
 #, no-wrap
 msgid "@code{hide-users} (default \"\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14486
+#: doc/guix.texi:14643
 msgid "Usernames to hide from SDDM greeter."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14487
+#: doc/guix.texi:14644
 #, no-wrap
 msgid "@code{hide-shells} (default @code{#~(string-append #$shadow \"/sbin/nologin\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14489
+#: doc/guix.texi:14646
 msgid "Users with shells listed will be hidden from the SDDM greeter."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14490
+#: doc/guix.texi:14647
 #, no-wrap
 msgid "@code{session-command} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14492
+#: doc/guix.texi:14649
 msgid "Script to run before starting a wayland session."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14493
+#: doc/guix.texi:14650
 #, no-wrap
 msgid "@code{sessions-directory} (default \"/run/current-system/profile/share/wayland-sessions\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14495
+#: doc/guix.texi:14652
 msgid "Directory to look for desktop files starting wayland sessions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14499
+#: doc/guix.texi:14656
 #, no-wrap
 msgid "@code{xauth-path} (default @code{#~(string-append #$xauth \"/bin/xauth\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14501
+#: doc/guix.texi:14658
 msgid "Path to xauth."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14502
+#: doc/guix.texi:14659
 #, no-wrap
 msgid "@code{xephyr-path} (default @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14504
+#: doc/guix.texi:14661
 msgid "Path to Xephyr."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14505
+#: doc/guix.texi:14662
 #, no-wrap
 msgid "@code{xdisplay-start} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14507
+#: doc/guix.texi:14664
 msgid "Script to run after starting xorg-server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14508
+#: doc/guix.texi:14665
 #, no-wrap
 msgid "@code{xdisplay-stop} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14510
+#: doc/guix.texi:14667
 msgid "Script to run before stopping xorg-server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14511
+#: doc/guix.texi:14668
 #, no-wrap
 msgid "@code{xsession-command} (default: @code{xinitrc})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14514
+#: doc/guix.texi:14671
 #, no-wrap
 msgid "@code{xsessions-directory} (default: \"/run/current-system/profile/share/xsessions\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14516
+#: doc/guix.texi:14673
 msgid "Directory to look for desktop files starting X sessions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14517
+#: doc/guix.texi:14674
 #, no-wrap
 msgid "@code{minimum-vt} (default: 7)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14519
+#: doc/guix.texi:14676
 msgid "Minimum VT to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14520
+#: doc/guix.texi:14677
 #, no-wrap
 msgid "@code{auto-login-user} (default \"\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14522
+#: doc/guix.texi:14679
 msgid "User to use for auto-login."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14523
+#: doc/guix.texi:14680
 #, no-wrap
 msgid "@code{auto-login-session} (default \"\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14525
+#: doc/guix.texi:14682
 msgid "Desktop file to use for auto-login."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14526
+#: doc/guix.texi:14683
 #, no-wrap
 msgid "@code{relogin?} (default #f)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14528
+#: doc/guix.texi:14685
 msgid "Relogin after logout."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14533
+#: doc/guix.texi:14690
 #, no-wrap
 msgid "X11 login"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14534
+#: doc/guix.texi:14691
 #, no-wrap
 msgid "{Scheme Variable} sddm-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14538
-msgid "This is the type of the service to run the @uref{https://github.com/sddm/sddm,SSDM display manager}.  Its value must be a @code{sddm-configuration} record (see below)."
+#: doc/guix.texi:14695
+msgid "This is the type of the service to run the @uref{https://github.com/sddm/sddm,SDDM display manager}.  Its value must be a @code{sddm-configuration} record (see below)."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14540
+#: doc/guix.texi:14697
 msgid "Here's an example use:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14546
+#: doc/guix.texi:14703
 #, no-wrap
 msgid ""
 "(service sddm-service-type\n"
@@ -26435,272 +26910,272 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14552
+#: doc/guix.texi:14709
 #, fuzzy
 #| msgid "This data type represents build machines to which the daemon may offload builds.  The important fields are:"
 msgid "This data type represents the configuration of the SDDM login manager.  The available fields are:"
 msgstr "Этот тип данных представляет машины для сборки, на которые демон может разгружать сборки. Важные поля:"
 
 #. type: item
-#: doc/guix.texi:14554
+#: doc/guix.texi:14711
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{sddm} (default: @code{sddm})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:14556
+#: doc/guix.texi:14713
 #, fuzzy
 #| msgid "The package data type."
 msgid "The SDDM package to use."
 msgstr "Тип данных пакет"
 
 #. type: item
-#: doc/guix.texi:14557
+#: doc/guix.texi:14714
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{display-server} (default: @code{\"x11\"})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:14559
+#: doc/guix.texi:14716
 msgid "This must be either @code{\"x11\"} or @code{\"wayland\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14562
+#: doc/guix.texi:14719
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{auto-login-user} (default: @code{\"\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:14565
+#: doc/guix.texi:14722
 msgid "If non-empty, this is the user account under which to log in automatically."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14566
+#: doc/guix.texi:14723
 #, fuzzy, no-wrap
 #| msgid "@code{compression-level} (default: @code{3})"
 msgid "@code{auto-login-session} (default: @code{\"\"})"
 msgstr "@code{compression-level} (default: @code{3})"
 
 #. type: table
-#: doc/guix.texi:14569
+#: doc/guix.texi:14726
 msgid "If non-empty, this is the @file{.desktop} file name to use as the auto-login session."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14572
+#: doc/guix.texi:14729
 #, no-wrap
 msgid "Xorg, configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14573
+#: doc/guix.texi:14730
 #, no-wrap
 msgid "{Data Type} xorg-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14578
+#: doc/guix.texi:14735
 msgid "This data type represents the configuration of the Xorg graphical display server.  Note that there is not Xorg service; instead, the X server is started by a ``display manager'' such as GDM, SDDM, and SLiM.  Thus, the configuration of these display managers aggregates an @code{xorg-configuration} record."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14580
+#: doc/guix.texi:14737
 #, no-wrap
 msgid "@code{modules} (default: @code{%default-xorg-modules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14583
+#: doc/guix.texi:14740
 msgid "This is a list of @dfn{module packages} loaded by the Xorg server---e.g., @code{xf86-video-vesa}, @code{xf86-input-keyboard}, and so on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14584
+#: doc/guix.texi:14741
 #, no-wrap
 msgid "@code{fonts} (default: @code{%default-xorg-fonts})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14586
+#: doc/guix.texi:14743
 msgid "This is a list of font directories to add to the server's @dfn{font path}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14587
+#: doc/guix.texi:14744
 #, no-wrap
 msgid "@code{drivers} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14591
+#: doc/guix.texi:14748
 msgid "This must be either the empty list, in which case Xorg chooses a graphics driver automatically, or a list of driver names that will be tried in this order---e.g., @code{(\"modesetting\" \"vesa\")}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14592
+#: doc/guix.texi:14749
 #, no-wrap
 msgid "@code{resolutions} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14596
+#: doc/guix.texi:14753
 msgid "When @code{resolutions} is the empty list, Xorg chooses an appropriate screen resolution.  Otherwise, it must be a list of resolutions---e.g., @code{((1024 768) (640 480))}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14597
+#: doc/guix.texi:14754
 #, no-wrap
 msgid "keyboard layout, for Xorg"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14598
+#: doc/guix.texi:14755
 #, no-wrap
 msgid "keymap, for Xorg"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14602
+#: doc/guix.texi:14759
 msgid "If this is @code{#f}, Xorg uses the default keyboard layout---usually US English (``qwerty'') for a 105-key PC keyboard."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14606
+#: doc/guix.texi:14763
 msgid "Otherwise this must be a @code{keyboard-layout} object specifying the keyboard layout in use when Xorg is running.  @xref{Keyboard Layout}, for more information on how to specify the keyboard layout."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14607
+#: doc/guix.texi:14764
 #, no-wrap
 msgid "@code{extra-config} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14610
+#: doc/guix.texi:14767
 msgid "This is a list of strings or objects appended to the configuration file.  It is used to pass extra text to be added verbatim to the configuration file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14611
+#: doc/guix.texi:14768
 #, no-wrap
 msgid "@code{server} (default: @code{xorg-server})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14613
+#: doc/guix.texi:14770
 msgid "This is the package providing the Xorg server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14614
+#: doc/guix.texi:14771
 #, no-wrap
 msgid "@code{server-arguments} (default: @code{%default-xorg-server-arguments})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14617
+#: doc/guix.texi:14774
 msgid "This is the list of command-line arguments to pass to the X server.  The default is @code{-nolisten tcp}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14620
+#: doc/guix.texi:14777
 #, no-wrap
 msgid "{Scheme Procedure} set-xorg-configuration @var{config} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14624
+#: doc/guix.texi:14781
 msgid "[@var{login-manager-service-type}] Tell the log-in manager (of type @var{login-manager-service-type}) to use @var{config}, an @code{} record."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14628
+#: doc/guix.texi:14785
 msgid "Since the Xorg configuration is embedded in the log-in manager's configuration---e.g., @code{gdm-configuration}---this procedure provides a shorthand to set the Xorg configuration."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14630
+#: doc/guix.texi:14787
 #, no-wrap
 msgid "{Scheme Procedure} xorg-start-command [@var{config}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14634
+#: doc/guix.texi:14791
 msgid "Return a @code{startx} script in which the modules, fonts, etc. specified in @var{config}, are available.  The result should be used in place of @code{startx}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14636
+#: doc/guix.texi:14793
 msgid "Usually the X server is started by a login manager."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14639
+#: doc/guix.texi:14796
 #, no-wrap
 msgid "{Scheme Procedure} screen-locker-service @var{package} [@var{program}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14643
+#: doc/guix.texi:14800
 msgid "Add @var{package}, a package for a screen locker or screen saver whose command is @var{program}, to the set of setuid programs and add a PAM entry for it.  For example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14646
+#: doc/guix.texi:14803
 #, no-wrap
 msgid "(screen-locker-service xlockmore \"xlock\")\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14649
+#: doc/guix.texi:14806
 msgid "makes the good ol' XlockMore usable."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14655
+#: doc/guix.texi:14812
 #, no-wrap
 msgid "printer support with CUPS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14659
+#: doc/guix.texi:14816
 msgid "The @code{(gnu services cups)} module provides a Guix service definition for the CUPS printing service.  To add printer support to a Guix system, add a @code{cups-service} to the operating system definition:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14660
+#: doc/guix.texi:14817
 #, no-wrap
 msgid "{Scheme Variable} cups-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14664
+#: doc/guix.texi:14821
 msgid "The service type for the CUPS print server.  Its value should be a valid CUPS configuration (see below).  To use the default settings, simply write:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14666
+#: doc/guix.texi:14823
 #, no-wrap
 msgid "(service cups-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14676
+#: doc/guix.texi:14833
 msgid "The CUPS configuration controls the basic things about your CUPS installation: what interfaces it listens on, what to do if a print job fails, how much logging to do, and so on.  To actually add a printer, you have to visit the @url{http://localhost:631} URL, or use a tool such as GNOME's printer configuration services.  By default, configuring a CUPS service will generate a self-signed certificate if needed, for secure connections to the print server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14681
+#: doc/guix.texi:14838
 msgid "Suppose you want to enable the Web interface of CUPS and also add support for Epson printers @i{via} the @code{escpr} package and for HP printers @i{via} the @code{hplip-minimal} package.  You can do that directly, like this (you need to use the @code{(gnu packages cups)} module):"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:14688
+#: doc/guix.texi:14845
 #, no-wrap
 msgid ""
 "(service cups-service-type\n"
@@ -26711,1560 +27186,1560 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14693
+#: doc/guix.texi:14850
 msgid "Note: If you wish to use the Qt5 based GUI which comes with the hplip package then it is suggested that you install the @code{hplip} package, either in your OS configuration file or as your user."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14700
+#: doc/guix.texi:14857
 msgid "The available configuration parameters follow.  Each parameter definition is preceded by its type; for example, @samp{string-list foo} indicates that the @code{foo} parameter should be specified as a list of strings.  There is also a way to specify the configuration as a string, if you have an old @code{cupsd.conf} file that you want to port over from some other system; see the end for more details."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14711
+#: doc/guix.texi:14868
 msgid "Available @code{cups-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14712
+#: doc/guix.texi:14869
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} package cups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14714 doc/guix.texi:15482
+#: doc/guix.texi:14871 doc/guix.texi:15639
 msgid "The CUPS package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14716
+#: doc/guix.texi:14873
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} package-list extensions"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14718
+#: doc/guix.texi:14875
 msgid "Drivers and other extensions to the CUPS package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14720
+#: doc/guix.texi:14877
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} files-configuration files-configuration"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14723
+#: doc/guix.texi:14880
 msgid "Configuration of where to write logs, what directories to use for print spools, and related privileged configuration parameters."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14725
+#: doc/guix.texi:14882
 msgid "Available @code{files-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14726
+#: doc/guix.texi:14883
 #, no-wrap
 msgid "{@code{files-configuration} parameter} log-location access-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14734
+#: doc/guix.texi:14891
 msgid "Defines the access log filename.  Specifying a blank filename disables access log generation.  The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background.  The value @code{syslog} causes log entries to be sent to the system log daemon.  The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-access_log}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14736
+#: doc/guix.texi:14893
 msgid "Defaults to @samp{\"/var/log/cups/access_log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14738
+#: doc/guix.texi:14895
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name cache-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14740
+#: doc/guix.texi:14897
 msgid "Where CUPS should cache data."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14742
+#: doc/guix.texi:14899
 msgid "Defaults to @samp{\"/var/cache/cups\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14744
+#: doc/guix.texi:14901
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string config-file-perm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14747
+#: doc/guix.texi:14904
 msgid "Specifies the permissions for all configuration files that the scheduler writes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14753
+#: doc/guix.texi:14910
 msgid "Note that the permissions for the printers.conf file are currently masked to only allow access from the scheduler user (typically root).  This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system.  There is no way to disable this security feature."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14755
+#: doc/guix.texi:14912
 msgid "Defaults to @samp{\"0640\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14757
+#: doc/guix.texi:14914
 #, no-wrap
 msgid "{@code{files-configuration} parameter} log-location error-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14765
+#: doc/guix.texi:14922
 msgid "Defines the error log filename.  Specifying a blank filename disables error log generation.  The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background.  The value @code{syslog} causes log entries to be sent to the system log daemon.  The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-error_log}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14767
+#: doc/guix.texi:14924
 msgid "Defaults to @samp{\"/var/log/cups/error_log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14769
+#: doc/guix.texi:14926
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string fatal-errors"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14772
+#: doc/guix.texi:14929
 msgid "Specifies which errors are fatal, causing the scheduler to exit.  The kind strings are:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14776
+#: doc/guix.texi:14933
 msgid "No errors are fatal."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14779
+#: doc/guix.texi:14936
 msgid "All of the errors below are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14780
+#: doc/guix.texi:14937
 #, no-wrap
 msgid "browse"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14783
+#: doc/guix.texi:14940
 msgid "Browsing initialization errors are fatal, for example failed connections to the DNS-SD daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14784
+#: doc/guix.texi:14941
 #, no-wrap
 msgid "config"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14786
+#: doc/guix.texi:14943
 msgid "Configuration file syntax errors are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14787
+#: doc/guix.texi:14944
 #, no-wrap
 msgid "listen"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14790
+#: doc/guix.texi:14947
 msgid "Listen or Port errors are fatal, except for IPv6 failures on the loopback or @code{any} addresses."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14791
+#: doc/guix.texi:14948
 #, no-wrap
 msgid "log"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14793
+#: doc/guix.texi:14950
 msgid "Log file creation or write errors are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14794
+#: doc/guix.texi:14951
 #, no-wrap
 msgid "permissions"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14797
+#: doc/guix.texi:14954
 msgid "Bad startup file permissions are fatal, for example shared TLS certificate and key files with world-read permissions."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14800
+#: doc/guix.texi:14957
 msgid "Defaults to @samp{\"all -browse\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14802
+#: doc/guix.texi:14959
 #, no-wrap
 msgid "{@code{files-configuration} parameter} boolean file-device?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14805
+#: doc/guix.texi:14962
 msgid "Specifies whether the file pseudo-device can be used for new printer queues.  The URI @uref{file:///dev/null} is always allowed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14807 doc/guix.texi:14877 doc/guix.texi:14919
-#: doc/guix.texi:14939 doc/guix.texi:14945 doc/guix.texi:14961
-#: doc/guix.texi:15049 doc/guix.texi:15143 doc/guix.texi:15456
-#: doc/guix.texi:15469 doc/guix.texi:17773 doc/guix.texi:17879
-#: doc/guix.texi:17944 doc/guix.texi:17953 doc/guix.texi:21809
-#: doc/guix.texi:21823 doc/guix.texi:21945 doc/guix.texi:21966
-#: doc/guix.texi:21987 doc/guix.texi:21994 doc/guix.texi:22039
-#: doc/guix.texi:22046 doc/guix.texi:22551 doc/guix.texi:22565
-#: doc/guix.texi:22737 doc/guix.texi:22782 doc/guix.texi:22869
-#: doc/guix.texi:23070 doc/guix.texi:23103 doc/guix.texi:23243
-#: doc/guix.texi:23254 doc/guix.texi:23504 doc/guix.texi:24146
-#: doc/guix.texi:24155 doc/guix.texi:24163 doc/guix.texi:24171
-#: doc/guix.texi:24187 doc/guix.texi:24203 doc/guix.texi:24211
-#: doc/guix.texi:24219 doc/guix.texi:24228 doc/guix.texi:24237
-#: doc/guix.texi:24253 doc/guix.texi:24317 doc/guix.texi:24423
-#: doc/guix.texi:24431 doc/guix.texi:24439 doc/guix.texi:24464
-#: doc/guix.texi:24518 doc/guix.texi:24566 doc/guix.texi:24767
-#: doc/guix.texi:24774
+#: doc/guix.texi:14964 doc/guix.texi:15034 doc/guix.texi:15076
+#: doc/guix.texi:15096 doc/guix.texi:15102 doc/guix.texi:15118
+#: doc/guix.texi:15206 doc/guix.texi:15300 doc/guix.texi:15613
+#: doc/guix.texi:15626 doc/guix.texi:17930 doc/guix.texi:18036
+#: doc/guix.texi:18101 doc/guix.texi:18110 doc/guix.texi:21998
+#: doc/guix.texi:22012 doc/guix.texi:22034 doc/guix.texi:22149
+#: doc/guix.texi:22163 doc/guix.texi:22184 doc/guix.texi:22205
+#: doc/guix.texi:22212 doc/guix.texi:22257 doc/guix.texi:22264
+#: doc/guix.texi:22772 doc/guix.texi:22786 doc/guix.texi:22958
+#: doc/guix.texi:23003 doc/guix.texi:23090 doc/guix.texi:23291
+#: doc/guix.texi:23324 doc/guix.texi:23464 doc/guix.texi:23475
+#: doc/guix.texi:23725 doc/guix.texi:24367 doc/guix.texi:24376
+#: doc/guix.texi:24384 doc/guix.texi:24392 doc/guix.texi:24408
+#: doc/guix.texi:24424 doc/guix.texi:24432 doc/guix.texi:24440
+#: doc/guix.texi:24449 doc/guix.texi:24458 doc/guix.texi:24474
+#: doc/guix.texi:24538 doc/guix.texi:24644 doc/guix.texi:24652
+#: doc/guix.texi:24660 doc/guix.texi:24685 doc/guix.texi:24739
+#: doc/guix.texi:24787 doc/guix.texi:24988 doc/guix.texi:24995
 msgid "Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14809
+#: doc/guix.texi:14966
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14812
+#: doc/guix.texi:14969
 msgid "Specifies the group name or ID that will be used when executing external programs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14814 doc/guix.texi:14894
+#: doc/guix.texi:14971 doc/guix.texi:15051
 msgid "Defaults to @samp{\"lp\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14816
+#: doc/guix.texi:14973
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string log-file-perm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14818
+#: doc/guix.texi:14975
 msgid "Specifies the permissions for all log files that the scheduler writes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14820
+#: doc/guix.texi:14977
 msgid "Defaults to @samp{\"0644\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14822
+#: doc/guix.texi:14979
 #, no-wrap
 msgid "{@code{files-configuration} parameter} log-location page-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14830
+#: doc/guix.texi:14987
 msgid "Defines the page log filename.  Specifying a blank filename disables page log generation.  The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background.  The value @code{syslog} causes log entries to be sent to the system log daemon.  The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-page_log}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14832
+#: doc/guix.texi:14989
 msgid "Defaults to @samp{\"/var/log/cups/page_log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14834
+#: doc/guix.texi:14991
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string remote-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14837
+#: doc/guix.texi:14994
 msgid "Specifies the username that is associated with unauthenticated accesses by clients claiming to be the root user.  The default is @code{remroot}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14839
+#: doc/guix.texi:14996
 msgid "Defaults to @samp{\"remroot\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14841
+#: doc/guix.texi:14998
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name request-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14844
+#: doc/guix.texi:15001
 msgid "Specifies the directory that contains print jobs and other HTTP request data."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14846
+#: doc/guix.texi:15003
 msgid "Defaults to @samp{\"/var/spool/cups\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14848
+#: doc/guix.texi:15005
 #, no-wrap
 msgid "{@code{files-configuration} parameter} sandboxing sandboxing"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14853
+#: doc/guix.texi:15010
 msgid "Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler; either @code{relaxed} or @code{strict}.  This directive is currently only used/supported on macOS."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14855
+#: doc/guix.texi:15012
 msgid "Defaults to @samp{strict}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14857
+#: doc/guix.texi:15014
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name server-keychain"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14862
+#: doc/guix.texi:15019
 msgid "Specifies the location of TLS certificates and private keys.  CUPS will look for public and private keys in this directory: a @code{.crt} files for PEM-encoded certificates and corresponding @code{.key} files for PEM-encoded private keys."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14864
+#: doc/guix.texi:15021
 msgid "Defaults to @samp{\"/etc/cups/ssl\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14866
+#: doc/guix.texi:15023
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name server-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14868
+#: doc/guix.texi:15025
 msgid "Specifies the directory containing the server configuration files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14870
+#: doc/guix.texi:15027
 msgid "Defaults to @samp{\"/etc/cups\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14872
+#: doc/guix.texi:15029
 #, no-wrap
 msgid "{@code{files-configuration} parameter} boolean sync-on-close?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14875
+#: doc/guix.texi:15032
 msgid "Specifies whether the scheduler calls fsync(2) after writing configuration or state files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14879
+#: doc/guix.texi:15036
 #, no-wrap
 msgid "{@code{files-configuration} parameter} space-separated-string-list system-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14881
+#: doc/guix.texi:15038
 msgid "Specifies the group(s) to use for @code{@@SYSTEM} group authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14883
+#: doc/guix.texi:15040
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name temp-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14885
+#: doc/guix.texi:15042
 msgid "Specifies the directory where temporary files are stored."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14887
+#: doc/guix.texi:15044
 msgid "Defaults to @samp{\"/var/spool/cups/tmp\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14889
+#: doc/guix.texi:15046
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14892
+#: doc/guix.texi:15049
 msgid "Specifies the user name or ID that is used when running external programs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14896
+#: doc/guix.texi:15053
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string set-env"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14898
+#: doc/guix.texi:15055
 msgid "Set the specified environment variable to be passed to child processes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14900
+#: doc/guix.texi:15057
 msgid "Defaults to @samp{\"variable value\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14903
+#: doc/guix.texi:15060
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} access-log-level access-log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14910
+#: doc/guix.texi:15067
 msgid "Specifies the logging level for the AccessLog file.  The @code{config} level logs when printers and classes are added, deleted, or modified and when configuration files are accessed or updated.  The @code{actions} level logs when print jobs are submitted, held, released, modified, or canceled, and any of the conditions for @code{config}.  The @code{all} level logs all requests."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14912
+#: doc/guix.texi:15069
 msgid "Defaults to @samp{actions}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14914
+#: doc/guix.texi:15071
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean auto-purge-jobs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14917
+#: doc/guix.texi:15074
 msgid "Specifies whether to purge job history data automatically when it is no longer required for quotas."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14921
+#: doc/guix.texi:15078
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} comma-separated-string-list browse-dns-sd-sub-types"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14925
+#: doc/guix.texi:15082
 msgid "Specifies a list of DNS-SD sub-types to advertise for each shared printer.  For example, @samp{\"_cups\" \"_print\"} will tell network clients that both CUPS sharing and IPP Everywhere are supported."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14927
+#: doc/guix.texi:15084
 msgid "Defaults to @samp{\"_cups\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14929
+#: doc/guix.texi:15086
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14931
+#: doc/guix.texi:15088
 msgid "Specifies which protocols to use for local printer sharing."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14933
+#: doc/guix.texi:15090
 msgid "Defaults to @samp{dnssd}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14935
+#: doc/guix.texi:15092
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean browse-web-if?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14937
+#: doc/guix.texi:15094
 msgid "Specifies whether the CUPS web interface is advertised."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14941
+#: doc/guix.texi:15098
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean browsing?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14943
+#: doc/guix.texi:15100
 msgid "Specifies whether shared printers are advertised."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14947
+#: doc/guix.texi:15104
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string classification"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14952
+#: doc/guix.texi:15109
 msgid "Specifies the security classification of the server.  Any valid banner name can be used, including \"classified\", \"confidential\", \"secret\", \"topsecret\", and \"unclassified\", or the banner can be omitted to disable secure printing functions."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14954 doc/guix.texi:15291 doc/guix.texi:16994
-#: doc/guix.texi:17006 doc/guix.texi:17780 doc/guix.texi:17794
-#: doc/guix.texi:17801 doc/guix.texi:17808 doc/guix.texi:17838
-#: doc/guix.texi:17936 doc/guix.texi:18999 doc/guix.texi:19025
-#: doc/guix.texi:19061 doc/guix.texi:19126 doc/guix.texi:19165
-#: doc/guix.texi:19224 doc/guix.texi:19233 doc/guix.texi:23209
-#: doc/guix.texi:23217 doc/guix.texi:23225 doc/guix.texi:23233
-#: doc/guix.texi:23511 doc/guix.texi:23989 doc/guix.texi:23997
-#: doc/guix.texi:24005 doc/guix.texi:24113 doc/guix.texi:24138
-#: doc/guix.texi:24269 doc/guix.texi:24277 doc/guix.texi:24285
-#: doc/guix.texi:24293 doc/guix.texi:24301 doc/guix.texi:24309
-#: doc/guix.texi:24332 doc/guix.texi:24340 doc/guix.texi:24392
-#: doc/guix.texi:24408 doc/guix.texi:24416 doc/guix.texi:24455
-#: doc/guix.texi:24478 doc/guix.texi:24500 doc/guix.texi:24507
-#: doc/guix.texi:24542 doc/guix.texi:24550 doc/guix.texi:24574
-#: doc/guix.texi:24606 doc/guix.texi:24635 doc/guix.texi:24642
-#: doc/guix.texi:24649 doc/guix.texi:24657 doc/guix.texi:24671
-#: doc/guix.texi:24680 doc/guix.texi:24690 doc/guix.texi:24697
-#: doc/guix.texi:24704 doc/guix.texi:24711 doc/guix.texi:24782
-#: doc/guix.texi:24789 doc/guix.texi:24796 doc/guix.texi:24805
-#: doc/guix.texi:24821 doc/guix.texi:24828 doc/guix.texi:24835
-#: doc/guix.texi:24842 doc/guix.texi:24850 doc/guix.texi:24858
+#: doc/guix.texi:15111 doc/guix.texi:15448 doc/guix.texi:17151
+#: doc/guix.texi:17163 doc/guix.texi:17937 doc/guix.texi:17951
+#: doc/guix.texi:17958 doc/guix.texi:17965 doc/guix.texi:17995
+#: doc/guix.texi:18093 doc/guix.texi:19156 doc/guix.texi:19182
+#: doc/guix.texi:19218 doc/guix.texi:19283 doc/guix.texi:19322
+#: doc/guix.texi:19381 doc/guix.texi:19390 doc/guix.texi:23430
+#: doc/guix.texi:23438 doc/guix.texi:23446 doc/guix.texi:23454
+#: doc/guix.texi:23732 doc/guix.texi:24210 doc/guix.texi:24218
+#: doc/guix.texi:24226 doc/guix.texi:24334 doc/guix.texi:24359
+#: doc/guix.texi:24490 doc/guix.texi:24498 doc/guix.texi:24506
+#: doc/guix.texi:24514 doc/guix.texi:24522 doc/guix.texi:24530
+#: doc/guix.texi:24553 doc/guix.texi:24561 doc/guix.texi:24613
+#: doc/guix.texi:24629 doc/guix.texi:24637 doc/guix.texi:24676
+#: doc/guix.texi:24699 doc/guix.texi:24721 doc/guix.texi:24728
+#: doc/guix.texi:24763 doc/guix.texi:24771 doc/guix.texi:24795
+#: doc/guix.texi:24827 doc/guix.texi:24856 doc/guix.texi:24863
+#: doc/guix.texi:24870 doc/guix.texi:24878 doc/guix.texi:24892
+#: doc/guix.texi:24901 doc/guix.texi:24911 doc/guix.texi:24918
+#: doc/guix.texi:24925 doc/guix.texi:24932 doc/guix.texi:25003
+#: doc/guix.texi:25010 doc/guix.texi:25017 doc/guix.texi:25026
+#: doc/guix.texi:25042 doc/guix.texi:25049 doc/guix.texi:25056
+#: doc/guix.texi:25063 doc/guix.texi:25071 doc/guix.texi:25079
 msgid "Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14956
+#: doc/guix.texi:15113
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean classify-override?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14959
+#: doc/guix.texi:15116
 msgid "Specifies whether users may override the classification (cover page) of individual print jobs using the @code{job-sheets} option."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14963
+#: doc/guix.texi:15120
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} default-auth-type default-auth-type"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14965
+#: doc/guix.texi:15122
 msgid "Specifies the default type of authentication to use."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14967
+#: doc/guix.texi:15124
 msgid "Defaults to @samp{Basic}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14969
+#: doc/guix.texi:15126
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} default-encryption default-encryption"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14971
+#: doc/guix.texi:15128
 msgid "Specifies whether encryption will be used for authenticated requests."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14973
+#: doc/guix.texi:15130
 msgid "Defaults to @samp{Required}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14975
+#: doc/guix.texi:15132
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string default-language"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14977
+#: doc/guix.texi:15134
 msgid "Specifies the default language to use for text and web content."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14979
+#: doc/guix.texi:15136
 msgid "Defaults to @samp{\"en\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14981
+#: doc/guix.texi:15138
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string default-paper-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14986
+#: doc/guix.texi:15143
 msgid "Specifies the default paper size for new print queues.  @samp{\"Auto\"} uses a locale-specific default, while @samp{\"None\"} specifies there is no default paper size.  Specific size names are typically @samp{\"Letter\"} or @samp{\"A4\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14988
+#: doc/guix.texi:15145
 msgid "Defaults to @samp{\"Auto\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14990
+#: doc/guix.texi:15147
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string default-policy"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14992
+#: doc/guix.texi:15149
 msgid "Specifies the default access policy to use."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14994
+#: doc/guix.texi:15151
 msgid "Defaults to @samp{\"default\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14996
+#: doc/guix.texi:15153
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean default-shared?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14998
+#: doc/guix.texi:15155
 msgid "Specifies whether local printers are shared by default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15000 doc/guix.texi:15080 doc/guix.texi:15376
-#: doc/guix.texi:17870 doc/guix.texi:17921 doc/guix.texi:17928
-#: doc/guix.texi:21631 doc/guix.texi:21659 doc/guix.texi:21779
-#: doc/guix.texi:21786 doc/guix.texi:21794 doc/guix.texi:21816
-#: doc/guix.texi:21830 doc/guix.texi:21915 doc/guix.texi:21922
-#: doc/guix.texi:21930 doc/guix.texi:22418 doc/guix.texi:22558
-#: doc/guix.texi:22744 doc/guix.texi:22751 doc/guix.texi:22773
-#: doc/guix.texi:22812 doc/guix.texi:22832 doc/guix.texi:22846
-#: doc/guix.texi:23058 doc/guix.texi:24091 doc/guix.texi:24179
-#: doc/guix.texi:24195 doc/guix.texi:24245
+#: doc/guix.texi:15157 doc/guix.texi:15237 doc/guix.texi:15533
+#: doc/guix.texi:18027 doc/guix.texi:18078 doc/guix.texi:18085
+#: doc/guix.texi:21827 doc/guix.texi:21855 doc/guix.texi:21975
+#: doc/guix.texi:21982 doc/guix.texi:21990 doc/guix.texi:22027
+#: doc/guix.texi:22041 doc/guix.texi:22126 doc/guix.texi:22133
+#: doc/guix.texi:22141 doc/guix.texi:22639 doc/guix.texi:22779
+#: doc/guix.texi:22965 doc/guix.texi:22972 doc/guix.texi:22994
+#: doc/guix.texi:23033 doc/guix.texi:23053 doc/guix.texi:23067
+#: doc/guix.texi:23279 doc/guix.texi:24312 doc/guix.texi:24400
+#: doc/guix.texi:24416 doc/guix.texi:24466
 msgid "Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15002
+#: doc/guix.texi:15159
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer dirty-clean-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15006
+#: doc/guix.texi:15163
 msgid "Specifies the delay for updating of configuration and state files, in seconds.  A value of 0 causes the update to happen as soon as possible, typically within a few milliseconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15008 doc/guix.texi:15056 doc/guix.texi:15065
-#: doc/guix.texi:15086 doc/guix.texi:15383
+#: doc/guix.texi:15165 doc/guix.texi:15213 doc/guix.texi:15222
+#: doc/guix.texi:15243 doc/guix.texi:15540
 msgid "Defaults to @samp{30}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15010
+#: doc/guix.texi:15167
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} error-policy error-policy"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15016
+#: doc/guix.texi:15173
 msgid "Specifies what to do when an error occurs.  Possible values are @code{abort-job}, which will discard the failed print job; @code{retry-job}, which will retry the job at a later time; @code{retry-current-job}, which retries the failed job immediately; and @code{stop-printer}, which stops the printer."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15018
+#: doc/guix.texi:15175
 msgid "Defaults to @samp{stop-printer}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15020
+#: doc/guix.texi:15177
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer filter-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15028
+#: doc/guix.texi:15185
 msgid "Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.  A limit of 0 disables filter limiting.  An average print to a non-PostScript printer needs a filter limit of about 200.  A PostScript printer needs about half that (100).  Setting the limit below these thresholds will effectively limit the scheduler to printing a single job at any time."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15030 doc/guix.texi:15038 doc/guix.texi:15093
-#: doc/guix.texi:15209 doc/guix.texi:15223 doc/guix.texi:15230
-#: doc/guix.texi:16436 doc/guix.texi:16452 doc/guix.texi:17098
-#: doc/guix.texi:17110 doc/guix.texi:17889 doc/guix.texi:17898
-#: doc/guix.texi:17906 doc/guix.texi:17914 doc/guix.texi:22434
-#: doc/guix.texi:22759 doc/guix.texi:24084 doc/guix.texi:24384
-#: doc/guix.texi:24558
+#: doc/guix.texi:15187 doc/guix.texi:15195 doc/guix.texi:15250
+#: doc/guix.texi:15366 doc/guix.texi:15380 doc/guix.texi:15387
+#: doc/guix.texi:16593 doc/guix.texi:16609 doc/guix.texi:17255
+#: doc/guix.texi:17267 doc/guix.texi:18046 doc/guix.texi:18055
+#: doc/guix.texi:18063 doc/guix.texi:18071 doc/guix.texi:22655
+#: doc/guix.texi:22980 doc/guix.texi:24305 doc/guix.texi:24605
+#: doc/guix.texi:24779
 msgid "Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15032
+#: doc/guix.texi:15189
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer filter-nice"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15036
+#: doc/guix.texi:15193
 msgid "Specifies the scheduling priority of filters that are run to print a job.  The nice value ranges from 0, the highest priority, to 19, the lowest priority."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15040
+#: doc/guix.texi:15197
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} host-name-lookups host-name-lookups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15047
+#: doc/guix.texi:15204
 msgid "Specifies whether to do reverse lookups on connecting clients.  The @code{double} setting causes @code{cupsd} to verify that the hostname resolved from the address matches one of the addresses returned for that hostname.  Double lookups also prevent clients with unregistered addresses from connecting to your server.  Only set this option to @code{#t} or @code{double} if absolutely required."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15051
+#: doc/guix.texi:15208
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-kill-delay"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15054
+#: doc/guix.texi:15211
 msgid "Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15058
+#: doc/guix.texi:15215
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15063
+#: doc/guix.texi:15220
 msgid "Specifies the interval between retries of jobs in seconds.  This is typically used for fax queues but can also be used with normal print queues whose error policy is @code{retry-job} or @code{retry-current-job}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15067
+#: doc/guix.texi:15224
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15072
+#: doc/guix.texi:15229
 msgid "Specifies the number of retries that are done for jobs.  This is typically used for fax queues but can also be used with normal print queues whose error policy is @code{retry-job} or @code{retry-current-job}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15074 doc/guix.texi:23310 doc/guix.texi:23330
-#: doc/guix.texi:23346 doc/guix.texi:23360 doc/guix.texi:23367
-#: doc/guix.texi:23374 doc/guix.texi:23381 doc/guix.texi:23540
-#: doc/guix.texi:23556 doc/guix.texi:23563 doc/guix.texi:23570
-#: doc/guix.texi:23581 doc/guix.texi:24036 doc/guix.texi:24044
-#: doc/guix.texi:24052 doc/guix.texi:24076
+#: doc/guix.texi:15231 doc/guix.texi:23531 doc/guix.texi:23551
+#: doc/guix.texi:23567 doc/guix.texi:23581 doc/guix.texi:23588
+#: doc/guix.texi:23595 doc/guix.texi:23602 doc/guix.texi:23761
+#: doc/guix.texi:23777 doc/guix.texi:23784 doc/guix.texi:23791
+#: doc/guix.texi:23802 doc/guix.texi:24257 doc/guix.texi:24265
+#: doc/guix.texi:24273 doc/guix.texi:24297
 msgid "Defaults to @samp{5}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15076
+#: doc/guix.texi:15233
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean keep-alive?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15078
+#: doc/guix.texi:15235
 msgid "Specifies whether to support HTTP keep-alive connections."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15082
+#: doc/guix.texi:15239
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15084
+#: doc/guix.texi:15241
 msgid "Specifies how long an idle client connection remains open, in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15088
+#: doc/guix.texi:15245
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer limit-request-body"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15091
+#: doc/guix.texi:15248
 msgid "Specifies the maximum size of print files, IPP requests, and HTML form data.  A limit of 0 disables the limit check."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15095
+#: doc/guix.texi:15252
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} multiline-string-list listen"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15102
+#: doc/guix.texi:15259
 msgid "Listens on the specified interfaces for connections.  Valid values are of the form @var{address}:@var{port}, where @var{address} is either an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses.  Values can also be file names of local UNIX domain sockets.  The Listen directive is similar to the Port directive but allows you to restrict access to specific interfaces or networks."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15104
+#: doc/guix.texi:15261
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer listen-back-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15111
+#: doc/guix.texi:15268
 msgid "Specifies the number of pending connections that will be allowed.  This normally only affects very busy servers that have reached the MaxClients limit, but can also be triggered by large numbers of simultaneous connections.  When the limit is reached, the operating system will refuse additional connections until the scheduler can accept the pending ones."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15113
+#: doc/guix.texi:15270
 msgid "Defaults to @samp{128}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15115
+#: doc/guix.texi:15272
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} location-access-control-list location-access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15117
+#: doc/guix.texi:15274
 msgid "Specifies a set of additional access controls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15119
+#: doc/guix.texi:15276
 msgid "Available @code{location-access-controls} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15120
+#: doc/guix.texi:15277
 #, no-wrap
 msgid "{@code{location-access-controls} parameter} file-name path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15122
+#: doc/guix.texi:15279
 msgid "Specifies the URI path to which the access control applies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15124
+#: doc/guix.texi:15281
 #, no-wrap
 msgid "{@code{location-access-controls} parameter} access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15127
+#: doc/guix.texi:15284
 msgid "Access controls for all access to this path, in the same format as the @code{access-controls} of @code{operation-access-control}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15129 doc/guix.texi:15135 doc/guix.texi:15149
-#: doc/guix.texi:15156 doc/guix.texi:15298 doc/guix.texi:15357
-#: doc/guix.texi:15435 doc/guix.texi:15449 doc/guix.texi:17584
-#: doc/guix.texi:17787 doc/guix.texi:17815 doc/guix.texi:17845
-#: doc/guix.texi:17960 doc/guix.texi:17973 doc/guix.texi:17980
-#: doc/guix.texi:19069 doc/guix.texi:19173 doc/guix.texi:19598
-#: doc/guix.texi:19606 doc/guix.texi:19851 doc/guix.texi:21690
-#: doc/guix.texi:21837 doc/guix.texi:22025 doc/guix.texi:23201
-#: doc/guix.texi:23261 doc/guix.texi:23269 doc/guix.texi:24099
-#: doc/guix.texi:24106 doc/guix.texi:24448 doc/guix.texi:24526
-#: doc/guix.texi:24620 doc/guix.texi:24628 doc/guix.texi:24664
-#: doc/guix.texi:24814 doc/guix.texi:24865 doc/guix.texi:24874
+#: doc/guix.texi:15286 doc/guix.texi:15292 doc/guix.texi:15306
+#: doc/guix.texi:15313 doc/guix.texi:15455 doc/guix.texi:15514
+#: doc/guix.texi:15592 doc/guix.texi:15606 doc/guix.texi:17741
+#: doc/guix.texi:17944 doc/guix.texi:17972 doc/guix.texi:18002
+#: doc/guix.texi:18117 doc/guix.texi:18130 doc/guix.texi:18137
+#: doc/guix.texi:19226 doc/guix.texi:19330 doc/guix.texi:19755
+#: doc/guix.texi:19763 doc/guix.texi:20008 doc/guix.texi:21886
+#: doc/guix.texi:22048 doc/guix.texi:22243 doc/guix.texi:23422
+#: doc/guix.texi:23482 doc/guix.texi:23490 doc/guix.texi:24320
+#: doc/guix.texi:24327 doc/guix.texi:24669 doc/guix.texi:24747
+#: doc/guix.texi:24841 doc/guix.texi:24849 doc/guix.texi:24885
+#: doc/guix.texi:25035 doc/guix.texi:25086 doc/guix.texi:25095
 msgid "Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15131
+#: doc/guix.texi:15288
 #, no-wrap
 msgid "{@code{location-access-controls} parameter} method-access-control-list method-access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15133
+#: doc/guix.texi:15290
 msgid "Access controls for method-specific access to this path."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15137
+#: doc/guix.texi:15294
 msgid "Available @code{method-access-controls} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15138
+#: doc/guix.texi:15295
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} boolean reverse?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15141
+#: doc/guix.texi:15298
 msgid "If @code{#t}, apply access controls to all methods except the listed methods.  Otherwise apply to only the listed methods."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15145
+#: doc/guix.texi:15302
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} method-list methods"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15147
+#: doc/guix.texi:15304
 msgid "Methods to which this access control applies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15151
+#: doc/guix.texi:15308
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15154
+#: doc/guix.texi:15311
 msgid "Access control directives, as a list of strings.  Each string should be one directive, such as \"Order allow,deny\"."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15160
+#: doc/guix.texi:15317
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer log-debug-history"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15164
+#: doc/guix.texi:15321
 msgid "Specifies the number of debugging messages that are retained for logging if an error occurs in a print job.  Debug messages are logged regardless of the LogLevel setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15166 doc/guix.texi:15187 doc/guix.texi:15194
-#: doc/guix.texi:17344 doc/guix.texi:22010
+#: doc/guix.texi:15323 doc/guix.texi:15344 doc/guix.texi:15351
+#: doc/guix.texi:17501 doc/guix.texi:22228
 msgid "Defaults to @samp{100}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15168
+#: doc/guix.texi:15325
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} log-level log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15171
+#: doc/guix.texi:15328
 msgid "Specifies the level of logging for the ErrorLog file.  The value @code{none} stops all logging while @code{debug2} logs everything."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15173
+#: doc/guix.texi:15330
 msgid "Defaults to @samp{info}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15175
+#: doc/guix.texi:15332
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} log-time-format log-time-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15178
+#: doc/guix.texi:15335
 msgid "Specifies the format of the date and time in the log files.  The value @code{standard} logs whole seconds while @code{usecs} logs microseconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15180
+#: doc/guix.texi:15337
 msgid "Defaults to @samp{standard}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15182
+#: doc/guix.texi:15339
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15185
+#: doc/guix.texi:15342
 msgid "Specifies the maximum number of simultaneous clients that are allowed by the scheduler."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15189
+#: doc/guix.texi:15346
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients-per-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15192
+#: doc/guix.texi:15349
 msgid "Specifies the maximum number of simultaneous clients that are allowed from a single address."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15196
+#: doc/guix.texi:15353
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-copies"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15199
+#: doc/guix.texi:15356
 msgid "Specifies the maximum number of copies that a user can print of each job."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15201
+#: doc/guix.texi:15358
 msgid "Defaults to @samp{9999}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15203
+#: doc/guix.texi:15360
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-hold-time"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15207
+#: doc/guix.texi:15364
 msgid "Specifies the maximum time a job may remain in the @code{indefinite} hold state before it is canceled.  A value of 0 disables cancellation of held jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15211
+#: doc/guix.texi:15368
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15214
+#: doc/guix.texi:15371
 msgid "Specifies the maximum number of simultaneous jobs that are allowed.  Set to 0 to allow an unlimited number of jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15216
+#: doc/guix.texi:15373
 msgid "Defaults to @samp{500}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15218
+#: doc/guix.texi:15375
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-printer"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15221
+#: doc/guix.texi:15378
 msgid "Specifies the maximum number of simultaneous jobs that are allowed per printer.  A value of 0 allows up to MaxJobs jobs per printer."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15225
+#: doc/guix.texi:15382
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15228
+#: doc/guix.texi:15385
 msgid "Specifies the maximum number of simultaneous jobs that are allowed per user.  A value of 0 allows up to MaxJobs jobs per user."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15232
+#: doc/guix.texi:15389
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-job-time"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15235
+#: doc/guix.texi:15392
 msgid "Specifies the maximum time a job may take to print before it is canceled, in seconds.  Set to 0 to disable cancellation of \"stuck\" jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15237
+#: doc/guix.texi:15394
 msgid "Defaults to @samp{10800}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15239
+#: doc/guix.texi:15396
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-log-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15242
+#: doc/guix.texi:15399
 msgid "Specifies the maximum size of the log files before they are rotated, in bytes.  The value 0 disables log rotation."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15244
+#: doc/guix.texi:15401
 msgid "Defaults to @samp{1048576}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15246
+#: doc/guix.texi:15403
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer multiple-operation-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15249
+#: doc/guix.texi:15406
 msgid "Specifies the maximum amount of time to allow between files in a multiple file print job, in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15251 doc/guix.texi:15462 doc/guix.texi:21624
+#: doc/guix.texi:15408 doc/guix.texi:15619 doc/guix.texi:21820
 msgid "Defaults to @samp{300}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15253
+#: doc/guix.texi:15410
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string page-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15258
+#: doc/guix.texi:15415
 msgid "Specifies the format of PageLog lines.  Sequences beginning with percent (@samp{%}) characters are replaced with the corresponding information, while all other characters are copied literally.  The following percent sequences are recognized:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15260
+#: doc/guix.texi:15417
 #, no-wrap
 msgid "%%"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15262
+#: doc/guix.texi:15419
 msgid "insert a single percent character"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15263
+#: doc/guix.texi:15420
 #, no-wrap
 msgid "%@{name@}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15265
+#: doc/guix.texi:15422
 msgid "insert the value of the specified IPP attribute"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15266
+#: doc/guix.texi:15423
 #, no-wrap
 msgid "%C"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15268
+#: doc/guix.texi:15425
 msgid "insert the number of copies for the current page"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15269
+#: doc/guix.texi:15426
 #, no-wrap
 msgid "%P"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15271
+#: doc/guix.texi:15428
 msgid "insert the current page number"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15272
+#: doc/guix.texi:15429
 #, no-wrap
 msgid "%T"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15274
+#: doc/guix.texi:15431
 msgid "insert the current date and time in common log format"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15275
+#: doc/guix.texi:15432
 #, no-wrap
 msgid "%j"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15277
+#: doc/guix.texi:15434
 msgid "insert the job ID"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15278 doc/guix.texi:16954
+#: doc/guix.texi:15435 doc/guix.texi:17111
 #, no-wrap
 msgid "%p"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15280
+#: doc/guix.texi:15437
 msgid "insert the printer name"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15281 doc/guix.texi:16977
+#: doc/guix.texi:15438 doc/guix.texi:17134
 #, no-wrap
 msgid "%u"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15283
+#: doc/guix.texi:15440
 msgid "insert the username"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15289
+#: doc/guix.texi:15446
 msgid "A value of the empty string disables page logging.  The string @code{%p %u %j %T %P %C %@{job-billing@} %@{job-originating-host-name@} %@{job-name@} %@{media@} %@{sides@}} creates a page log with the standard items."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15293
+#: doc/guix.texi:15450
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} environment-variables environment-variables"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15296
+#: doc/guix.texi:15453
 msgid "Passes the specified environment variable(s) to child processes; a list of strings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15300
+#: doc/guix.texi:15457
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} policy-configuration-list policies"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15302
+#: doc/guix.texi:15459
 msgid "Specifies named access control policies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15304
+#: doc/guix.texi:15461
 msgid "Available @code{policy-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15305
+#: doc/guix.texi:15462
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15307
+#: doc/guix.texi:15464
 msgid "Name of the policy."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15309
+#: doc/guix.texi:15466
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string job-private-access"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15319
+#: doc/guix.texi:15476
 msgid "Specifies an access list for a job's private values.  @code{@@ACL} maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values.  @code{@@OWNER} maps to the job's owner.  @code{@@SYSTEM} maps to the groups listed for the @code{system-group} field of the @code{files-config} configuration, which is reified into the @code{cups-files.conf(5)} file.  Other possible elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group.  The access list may also be simply @code{all} or @code{default}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15321 doc/guix.texi:15343
+#: doc/guix.texi:15478 doc/guix.texi:15500
 msgid "Defaults to @samp{\"@@OWNER @@SYSTEM\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15323
+#: doc/guix.texi:15480
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string job-private-values"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15326 doc/guix.texi:15348
+#: doc/guix.texi:15483 doc/guix.texi:15505
 msgid "Specifies the list of job values to make private, or @code{all}, @code{default}, or @code{none}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15329
+#: doc/guix.texi:15486
 msgid "Defaults to @samp{\"job-name job-originating-host-name job-originating-user-name phone\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15331
+#: doc/guix.texi:15488
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string subscription-private-access"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15341
+#: doc/guix.texi:15498
 msgid "Specifies an access list for a subscription's private values.  @code{@@ACL} maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values.  @code{@@OWNER} maps to the job's owner.  @code{@@SYSTEM} maps to the groups listed for the @code{system-group} field of the @code{files-config} configuration, which is reified into the @code{cups-files.conf(5)} file.  Other possible elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group.  The access list may also be simply @code{all} or @code{default}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15345
+#: doc/guix.texi:15502
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string subscription-private-values"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15351
+#: doc/guix.texi:15508
 msgid "Defaults to @samp{\"notify-events notify-pull-method notify-recipient-uri notify-subscriber-user-name notify-user-data\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15353
+#: doc/guix.texi:15510
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} operation-access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15355
+#: doc/guix.texi:15512
 msgid "Access control by IPP operation."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15360
+#: doc/guix.texi:15517
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-files"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15365
+#: doc/guix.texi:15522
 msgid "Specifies whether job files (documents) are preserved after a job is printed.  If a numeric value is specified, job files are preserved for the indicated number of seconds after printing.  Otherwise a boolean value applies indefinitely."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15367
+#: doc/guix.texi:15524
 msgid "Defaults to @samp{86400}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15369
+#: doc/guix.texi:15526
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-history"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15374
+#: doc/guix.texi:15531
 msgid "Specifies whether the job history is preserved after a job is printed.  If a numeric value is specified, the job history is preserved for the indicated number of seconds after printing.  If @code{#t}, the job history is preserved until the MaxJobs limit is reached."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15378
+#: doc/guix.texi:15535
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer reload-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15381
+#: doc/guix.texi:15538
 msgid "Specifies the amount of time to wait for job completion before restarting the scheduler."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15385
+#: doc/guix.texi:15542
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string rip-cache"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15388
+#: doc/guix.texi:15545
 msgid "Specifies the maximum amount of memory to use when converting documents into bitmaps for a printer."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15390
+#: doc/guix.texi:15547
 msgid "Defaults to @samp{\"128m\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15392
+#: doc/guix.texi:15549
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string server-admin"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15394
+#: doc/guix.texi:15551
 msgid "Specifies the email address of the server administrator."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15396
+#: doc/guix.texi:15553
 msgid "Defaults to @samp{\"root@@localhost.localdomain\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15398
+#: doc/guix.texi:15555
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} host-name-list-or-* server-alias"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15406
+#: doc/guix.texi:15563
 msgid "The ServerAlias directive is used for HTTP Host header validation when clients connect to the scheduler from external interfaces.  Using the special name @code{*} can expose your system to known browser-based DNS rebinding attacks, even when accessing sites through a firewall.  If the auto-discovery of alternate names does not work, we recommend listing each alternate name with a ServerAlias directive instead of using @code{*}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15408
+#: doc/guix.texi:15565
 msgid "Defaults to @samp{*}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15410
+#: doc/guix.texi:15567
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string server-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15412
+#: doc/guix.texi:15569
 msgid "Specifies the fully-qualified host name of the server."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15414 doc/guix.texi:19196 doc/guix.texi:19240
+#: doc/guix.texi:15571 doc/guix.texi:19353 doc/guix.texi:19397
 msgid "Defaults to @samp{\"localhost\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15416
+#: doc/guix.texi:15573
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} server-tokens server-tokens"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15424
+#: doc/guix.texi:15581
 msgid "Specifies what information is included in the Server header of HTTP responses.  @code{None} disables the Server header.  @code{ProductOnly} reports @code{CUPS}.  @code{Major} reports @code{CUPS 2}.  @code{Minor} reports @code{CUPS 2.0}.  @code{Minimal} reports @code{CUPS 2.0.0}.  @code{OS} reports @code{CUPS 2.0.0 (@var{uname})} where @var{uname} is the output of the @code{uname} command.  @code{Full} reports @code{CUPS 2.0.0 (@var{uname}) IPP/2.0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15426
+#: doc/guix.texi:15583
 msgid "Defaults to @samp{Minimal}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15428
+#: doc/guix.texi:15585
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} multiline-string-list ssl-listen"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15433
+#: doc/guix.texi:15590
 msgid "Listens on the specified interfaces for encrypted connections.  Valid values are of the form @var{address}:@var{port}, where @var{address} is either an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15437
+#: doc/guix.texi:15594
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} ssl-options ssl-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15447
+#: doc/guix.texi:15604
 msgid "Sets encryption options.  By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites.  Security is reduced when @code{Allow} options are used, and enhanced when @code{Deny} options are used.  The @code{AllowRC4} option enables the 128-bit RC4 cipher suites, which are required for some older clients.  The @code{AllowSSL3} option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.  The @code{DenyCBC} option disables all CBC cipher suites.  The @code{DenyTLS1.0} option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15451
+#: doc/guix.texi:15608
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean strict-conformance?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15454
+#: doc/guix.texi:15611
 msgid "Specifies whether the scheduler requires clients to strictly adhere to the IPP specifications."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15458
+#: doc/guix.texi:15615
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15460
+#: doc/guix.texi:15617
 msgid "Specifies the HTTP request timeout, in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15465
+#: doc/guix.texi:15622
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean web-interface?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15467
+#: doc/guix.texi:15624
 msgid "Specifies whether the web interface is enabled."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15477
+#: doc/guix.texi:15634
 msgid "At this point you're probably thinking ``oh dear, Guix manual, I like you but you can stop already with the configuration options''.  Indeed.  However, one more point: it could be that you have an existing @code{cupsd.conf} that you want to use.  In that case, you can pass an @code{opaque-cups-configuration} as the configuration of a @code{cups-service-type}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15479
+#: doc/guix.texi:15636
 msgid "Available @code{opaque-cups-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15480
+#: doc/guix.texi:15637
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} package cups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15484
+#: doc/guix.texi:15641
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} string cupsd.conf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15486
+#: doc/guix.texi:15643
 msgid "The contents of the @code{cupsd.conf}, as a string."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15488
+#: doc/guix.texi:15645
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} string cups-files.conf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15490
+#: doc/guix.texi:15647
 msgid "The contents of the @code{cups-files.conf} file, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15495
+#: doc/guix.texi:15652
 msgid "For example, if your @code{cupsd.conf} and @code{cups-files.conf} are in strings of the same name, you could instantiate a CUPS service like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:15501
+#: doc/guix.texi:15658
 #, no-wrap
 msgid ""
 "(service cups-service-type\n"
@@ -28274,199 +28749,199 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15512
+#: doc/guix.texi:15669
 msgid "The @code{(gnu services desktop)} module provides services that are usually useful in the context of a ``desktop'' setup---that is, on a machine running a graphical display server, possibly with graphical user interfaces, etc.  It also defines services that provide specific desktop environments like GNOME, Xfce or MATE."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15516
+#: doc/guix.texi:15673
 msgid "To simplify things, the module defines a variable containing the set of services that users typically expect on a machine with a graphical environment and networking:"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15517
+#: doc/guix.texi:15674
 #, no-wrap
 msgid "{Scheme Variable} %desktop-services"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15520
+#: doc/guix.texi:15677
 msgid "This is a list of services that builds upon @code{%base-services} and adds or adjusts services for a typical ``desktop'' setup."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15531
+#: doc/guix.texi:15688
 msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}) with modem support (@pxref{Networking Services, @code{modem-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15536
+#: doc/guix.texi:15693
 msgid "The @code{%desktop-services} variable can be used as the @code{services} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @code{services}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15559
-msgid "Additionally, the @code{gnome-desktop-service-type}, @code{xfce-desktop-service}, @code{mate-desktop-service-type} and @code{enlightenment-desktop-service-type} procedures can add GNOME, Xfce, MATE and/or Enlightenment to a system.  To ``add GNOME'' means that system-level services like the backlight adjustment helpers and the power management utilities are added to the system, extending @code{polkit} and @code{dbus} appropriately, allowing GNOME to operate with elevated privileges on a limited number of special-purpose system interfaces.  Additionally, adding a service made by @code{gnome-desktop-service-type} adds the GNOME metapackage to the system profile.  Likewise, adding the Xfce service not only adds the @code{xfce} metapackage to the system profile, but it also gives the Thunar file manager the ability to open a ``root-mode'' file management window, if the user authenticates using the administrator's password via the standard polkit graphical interface.  To ``add MATE'' means that @code{polkit} and @code{dbus} are extended appropriately, allowing MATE to operate with elevated privileges on a limited number of special-purpose system interfaces.  Additionally, adding a service of type @code{mate-desktop-service-type} adds the MATE metapackage to the system profile.  ``Adding Enlightenment'' means that @code{dbus} is extended appropriately, and several of Enlightenment's binaries are set as setuid, allowing Enlightenment's screen locker and other functionality to work as expetected."
+#: doc/guix.texi:15716
+msgid "Additionally, the @code{gnome-desktop-service-type}, @code{xfce-desktop-service}, @code{mate-desktop-service-type} and @code{enlightenment-desktop-service-type} procedures can add GNOME, Xfce, MATE and/or Enlightenment to a system.  To ``add GNOME'' means that system-level services like the backlight adjustment helpers and the power management utilities are added to the system, extending @code{polkit} and @code{dbus} appropriately, allowing GNOME to operate with elevated privileges on a limited number of special-purpose system interfaces.  Additionally, adding a service made by @code{gnome-desktop-service-type} adds the GNOME metapackage to the system profile.  Likewise, adding the Xfce service not only adds the @code{xfce} metapackage to the system profile, but it also gives the Thunar file manager the ability to open a ``root-mode'' file management window, if the user authenticates using the administrator's password via the standard polkit graphical interface.  To ``add MATE'' means that @code{polkit} and @code{dbus} are extended appropriately, allowing MATE to operate with elevated privileges on a limited number of special-purpose system interfaces.  Additionally, adding a service of type @code{mate-desktop-service-type} adds the MATE metapackage to the system profile.  ``Adding Enlightenment'' means that @code{dbus} is extended appropriately, and several of Enlightenment's binaries are set as setuid, allowing Enlightenment's screen locker and other functionality to work as expected."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15568
+#: doc/guix.texi:15725
 msgid "The desktop environments in Guix use the Xorg display server by default.  If you'd like to use the newer display server protocol called Wayland, you need to use the @code{sddm-service} instead of GDM as the graphical login manager.  You should then select the ``GNOME (Wayland)'' session in SDDM.  Alternatively you can also try starting GNOME on Wayland manually from a TTY with the command ``XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session``.  Currently only GNOME has support for Wayland."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15569
+#: doc/guix.texi:15726
 #, no-wrap
 msgid "{Scheme Variable} gnome-desktop-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15573
+#: doc/guix.texi:15730
 msgid "This is the type of the service that adds the @uref{https://www.gnome.org, GNOME} desktop environment.  Its value is a @code{gnome-desktop-configuration} object (see below.)"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15576
+#: doc/guix.texi:15733
 msgid "This service adds the @code{gnome} package to the system profile, and extends polkit with the actions from @code{gnome-settings-daemon}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15578
+#: doc/guix.texi:15735
 #, no-wrap
 msgid "{Data Type} gnome-desktop-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15580
+#: doc/guix.texi:15737
 msgid "Configuration record for the GNOME desktop environment."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15582
+#: doc/guix.texi:15739
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{gnome} (default: @code{gnome})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:15584
+#: doc/guix.texi:15741
 msgid "The GNOME package to use."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15587
+#: doc/guix.texi:15744
 #, no-wrap
 msgid "{Scheme Variable} xfce-desktop-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15591
+#: doc/guix.texi:15748
 msgid "This is the type of a service to run the @uref{Xfce, https://xfce.org/} desktop environment.  Its value is an @code{xfce-desktop-configuration} object (see below.)"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15596
+#: doc/guix.texi:15753
 msgid "This service adds the @code{xfce} package to the system profile, and extends polkit with the ability for @code{thunar} to manipulate the file system as root from within a user session, after the user has authenticated with the administrator's password."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15598
+#: doc/guix.texi:15755
 #, no-wrap
 msgid "{Data Type} xfce-desktop-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15600
+#: doc/guix.texi:15757
 msgid "Configuration record for the Xfce desktop environment."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15602
+#: doc/guix.texi:15759
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{xfce} (default: @code{xfce})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:15604
+#: doc/guix.texi:15761
 msgid "The Xfce package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15607
+#: doc/guix.texi:15764
 #, no-wrap
 msgid "{Scheme Variable} mate-desktop-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15611
+#: doc/guix.texi:15768
 msgid "This is the type of the service that runs the @uref{https://mate-desktop.org/, MATE desktop environment}.  Its value is a @code{mate-desktop-configuration} object (see below.)"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15615
+#: doc/guix.texi:15772
 msgid "This service adds the @code{mate} package to the system profile, and extends polkit with the actions from @code{mate-settings-daemon}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15617
+#: doc/guix.texi:15774
 #, no-wrap
 msgid "{Data Type} mate-desktop-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15619
+#: doc/guix.texi:15776
 msgid "Configuration record for the MATE desktop environment."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15621
+#: doc/guix.texi:15778
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{mate} (default: @code{mate})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:15623
+#: doc/guix.texi:15780
 msgid "The MATE package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15626
+#: doc/guix.texi:15783
 #, no-wrap
 msgid "{Scheme Variable} enlightenment-desktop-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15629
+#: doc/guix.texi:15786
 msgid "Return a service that adds the @code{enlightenment} package to the system profile, and extends dbus with actions from @code{efl}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15631
+#: doc/guix.texi:15788
 #, no-wrap
 msgid "{Data Type} enlightenment-desktop-service-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15633
+#: doc/guix.texi:15790
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{enlightenment} (default: @code{enlightenment})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:15635
+#: doc/guix.texi:15792
 msgid "The enlightenment package to use."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15643
+#: doc/guix.texi:15800
 msgid "Because the GNOME, Xfce and MATE desktop services pull in so many packages, the default @code{%desktop-services} variable doesn't include any of them by default.  To add GNOME, Xfce or MATE, just @code{cons} them onto @code{%desktop-services} in the @code{services} field of your @code{operating-system}:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:15654
+#: doc/guix.texi:15811
 #, no-wrap
 msgid ""
 "(use-modules (gnu))\n"
@@ -28481,755 +28956,755 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15658
+#: doc/guix.texi:15815
 msgid "These desktop environments will then be available as options in the graphical login window."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15662
+#: doc/guix.texi:15819
 msgid "The actual service definitions included in @code{%desktop-services} and provided by @code{(gnu services dbus)} and @code{(gnu services desktop)} are described below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15663
+#: doc/guix.texi:15820
 #, no-wrap
 msgid "{Scheme Procedure} dbus-service [#:dbus @var{dbus}] [#:services '()]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15666
+#: doc/guix.texi:15823
 msgid "Return a service that runs the ``system bus'', using @var{dbus}, with support for @var{services}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15670
+#: doc/guix.texi:15827
 msgid "@uref{https://dbus.freedesktop.org/, D-Bus} is an inter-process communication facility.  Its system bus is used to allow system services to communicate and to be notified of system-wide events."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15675
+#: doc/guix.texi:15832
 msgid "@var{services} must be a list of packages that provide an @file{etc/dbus-1/system.d} directory containing additional D-Bus configuration and policy files.  For example, to allow avahi-daemon to use the system bus, @var{services} must be equal to @code{(list avahi)}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15677
+#: doc/guix.texi:15834
 #, no-wrap
 msgid "{Scheme Procedure} elogind-service [#:config @var{config}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15683
+#: doc/guix.texi:15840
 msgid "Return a service that runs the @code{elogind} login and seat management daemon.  @uref{https://github.com/elogind/elogind, Elogind} exposes a D-Bus interface that can be used to know which users are logged in, know what kind of sessions they have open, suspend the system, inhibit system suspend, reboot the system, and other tasks."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15687
+#: doc/guix.texi:15844
 msgid "Elogind handles most system-level power events for a computer, for example suspending the system when a lid is closed, or shutting it down when the power button is pressed."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15692
+#: doc/guix.texi:15849
 msgid "The @var{config} keyword argument specifies the configuration for elogind, and should be the result of an @code{(elogind-configuration (@var{parameter} @var{value})...)} invocation.  Available parameters and their default values are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15694
+#: doc/guix.texi:15851
 #, no-wrap
 msgid "kill-user-processes?"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15696 doc/guix.texi:15714 doc/guix.texi:15716
-#: doc/guix.texi:15718 doc/guix.texi:15730
+#: doc/guix.texi:15853 doc/guix.texi:15871 doc/guix.texi:15873
+#: doc/guix.texi:15875 doc/guix.texi:15887
 msgid "#f"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15696
+#: doc/guix.texi:15853
 #, no-wrap
 msgid "kill-only-users"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15698 doc/guix.texi:15736
+#: doc/guix.texi:15855 doc/guix.texi:15893
 msgid "()"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15698
+#: doc/guix.texi:15855
 #, no-wrap
 msgid "kill-exclude-users"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15700
+#: doc/guix.texi:15857
 msgid "(\"root\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15700
+#: doc/guix.texi:15857
 #, no-wrap
 msgid "inhibit-delay-max-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15702
+#: doc/guix.texi:15859
 msgid "5"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15702
+#: doc/guix.texi:15859
 #, no-wrap
 msgid "handle-power-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15704
+#: doc/guix.texi:15861
 msgid "poweroff"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15704
+#: doc/guix.texi:15861
 #, no-wrap
 msgid "handle-suspend-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15706 doc/guix.texi:15710
+#: doc/guix.texi:15863 doc/guix.texi:15867
 msgid "suspend"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15706
+#: doc/guix.texi:15863
 #, no-wrap
 msgid "handle-hibernate-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15708
+#: doc/guix.texi:15865
 msgid "hibernate"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15708
+#: doc/guix.texi:15865
 #, no-wrap
 msgid "handle-lid-switch"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15710
+#: doc/guix.texi:15867
 #, no-wrap
 msgid "handle-lid-switch-docked"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15712 doc/guix.texi:15724
+#: doc/guix.texi:15869 doc/guix.texi:15881
 msgid "ignore"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15712
+#: doc/guix.texi:15869
 #, no-wrap
 msgid "power-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15714
+#: doc/guix.texi:15871
 #, no-wrap
 msgid "suspend-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15716
+#: doc/guix.texi:15873
 #, no-wrap
 msgid "hibernate-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15718
+#: doc/guix.texi:15875
 #, no-wrap
 msgid "lid-switch-ignore-inhibited?"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15720 doc/guix.texi:15732
+#: doc/guix.texi:15877 doc/guix.texi:15889
 msgid "#t"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15720
+#: doc/guix.texi:15877
 #, no-wrap
 msgid "holdoff-timeout-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15722
+#: doc/guix.texi:15879
 msgid "30"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15722
+#: doc/guix.texi:15879
 #, no-wrap
 msgid "idle-action"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15724
+#: doc/guix.texi:15881
 #, no-wrap
 msgid "idle-action-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15726
+#: doc/guix.texi:15883
 msgid "(* 30 60)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15726
+#: doc/guix.texi:15883
 #, no-wrap
 msgid "runtime-directory-size-percent"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15728
+#: doc/guix.texi:15885
 msgid "10"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15728
+#: doc/guix.texi:15885
 #, no-wrap
 msgid "runtime-directory-size"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15730
+#: doc/guix.texi:15887
 #, no-wrap
 msgid "remove-ipc?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15732
+#: doc/guix.texi:15889
 #, no-wrap
 msgid "suspend-state"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15734
+#: doc/guix.texi:15891
 msgid "(\"mem\" \"standby\" \"freeze\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15734
+#: doc/guix.texi:15891
 #, no-wrap
 msgid "suspend-mode"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15736
+#: doc/guix.texi:15893
 #, no-wrap
 msgid "hibernate-state"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15738 doc/guix.texi:15742
+#: doc/guix.texi:15895 doc/guix.texi:15899
 msgid "(\"disk\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15738
+#: doc/guix.texi:15895
 #, no-wrap
 msgid "hibernate-mode"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15740
+#: doc/guix.texi:15897
 msgid "(\"platform\" \"shutdown\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15740
+#: doc/guix.texi:15897
 #, no-wrap
 msgid "hybrid-sleep-state"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15742
+#: doc/guix.texi:15899
 #, no-wrap
 msgid "hybrid-sleep-mode"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15744
+#: doc/guix.texi:15901
 msgid "(\"suspend\" \"platform\" \"shutdown\")"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15747
+#: doc/guix.texi:15904
 #, no-wrap
 msgid "{Scheme Procedure} accountsservice-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15755
+#: doc/guix.texi:15912
 msgid "[#:accountsservice @var{accountsservice}] Return a service that runs AccountsService, a system service that can list available accounts, change their passwords, and so on.  AccountsService integrates with PolicyKit to enable unprivileged users to acquire the capability to modify their system configuration.  @uref{https://www.freedesktop.org/wiki/Software/AccountsService/, the accountsservice web site} for more information."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15758
+#: doc/guix.texi:15915
 msgid "The @var{accountsservice} keyword argument is the @code{accountsservice} package to expose as a service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15760
+#: doc/guix.texi:15917
 #, no-wrap
 msgid "{Scheme Procedure} polkit-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15769
+#: doc/guix.texi:15926
 msgid "[#:polkit @var{polkit}] Return a service that runs the @uref{https://www.freedesktop.org/wiki/Software/polkit/, Polkit privilege management service}, which allows system administrators to grant access to privileged operations in a structured way.  By querying the Polkit service, a privileged system component can know when it should grant additional capabilities to ordinary users.  For example, an ordinary user can be granted the capability to suspend the system if the user is logged in locally."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15771
+#: doc/guix.texi:15928
 #, no-wrap
 msgid "{Scheme Variable} polkit-wheel-service"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15776
+#: doc/guix.texi:15933
 msgid "Service that adds the @code{wheel} group as admins to the Polkit service.  This makes it so that users in the @code{wheel} group are queried for their own passwords when performing administrative actions instead of @code{root}'s, similar to the behaviour used by @code{sudo}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15778
+#: doc/guix.texi:15935
 #, no-wrap
 msgid "{Scheme Variable} upower-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15782
+#: doc/guix.texi:15939
 msgid "Service that runs @uref{https://upower.freedesktop.org/, @command{upowerd}}, a system-wide monitor for power consumption and battery levels, with the given configuration settings."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15785
+#: doc/guix.texi:15942
 msgid "It implements the @code{org.freedesktop.UPower} D-Bus interface, and is notably used by GNOME."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15787
+#: doc/guix.texi:15944
 #, no-wrap
 msgid "{Data Type} upower-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15789
+#: doc/guix.texi:15946
 msgid "Data type representation the configuration for UPower."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15792
+#: doc/guix.texi:15949
 #, no-wrap
 msgid "@code{upower} (default: @var{upower})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15794
+#: doc/guix.texi:15951
 msgid "Package to use for @code{upower}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15795
+#: doc/guix.texi:15952
 #, no-wrap
 msgid "@code{watts-up-pro?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15797
+#: doc/guix.texi:15954
 msgid "Enable the Watts Up Pro device."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15798
+#: doc/guix.texi:15955
 #, no-wrap
 msgid "@code{poll-batteries?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15800
+#: doc/guix.texi:15957
 msgid "Enable polling the kernel for battery level changes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15801
+#: doc/guix.texi:15958
 #, no-wrap
 msgid "@code{ignore-lid?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15803
+#: doc/guix.texi:15960
 msgid "Ignore the lid state, this can be useful if it's incorrect on a device."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15804
+#: doc/guix.texi:15961
 #, no-wrap
 msgid "@code{use-percentage-for-policy?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15807
+#: doc/guix.texi:15964
 msgid "Whether battery percentage based policy should be used.  The default is to use the time left, change to @code{#t} to use the percentage."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15808
+#: doc/guix.texi:15965
 #, no-wrap
 msgid "@code{percentage-low} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15811
+#: doc/guix.texi:15968
 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which the battery is considered low."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15812
+#: doc/guix.texi:15969
 #, no-wrap
 msgid "@code{percentage-critical} (default: @code{3})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15815
+#: doc/guix.texi:15972
 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which the battery is considered critical."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15816
+#: doc/guix.texi:15973
 #, no-wrap
 msgid "@code{percentage-action} (default: @code{2})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15819
+#: doc/guix.texi:15976
 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which action will be taken."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15820
+#: doc/guix.texi:15977
 #, no-wrap
 msgid "@code{time-low} (default: @code{1200})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15823
+#: doc/guix.texi:15980
 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which the battery is considered low."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15824
+#: doc/guix.texi:15981
 #, no-wrap
 msgid "@code{time-critical} (default: @code{300})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15827
+#: doc/guix.texi:15984
 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which the battery is considered critical."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15828
+#: doc/guix.texi:15985
 #, no-wrap
 msgid "@code{time-action} (default: @code{120})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15831
+#: doc/guix.texi:15988
 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which action will be taken."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15832
+#: doc/guix.texi:15989
 #, no-wrap
 msgid "@code{critical-power-action} (default: @code{'hybrid-sleep})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15835
+#: doc/guix.texi:15992
 msgid "The action taken when @code{percentage-action} or @code{time-action} is reached (depending on the configuration of @code{use-percentage-for-policy?})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15837
+#: doc/guix.texi:15994
 msgid "Possible values are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15841
+#: doc/guix.texi:15998
 msgid "'power-off"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15844
+#: doc/guix.texi:16001
 msgid "'hibernate"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:15847
+#: doc/guix.texi:16004
 msgid "@code{'hybrid-sleep}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15852
+#: doc/guix.texi:16009
 #, no-wrap
 msgid "{Scheme Procedure} udisks-service [#:udisks @var{udisks}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15857
+#: doc/guix.texi:16014
 msgid "Return a service for @uref{https://udisks.freedesktop.org/docs/latest/, UDisks}, a @dfn{disk management} daemon that provides user interfaces with notifications and ways to mount/unmount disks.  Programs that talk to UDisks include the @command{udisksctl} command, part of UDisks, and GNOME Disks."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15859
+#: doc/guix.texi:16016
 #, no-wrap
 msgid "{Scheme Variable} colord-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15866
+#: doc/guix.texi:16023
 msgid "This is the type of the service that runs @command{colord}, a system service with a D-Bus interface to manage the color profiles of input and output devices such as screens and scanners.  It is notably used by the GNOME Color Manager graphical tool.  See @uref{https://www.freedesktop.org/software/colord/, the colord web site} for more information."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15868
+#: doc/guix.texi:16025
 #, no-wrap
 msgid "{Scheme Procedure} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15877
+#: doc/guix.texi:16034
 msgid "Return a configuration allowing an application to access GeoClue location data.  @var{name} is the Desktop ID of the application, without the @code{.desktop} part.  If @var{allowed?} is true, the application will have access to location information by default.  The boolean @var{system?} value indicates whether an application is a system component or not.  Finally @var{users} is a list of UIDs of all users for which this application is allowed location info access.  An empty users list means that all users are allowed."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15879
+#: doc/guix.texi:16036
 #, no-wrap
 msgid "scanner access"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15880
+#: doc/guix.texi:16037
 #, no-wrap
 msgid "{Scheme Procedure} sane-service-type"
 msgstr "{Процедура Scheme} sane-service-type"
 
 #. type: deffn
-#: doc/guix.texi:15884
+#: doc/guix.texi:16041
 msgid "This service provides access to scanners @i{via} @uref{http://www.sane-project.org, SANE} by installing the necessary udev rules."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15886
+#: doc/guix.texi:16043
 #, no-wrap
 msgid "{Scheme Variable} %standard-geoclue-applications"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15893
+#: doc/guix.texi:16050
 msgid "The standard list of well-known GeoClue application configurations, granting authority to the GNOME date-and-time utility to ask for the current location in order to set the time zone, and allowing the IceCat and Epiphany web browsers to request location information.  IceCat and Epiphany both query the user before allowing a web page to know the user's location."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15895
+#: doc/guix.texi:16052
 #, no-wrap
 msgid "{Scheme Procedure} geoclue-service [#:colord @var{colord}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15908
+#: doc/guix.texi:16065
 msgid "[#:whitelist '()] @ [#:wifi-geolocation-url \"https://location.services.mozilla.com/v1/geolocate?key=geoclue\"] @ [#:submit-data? #f] [#:wifi-submission-url \"https://location.services.mozilla.com/v1/submit?key=geoclue\"] @ [#:submission-nick \"geoclue\"] @ [#:applications %standard-geoclue-applications] Return a service that runs the GeoClue location service.  This service provides a D-Bus interface to allow applications to request access to a user's physical location, and optionally to add information to online location databases.  See @uref{https://wiki.freedesktop.org/www/Software/GeoClue/, the GeoClue web site} for more information."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15910
+#: doc/guix.texi:16067
 #, no-wrap
 msgid "{Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15917
+#: doc/guix.texi:16074
 msgid "[@w{#:auto-enable? #f}] Return a service that runs the @command{bluetoothd} daemon, which manages all the Bluetooth devices and provides a number of D-Bus interfaces.  When AUTO-ENABLE? is true, the bluetooth controller is powered automatically at boot, which can be useful when using a bluetooth keyboard or mouse."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15919
+#: doc/guix.texi:16076
 msgid "Users need to be in the @code{lp} group to access the D-Bus service."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15921
+#: doc/guix.texi:16078
 #, no-wrap
 msgid "{Scheme Variable} gnome-keyring-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15925
+#: doc/guix.texi:16082
 msgid "This is the type of the service that adds the @uref{https://wiki.gnome.org/Projects/GnomeKeyring, GNOME Keyring}.  Its value is a @code{gnome-keyring-configuration} object (see below.)"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15929
+#: doc/guix.texi:16086
 msgid "This service adds the @code{gnome-keyring} package to the system profile and extends PAM with entries using @code{pam_gnome_keyring.so}, unlocking a user's login keyring when they log in or setting its password with passwd."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15931
+#: doc/guix.texi:16088
 #, no-wrap
 msgid "{Data Type} gnome-keyring-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15933
+#: doc/guix.texi:16090
 msgid "Configuration record for the GNOME Keyring service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15935
+#: doc/guix.texi:16092
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{keyring} (default: @code{gnome-keyring})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:15937
+#: doc/guix.texi:16094
 msgid "The GNOME keyring package to use."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15938
+#: doc/guix.texi:16095
 #, fuzzy, no-wrap
 #| msgid "Base Services"
 msgid "pam-services"
 msgstr "Базовые сервисы"
 
 #. type: table
-#: doc/guix.texi:15943
+#: doc/guix.texi:16100
 msgid "A list of @code{(@var{service} . @var{kind})} pairs denoting PAM services to extend, where @var{service} is the name of an existing service to extend and @var{kind} is one of @code{login} or @code{passwd}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15949
+#: doc/guix.texi:16106
 msgid "If @code{login} is given, it adds an optional @code{pam_gnome_keyring.so} to the auth block without arguments and to the session block with @code{auto_start}.  If @code{passwd} is given, it adds an optional @code{pam_gnome_keyring.so} to the password block without arguments."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15952
+#: doc/guix.texi:16109
 msgid "By default, this field contains ``gdm-password'' with the value @code{login} and ``passwd'' is with the value @code{passwd}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15959
+#: doc/guix.texi:16116
 #, no-wrap
 msgid "sound support"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15960
+#: doc/guix.texi:16117
 #, no-wrap
 msgid "ALSA"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15961
+#: doc/guix.texi:16118
 #, no-wrap
 msgid "PulseAudio, sound support"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15966
+#: doc/guix.texi:16123
 msgid "The @code{(gnu services sound)} module provides a service to configure the Advanced Linux Sound Architecture (ALSA) system, which makes PulseAudio the preferred ALSA output driver."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15967
+#: doc/guix.texi:16124
 #, no-wrap
 msgid "{Scheme Variable} alsa-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15972
+#: doc/guix.texi:16129
 msgid "This is the type for the @uref{https://alsa-project.org/, Advanced Linux Sound Architecture} (ALSA) system, which generates the @file{/etc/asound.conf} configuration file.  The value for this type is a @command{alsa-configuration} record as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:15975
+#: doc/guix.texi:16132
 #, no-wrap
 msgid "(service alsa-service-type)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15978
+#: doc/guix.texi:16135
 msgid "See below for details about @code{alsa-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15980
+#: doc/guix.texi:16137
 #, no-wrap
 msgid "{Data Type} alsa-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15982
+#: doc/guix.texi:16139
 msgid "Data type representing the configuration for @code{alsa-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15984
+#: doc/guix.texi:16141
 #, no-wrap
 msgid "@code{alsa-plugins} (default: @var{alsa-plugins})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15986
+#: doc/guix.texi:16143
 msgid "@code{alsa-plugins} package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15987
+#: doc/guix.texi:16144
 #, no-wrap
 msgid "@code{pulseaudio?} (default: @var{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15990
-msgid "Whether ALSA applications should transparently be made to use the @uref{http://www.pulseaudio.org/, PulseAudio} sound server."
+#: doc/guix.texi:16147
+msgid "Whether ALSA applications should transparently be made to use the @uref{https://www.pulseaudio.org/, PulseAudio} sound server."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15994
+#: doc/guix.texi:16151
 msgid "Using PulseAudio allows you to run several sound-producing applications at the same time and to individual control them @i{via} @command{pavucontrol}, among other things."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15995
+#: doc/guix.texi:16152
 #, no-wrap
 msgid "@code{extra-options} (default: @var{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15997
+#: doc/guix.texi:16154
 msgid "String to append to the @file{/etc/asound.conf} file."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16003
+#: doc/guix.texi:16160
 msgid "Individual users who want to override the system configuration of ALSA can do it with the @file{~/.asoundrc} file:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:16009
+#: doc/guix.texi:16166
 #, no-wrap
 msgid ""
 "# In guix, we have to specify the absolute path for plugins.\n"
@@ -29240,7 +29715,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:16018
+#: doc/guix.texi:16175
 #, no-wrap
 msgid ""
 "# Routing ALSA to jack:\n"
@@ -29255,7 +29730,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:16024
+#: doc/guix.texi:16181
 #, no-wrap
 msgid ""
 "  capture_ports @{\n"
@@ -29267,7 +29742,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:16031
+#: doc/guix.texi:16188
 #, no-wrap
 msgid ""
 "pcm.!default @{\n"
@@ -29279,101 +29754,101 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16035
+#: doc/guix.texi:16192
 msgid "See @uref{https://www.alsa-project.org/main/index.php/Asoundrc} for the details."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16036
+#: doc/guix.texi:16193
 #, no-wrap
 msgid "{Scheme Variable} pulseaudio-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16040
-msgid "This is the type for the @uref{http://www.pulseaudio.org/, PulseAudio} sound server.  It exists to allow system overrides of the default settings via @code{pulseaudio-configuration}, see below."
+#: doc/guix.texi:16197
+msgid "This is the type for the @uref{https://www.pulseaudio.org/, PulseAudio} sound server.  It exists to allow system overrides of the default settings via @code{pulseaudio-configuration}, see below."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:16047
+#: doc/guix.texi:16204
 msgid "This service on its own does not ensure, that the @code{pulseaudio} package exists on your machine.  It merely adds configuration files for it, as detailed below.  In the (admittedly unlikely) case, that you find yourself without a @code{pulseaudio} package, consider enabling it through the @code{alsa-service-type} above."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16050
+#: doc/guix.texi:16207
 #, fuzzy, no-wrap
 #| msgid "{Data Type} build-machine"
 msgid "{Data Type} pulseaudio-configuration"
 msgstr "{Тип данных} build-machine"
 
 #. type: deftp
-#: doc/guix.texi:16052
+#: doc/guix.texi:16209
 msgid "Data type representing the configuration for @code{pulseaudio-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16054
+#: doc/guix.texi:16211
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@var{client-conf} (default: @code{'()})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:16059
+#: doc/guix.texi:16216
 msgid "List of settings to set in @file{client.conf}.  Accepts a list of strings or a symbol-value pairs.  A string will be inserted as-is with a newline added.  A pair will be formatted as ``key = value'', again with a newline added."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16060
+#: doc/guix.texi:16217
 #, no-wrap
 msgid "@var{daemon-conf} (default: @code{'((flat-volumes . no))})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16063
+#: doc/guix.texi:16220
 msgid "List of settings to set in @file{daemon.conf}, formatted just like @var{client-conf}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16064
+#: doc/guix.texi:16221
 #, no-wrap
 msgid "@var{script-file} (default: @code{(file-append pulseaudio \"/etc/pulse/default.pa\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16066
+#: doc/guix.texi:16223
 msgid "Script file to use as as @file{default.pa}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16067
+#: doc/guix.texi:16224
 #, no-wrap
 msgid "@var{system-script-file} (default: @code{(file-append pulseaudio \"/etc/pulse/system.pa\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16069
+#: doc/guix.texi:16226
 msgid "Script file to use as as @file{system.pa}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16072
+#: doc/guix.texi:16229
 #, no-wrap
 msgid "{Scheme Variable} ladspa-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16075
+#: doc/guix.texi:16232
 msgid "This service sets the @var{LADSPA_PATH} variable, so that programs, which respect it, e.g. PulseAudio, can load LADSPA plugins."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16078
+#: doc/guix.texi:16235
 msgid "The following example will setup the service to enable modules from the @code{swh-plugins} package:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16082
+#: doc/guix.texi:16239
 #, no-wrap
 msgid ""
 "(service ladspa-service-type\n"
@@ -29381,56 +29856,56 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16086
+#: doc/guix.texi:16243
 msgid "See @uref{http://plugin.org.uk/ladspa-swh/docs/ladspa-swh.html} for the details."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16093
+#: doc/guix.texi:16250
 #, no-wrap
 msgid "SQL"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16095
+#: doc/guix.texi:16252
 msgid "The @code{(gnu services databases)} module provides the following services."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16096
+#: doc/guix.texi:16253
 #, no-wrap
 msgid "{Scheme Procedure} postgresql-service [#:postgresql postgresql] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16101
+#: doc/guix.texi:16258
 msgid "[#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ [#:port 5432] [#:locale ``en_US.utf8''] [#:extension-packages '()] Return a service that runs @var{postgresql}, the PostgreSQL database server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16105
+#: doc/guix.texi:16262
 msgid "The PostgreSQL daemon loads its runtime configuration from @var{config-file}, creates a database cluster with @var{locale} as the default locale, stored in @var{data-directory}.  It then listens on @var{port}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16106
+#: doc/guix.texi:16263
 #, no-wrap
 msgid "postgresql extension-packages"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16111
+#: doc/guix.texi:16268
 msgid "Additional extensions are loaded from packages listed in @var{extension-packages}.  Extensions are available at runtime.  For instance, to create a geographic database using the @code{postgis} extension, a user can configure the postgresql-service as in this example:"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16112
+#: doc/guix.texi:16269
 #, no-wrap
 msgid "postgis"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16115
+#: doc/guix.texi:16272
 #, no-wrap
 msgid ""
 "(use-package-modules databases geo)\n"
@@ -29438,7 +29913,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16125
+#: doc/guix.texi:16282
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -29453,12 +29928,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16129
+#: doc/guix.texi:16286
 msgid "Then the extension becomes visible and you can initialise an empty geographic database in this way:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:16136
+#: doc/guix.texi:16293
 #, no-wrap
 msgid ""
 "psql -U postgres\n"
@@ -29469,320 +29944,320 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16141
+#: doc/guix.texi:16298
 msgid "There is no need to add this field for contrib extensions such as hstore or dblink as they are already loadable by postgresql.  This field is only required to add extensions provided by other packages."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16143
+#: doc/guix.texi:16300
 #, no-wrap
 msgid "{Scheme Procedure} mysql-service [#:config (mysql-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16146
+#: doc/guix.texi:16303
 msgid "Return a service that runs @command{mysqld}, the MySQL or MariaDB database server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16149
+#: doc/guix.texi:16306
 msgid "The optional @var{config} argument specifies the configuration for @command{mysqld}, which should be a @code{} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16151
+#: doc/guix.texi:16308
 #, no-wrap
 msgid "{Data Type} mysql-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16153
+#: doc/guix.texi:16310
 msgid "Data type representing the configuration of @var{mysql-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16155
+#: doc/guix.texi:16312
 #, no-wrap
 msgid "@code{mysql} (default: @var{mariadb})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16158
+#: doc/guix.texi:16315
 msgid "Package object of the MySQL database server, can be either @var{mariadb} or @var{mysql}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16161
+#: doc/guix.texi:16318
 msgid "For MySQL, a temporary root password will be displayed at activation time.  For MariaDB, the root password is empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16162
+#: doc/guix.texi:16319
 #, no-wrap
 msgid "@code{port} (default: @code{3306})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16164
+#: doc/guix.texi:16321
 msgid "TCP port on which the database server listens for incoming connections."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16167
+#: doc/guix.texi:16324
 #, no-wrap
 msgid "{Scheme Variable} memcached-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16171
+#: doc/guix.texi:16328
 msgid "This is the service type for the @uref{https://memcached.org/, Memcached} service, which provides a distributed in memory cache.  The value for the service type is a @code{memcached-configuration} object."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16175
+#: doc/guix.texi:16332
 #, no-wrap
 msgid "(service memcached-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16177
+#: doc/guix.texi:16334
 #, no-wrap
 msgid "{Data Type} memcached-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16179
+#: doc/guix.texi:16336
 msgid "Data type representing the configuration of memcached."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16181
+#: doc/guix.texi:16338
 #, no-wrap
 msgid "@code{memcached} (default: @code{memcached})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16183
+#: doc/guix.texi:16340
 msgid "The Memcached package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16184
+#: doc/guix.texi:16341
 #, no-wrap
 msgid "@code{interfaces} (default: @code{'(\"0.0.0.0\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16186
+#: doc/guix.texi:16343
 msgid "Network interfaces on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16187
+#: doc/guix.texi:16344
 #, no-wrap
 msgid "@code{tcp-port} (default: @code{11211})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16189
+#: doc/guix.texi:16346
 msgid "Port on which to accept connections on,"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16190
+#: doc/guix.texi:16347
 #, no-wrap
 msgid "@code{udp-port} (default: @code{11211})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16193
+#: doc/guix.texi:16350
 msgid "Port on which to accept UDP connections on, a value of 0 will disable listening on a UDP socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16194
+#: doc/guix.texi:16351
 #, no-wrap
 msgid "@code{additional-options} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16196
+#: doc/guix.texi:16353
 msgid "Additional command line options to pass to @code{memcached}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16199
+#: doc/guix.texi:16356
 #, no-wrap
 msgid "{Scheme Variable} mongodb-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16202
+#: doc/guix.texi:16359
 msgid "This is the service type for @uref{https://www.mongodb.com/, MongoDB}.  The value for the service type is a @code{mongodb-configuration} object."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16206
+#: doc/guix.texi:16363
 #, no-wrap
 msgid "(service mongodb-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16208
+#: doc/guix.texi:16365
 #, no-wrap
 msgid "{Data Type} mongodb-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16210
+#: doc/guix.texi:16367
 msgid "Data type representing the configuration of mongodb."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16212
+#: doc/guix.texi:16369
 #, no-wrap
 msgid "@code{mongodb} (default: @code{mongodb})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16214
+#: doc/guix.texi:16371
 msgid "The MongoDB package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16215
+#: doc/guix.texi:16372
 #, no-wrap
 msgid "@code{config-file} (default: @code{%default-mongodb-configuration-file})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16217
+#: doc/guix.texi:16374
 msgid "The configuration file for MongoDB."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16218
+#: doc/guix.texi:16375
 #, no-wrap
 msgid "@code{data-directory} (default: @code{\"/var/lib/mongodb\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16222
+#: doc/guix.texi:16379
 msgid "This value is used to create the directory, so that it exists and is owned by the mongodb user.  It should match the data-directory which MongoDB is configured to use through the configuration file."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16225
+#: doc/guix.texi:16382
 #, no-wrap
 msgid "{Scheme Variable} redis-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16228
+#: doc/guix.texi:16385
 msgid "This is the service type for the @uref{https://redis.io/, Redis} key/value store, whose value is a @code{redis-configuration} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16230
+#: doc/guix.texi:16387
 #, no-wrap
 msgid "{Data Type} redis-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16232
+#: doc/guix.texi:16389
 msgid "Data type representing the configuration of redis."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16234
+#: doc/guix.texi:16391
 #, no-wrap
 msgid "@code{redis} (default: @code{redis})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16236
+#: doc/guix.texi:16393
 msgid "The Redis package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16237
+#: doc/guix.texi:16394
 #, no-wrap
 msgid "@code{bind} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16239
+#: doc/guix.texi:16396
 msgid "Network interface on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16240
+#: doc/guix.texi:16397
 #, no-wrap
 msgid "@code{port} (default: @code{6379})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16243
+#: doc/guix.texi:16400
 msgid "Port on which to accept connections on, a value of 0 will disable listening on a TCP socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16244
+#: doc/guix.texi:16401
 #, no-wrap
 msgid "@code{working-directory} (default: @code{\"/var/lib/redis\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16246
+#: doc/guix.texi:16403
 msgid "Directory in which to store the database and related files."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16252
+#: doc/guix.texi:16409
 #, no-wrap
 msgid "mail"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:16253 doc/guix.texi:20941
+#: doc/guix.texi:16410 doc/guix.texi:21133
 #, no-wrap
 msgid "email"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16258
+#: doc/guix.texi:16415
 msgid "The @code{(gnu services mail)} module provides Guix service definitions for email services: IMAP, POP3, and LMTP servers, as well as mail transport agents (MTAs).  Lots of acronyms! These services are detailed in the subsections below."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:16259
+#: doc/guix.texi:16416
 #, no-wrap
 msgid "Dovecot Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16261
+#: doc/guix.texi:16418
 #, no-wrap
 msgid "{Scheme Procedure} dovecot-service [#:config (dovecot-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16263
+#: doc/guix.texi:16420
 msgid "Return a service that runs the Dovecot IMAP/POP3/LMTP mail server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16273
+#: doc/guix.texi:16430
 msgid "By default, Dovecot does not need much configuration; the default configuration object created by @code{(dovecot-configuration)} will suffice if your mail is delivered to @code{~/Maildir}.  A self-signed certificate will be generated for TLS-protected connections, though Dovecot will also listen on cleartext ports by default.  There are a number of options, though, which mail administrators might need to change, and as is the case with other services, Guix allows the system administrator to specify these parameters via a uniform Scheme interface."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16276
+#: doc/guix.texi:16433
 msgid "For example, to specify that mail is located at @code{maildir~/.mail}, one would instantiate the Dovecot service like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16281
+#: doc/guix.texi:16438
 #, no-wrap
 msgid ""
 "(dovecot-service #:config\n"
@@ -29791,2379 +30266,2379 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16289
+#: doc/guix.texi:16446
 msgid "The available configuration parameters follow.  Each parameter definition is preceded by its type; for example, @samp{string-list foo} indicates that the @code{foo} parameter should be specified as a list of strings.  There is also a way to specify the configuration as a string, if you have an old @code{dovecot.conf} file that you want to port over from some other system; see the end for more details."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16299
+#: doc/guix.texi:16456
 msgid "Available @code{dovecot-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16300
+#: doc/guix.texi:16457
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} package dovecot"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16302 doc/guix.texi:17608
+#: doc/guix.texi:16459 doc/guix.texi:17765
 msgid "The dovecot package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16304
+#: doc/guix.texi:16461
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} comma-separated-string-list listen"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16310
+#: doc/guix.texi:16467
 msgid "A list of IPs or hosts where to listen for connections.  @samp{*} listens on all IPv4 interfaces, @samp{::} listens on all IPv6 interfaces.  If you want to specify non-default ports or anything more complex, customize the address and port fields of the @samp{inet-listener} of the specific services you are interested in."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16312
+#: doc/guix.texi:16469
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} protocol-configuration-list protocols"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16315
+#: doc/guix.texi:16472
 msgid "List of protocols we want to serve.  Available protocols include @samp{imap}, @samp{pop3}, and @samp{lmtp}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16317
+#: doc/guix.texi:16474
 msgid "Available @code{protocol-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16318
+#: doc/guix.texi:16475
 #, no-wrap
 msgid "{@code{protocol-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16320
+#: doc/guix.texi:16477
 msgid "The name of the protocol."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16322
+#: doc/guix.texi:16479
 #, no-wrap
 msgid "{@code{protocol-configuration} parameter} string auth-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16326
+#: doc/guix.texi:16483
 msgid "UNIX socket path to the master authentication server to find users.  This is used by imap (for shared users) and lda.  It defaults to @samp{\"/var/run/dovecot/auth-userdb\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16328
+#: doc/guix.texi:16485
 #, no-wrap
 msgid "{@code{protocol-configuration} parameter} space-separated-string-list mail-plugins"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16330
+#: doc/guix.texi:16487
 msgid "Space separated list of plugins to load."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16332
+#: doc/guix.texi:16489
 #, no-wrap
 msgid "{@code{protocol-configuration} parameter} non-negative-integer mail-max-userip-connections"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16336
+#: doc/guix.texi:16493
 msgid "Maximum number of IMAP connections allowed for a user from each IP address.  NOTE: The username is compared case-sensitively.  Defaults to @samp{10}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16340
+#: doc/guix.texi:16497
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} service-configuration-list services"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16344
+#: doc/guix.texi:16501
 msgid "List of services to enable.  Available services include @samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and @samp{lmtp}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16346
+#: doc/guix.texi:16503
 msgid "Available @code{service-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16347
+#: doc/guix.texi:16504
 #, no-wrap
 msgid "{@code{service-configuration} parameter} string kind"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16352
+#: doc/guix.texi:16509
 msgid "The service kind.  Valid values include @code{director}, @code{imap-login}, @code{pop3-login}, @code{lmtp}, @code{imap}, @code{pop3}, @code{auth}, @code{auth-worker}, @code{dict}, @code{tcpwrap}, @code{quota-warning}, or anything else."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16354
+#: doc/guix.texi:16511
 #, no-wrap
 msgid "{@code{service-configuration} parameter} listener-configuration-list listeners"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16359
+#: doc/guix.texi:16516
 msgid "Listeners for the service.  A listener is either a @code{unix-listener-configuration}, a @code{fifo-listener-configuration}, or an @code{inet-listener-configuration}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16361
+#: doc/guix.texi:16518
 msgid "Available @code{unix-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16362
+#: doc/guix.texi:16519
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16365 doc/guix.texi:16388
+#: doc/guix.texi:16522 doc/guix.texi:16545
 msgid "Path to the file, relative to @code{base-dir} field.  This is also used as the section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16367
+#: doc/guix.texi:16524
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16370 doc/guix.texi:16393
+#: doc/guix.texi:16527 doc/guix.texi:16550
 msgid "The access mode for the socket.  Defaults to @samp{\"0600\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16372
+#: doc/guix.texi:16529
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16375 doc/guix.texi:16398
+#: doc/guix.texi:16532 doc/guix.texi:16555
 msgid "The user to own the socket.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16377
+#: doc/guix.texi:16534
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16380 doc/guix.texi:16403
+#: doc/guix.texi:16537 doc/guix.texi:16560
 msgid "The group to own the socket.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16384
+#: doc/guix.texi:16541
 msgid "Available @code{fifo-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16385
+#: doc/guix.texi:16542
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16390
+#: doc/guix.texi:16547
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16395
+#: doc/guix.texi:16552
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16400
+#: doc/guix.texi:16557
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16407
+#: doc/guix.texi:16564
 msgid "Available @code{inet-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16408
+#: doc/guix.texi:16565
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} string protocol"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16410
+#: doc/guix.texi:16567
 msgid "The protocol to listen for."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16412
+#: doc/guix.texi:16569
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} string address"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16415
+#: doc/guix.texi:16572
 msgid "The address on which to listen, or empty for all addresses.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16417
+#: doc/guix.texi:16574
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} non-negative-integer port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16419
+#: doc/guix.texi:16576
 msgid "The port on which to listen."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16421
+#: doc/guix.texi:16578
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} boolean ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16425
+#: doc/guix.texi:16582
 msgid "Whether to use SSL for this service; @samp{yes}, @samp{no}, or @samp{required}.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16429
+#: doc/guix.texi:16586
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer client-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16434
+#: doc/guix.texi:16591
 msgid "Maximum number of simultaneous client connections per process.  Once this number of connections is received, the next incoming connection will prompt Dovecot to spawn another process.  If set to 0, @code{default-client-limit} is used instead."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16439
+#: doc/guix.texi:16596
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer service-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16444
+#: doc/guix.texi:16601
 msgid "Number of connections to handle before starting a new process.  Typically the only useful values are 0 (unlimited) or 1.  1 is more secure, but 0 is faster.  .  Defaults to @samp{1}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16447
+#: doc/guix.texi:16604
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer process-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16450
+#: doc/guix.texi:16607
 msgid "Maximum number of processes that can exist for this service.  If set to 0, @code{default-process-limit} is used instead."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16455
+#: doc/guix.texi:16612
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer process-min-avail"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16458
+#: doc/guix.texi:16615
 msgid "Number of processes to always keep waiting for more connections.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16460
+#: doc/guix.texi:16617
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer vsz-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16464
+#: doc/guix.texi:16621
 msgid "If you set @samp{service-count 0}, you probably need to grow this.  Defaults to @samp{256000000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16468
+#: doc/guix.texi:16625
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} dict-configuration dict"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16471
+#: doc/guix.texi:16628
 msgid "Dict configuration, as created by the @code{dict-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16473
+#: doc/guix.texi:16630
 msgid "Available @code{dict-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16474
+#: doc/guix.texi:16631
 #, no-wrap
 msgid "{@code{dict-configuration} parameter} free-form-fields entries"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16477
+#: doc/guix.texi:16634
 msgid "A list of key-value pairs that this dict should hold.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16481
+#: doc/guix.texi:16638
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} passdb-configuration-list passdbs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16484
+#: doc/guix.texi:16641
 msgid "A list of passdb configurations, each one created by the @code{passdb-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16486
+#: doc/guix.texi:16643
 msgid "Available @code{passdb-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16487
+#: doc/guix.texi:16644
 #, no-wrap
 msgid "{@code{passdb-configuration} parameter} string driver"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16492
+#: doc/guix.texi:16649
 msgid "The driver that the passdb should use.  Valid values include @samp{pam}, @samp{passwd}, @samp{shadow}, @samp{bsdauth}, and @samp{static}.  Defaults to @samp{\"pam\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16494
+#: doc/guix.texi:16651
 #, no-wrap
 msgid "{@code{passdb-configuration} parameter} space-separated-string-list args"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16497
+#: doc/guix.texi:16654
 msgid "Space separated list of arguments to the passdb driver.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16501
+#: doc/guix.texi:16658
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} userdb-configuration-list userdbs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16504
+#: doc/guix.texi:16661
 msgid "List of userdb configurations, each one created by the @code{userdb-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16506
+#: doc/guix.texi:16663
 msgid "Available @code{userdb-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16507
+#: doc/guix.texi:16664
 #, no-wrap
 msgid "{@code{userdb-configuration} parameter} string driver"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16511
+#: doc/guix.texi:16668
 msgid "The driver that the userdb should use.  Valid values include @samp{passwd} and @samp{static}.  Defaults to @samp{\"passwd\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16513
+#: doc/guix.texi:16670
 #, no-wrap
 msgid "{@code{userdb-configuration} parameter} space-separated-string-list args"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16516
+#: doc/guix.texi:16673
 msgid "Space separated list of arguments to the userdb driver.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16518
+#: doc/guix.texi:16675
 #, no-wrap
 msgid "{@code{userdb-configuration} parameter} free-form-args override-fields"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16521
+#: doc/guix.texi:16678
 msgid "Override fields from passwd.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16525
+#: doc/guix.texi:16682
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} plugin-configuration plugin-configuration"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16528
+#: doc/guix.texi:16685
 msgid "Plug-in configuration, created by the @code{plugin-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16530
+#: doc/guix.texi:16687
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} list-of-namespace-configuration namespaces"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16533
+#: doc/guix.texi:16690
 msgid "List of namespaces.  Each item in the list is created by the @code{namespace-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16535
+#: doc/guix.texi:16692
 msgid "Available @code{namespace-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16536
+#: doc/guix.texi:16693
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16538
+#: doc/guix.texi:16695
 msgid "Name for this namespace."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16540
+#: doc/guix.texi:16697
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string type"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16543
+#: doc/guix.texi:16700
 msgid "Namespace type: @samp{private}, @samp{shared} or @samp{public}.  Defaults to @samp{\"private\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16545
+#: doc/guix.texi:16702
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string separator"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16551
+#: doc/guix.texi:16708
 msgid "Hierarchy separator to use. You should use the same separator for all namespaces or some clients get confused.  @samp{/} is usually a good one.  The default however depends on the underlying mail storage format.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16553
+#: doc/guix.texi:16710
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16557
+#: doc/guix.texi:16714
 msgid "Prefix required to access this namespace.  This needs to be different for all namespaces. For example @samp{Public/}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16559
+#: doc/guix.texi:16716
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16563
+#: doc/guix.texi:16720
 msgid "Physical location of the mailbox. This is in the same format as mail_location, which is also the default for it.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16565
+#: doc/guix.texi:16722
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean inbox?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16569
+#: doc/guix.texi:16726
 msgid "There can be only one INBOX, and this setting defines which namespace has it.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16571
+#: doc/guix.texi:16728
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean hidden?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16579
+#: doc/guix.texi:16736
 msgid "If namespace is hidden, it's not advertised to clients via NAMESPACE extension. You'll most likely also want to set @samp{list? #f}.  This is mostly useful when converting from another server with different namespaces which you want to deprecate but still keep working.  For example you can create hidden namespaces with prefixes @samp{~/mail/}, @samp{~%u/mail/} and @samp{mail/}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16581
+#: doc/guix.texi:16738
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean list?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16587
+#: doc/guix.texi:16744
 msgid "Show the mailboxes under this namespace with the LIST command. This makes the namespace visible for clients that do not support the NAMESPACE extension.  The special @code{children} value lists child mailboxes, but hides the namespace prefix.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16589
+#: doc/guix.texi:16746
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean subscriptions?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16594
+#: doc/guix.texi:16751
 msgid "Namespace handles its own subscriptions.  If set to @code{#f}, the parent namespace handles them.  The empty prefix should always have this as @code{#t}).  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16596
+#: doc/guix.texi:16753
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} mailbox-configuration-list mailboxes"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16599
+#: doc/guix.texi:16756
 msgid "List of predefined mailboxes in this namespace.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16601
+#: doc/guix.texi:16758
 msgid "Available @code{mailbox-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16602
+#: doc/guix.texi:16759
 #, no-wrap
 msgid "{@code{mailbox-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16604
+#: doc/guix.texi:16761
 msgid "Name for this mailbox."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16606
+#: doc/guix.texi:16763
 #, no-wrap
 msgid "{@code{mailbox-configuration} parameter} string auto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16610
+#: doc/guix.texi:16767
 msgid "@samp{create} will automatically create this mailbox.  @samp{subscribe} will both create and subscribe to the mailbox.  Defaults to @samp{\"no\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16612
+#: doc/guix.texi:16769
 #, no-wrap
 msgid "{@code{mailbox-configuration} parameter} space-separated-string-list special-use"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16617
+#: doc/guix.texi:16774
 msgid "List of IMAP @code{SPECIAL-USE} attributes as specified by RFC 6154.  Valid values are @code{\\All}, @code{\\Archive}, @code{\\Drafts}, @code{\\Flagged}, @code{\\Junk}, @code{\\Sent}, and @code{\\Trash}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16623
+#: doc/guix.texi:16780
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name base-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16626
+#: doc/guix.texi:16783
 msgid "Base directory where to store runtime data.  Defaults to @samp{\"/var/run/dovecot/\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16628
+#: doc/guix.texi:16785
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string login-greeting"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16631
+#: doc/guix.texi:16788
 msgid "Greeting message for clients.  Defaults to @samp{\"Dovecot ready.\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16633
+#: doc/guix.texi:16790
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-trusted-networks"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16640
+#: doc/guix.texi:16797
 msgid "List of trusted network ranges.  Connections from these IPs are allowed to override their IP addresses and ports (for logging and for authentication checks).  @samp{disable-plaintext-auth} is also ignored for these networks.  Typically you would specify your IMAP proxy servers here.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16642
+#: doc/guix.texi:16799
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-access-sockets"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16645
+#: doc/guix.texi:16802
 msgid "List of login access check sockets (e.g.@: tcpwrap).  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16647
+#: doc/guix.texi:16804
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean verbose-proctitle?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16653
+#: doc/guix.texi:16810
 msgid "Show more verbose process titles (in ps).  Currently shows user name and IP address.  Useful for seeing who is actually using the IMAP processes (e.g.@: shared mailboxes or if the same uid is used for multiple accounts).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16655
+#: doc/guix.texi:16812
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean shutdown-clients?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16661
+#: doc/guix.texi:16818
 msgid "Should all processes be killed when Dovecot master process shuts down.  Setting this to @code{#f} means that Dovecot can be upgraded without forcing existing client connections to close (although that could also be a problem if the upgrade is e.g.@: due to a security fix).  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16663
+#: doc/guix.texi:16820
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer doveadm-worker-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16667
+#: doc/guix.texi:16824
 msgid "If non-zero, run mail commands via this many connections to doveadm server, instead of running them directly in the same process.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16669
+#: doc/guix.texi:16826
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string doveadm-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16672
+#: doc/guix.texi:16829
 msgid "UNIX socket or host:port used for connecting to doveadm server.  Defaults to @samp{\"doveadm-server\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16674
+#: doc/guix.texi:16831
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list import-environment"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16678
+#: doc/guix.texi:16835
 msgid "List of environment variables that are preserved on Dovecot startup and passed down to all of its child processes.  You can also give key=value pairs to always set specific settings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16680
+#: doc/guix.texi:16837
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean disable-plaintext-auth?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16687
+#: doc/guix.texi:16844
 msgid "Disable LOGIN command and all other plaintext authentications unless SSL/TLS is used (LOGINDISABLED capability).  Note that if the remote IP matches the local IP (i.e.@: you're connecting from the same computer), the connection is considered secure and plaintext authentication is allowed.  See also ssl=required setting.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16689
+#: doc/guix.texi:16846
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-cache-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16694
+#: doc/guix.texi:16851
 msgid "Authentication cache size (e.g.@: @samp{#e10e6}).  0 means it's disabled.  Note that bsdauth, PAM and vpopmail require @samp{cache-key} to be set for caching to be used.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16696
+#: doc/guix.texi:16853
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-cache-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16704
+#: doc/guix.texi:16861
 msgid "Time to live for cached data.  After TTL expires the cached record is no longer used, *except* if the main database lookup returns internal failure.  We also try to handle password changes automatically: If user's previous authentication was successful, but this one wasn't, the cache isn't used.  For now this works only with plaintext authentication.  Defaults to @samp{\"1 hour\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16706
+#: doc/guix.texi:16863
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-cache-negative-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16710
+#: doc/guix.texi:16867
 msgid "TTL for negative hits (user not found, password mismatch).  0 disables caching them completely.  Defaults to @samp{\"1 hour\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16712
+#: doc/guix.texi:16869
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-realms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16718
+#: doc/guix.texi:16875
 msgid "List of realms for SASL authentication mechanisms that need them.  You can leave it empty if you don't want to support multiple realms.  Many clients simply use the first one listed here, so keep the default realm first.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16720
+#: doc/guix.texi:16877
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-default-realm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16725
+#: doc/guix.texi:16882
 msgid "Default realm/domain to use if none was specified.  This is used for both SASL realms and appending @@domain to username in plaintext logins.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16727
+#: doc/guix.texi:16884
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-username-chars"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16734
+#: doc/guix.texi:16891
 msgid "List of allowed characters in username.  If the user-given username contains a character not listed in here, the login automatically fails.  This is just an extra check to make sure user can't exploit any potential quote escaping vulnerabilities with SQL/LDAP databases.  If you want to allow all characters, set this value to empty.  Defaults to @samp{\"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@@\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16736
+#: doc/guix.texi:16893
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-username-translation"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16742
+#: doc/guix.texi:16899
 msgid "Username character translations before it's looked up from databases.  The value contains series of from -> to characters.  For example @samp{#@@/@@} means that @samp{#} and @samp{/} characters are translated to @samp{@@}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16744
+#: doc/guix.texi:16901
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-username-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16751
+#: doc/guix.texi:16908
 msgid "Username formatting before it's looked up from databases.  You can use the standard variables here, e.g.@: %Lu would lowercase the username, %n would drop away the domain if it was given, or @samp{%n-AT-%d} would change the @samp{@@} into @samp{-AT-}.  This translation is done after @samp{auth-username-translation} changes.  Defaults to @samp{\"%Lu\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16753
+#: doc/guix.texi:16910
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-master-user-separator"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16761
+#: doc/guix.texi:16918
 msgid "If you want to allow master users to log in by specifying the master username within the normal username string (i.e.@: not using SASL mechanism's support for it), you can specify the separator character here.  The format is then .  UW-IMAP uses @samp{*} as the separator, so that could be a good choice.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16763
+#: doc/guix.texi:16920
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-anonymous-username"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16767
+#: doc/guix.texi:16924
 msgid "Username to use for users logging in with ANONYMOUS SASL mechanism.  Defaults to @samp{\"anonymous\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16769
+#: doc/guix.texi:16926
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-worker-max-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16774
+#: doc/guix.texi:16931
 msgid "Maximum number of dovecot-auth worker processes.  They're used to execute blocking passdb and userdb queries (e.g.@: MySQL and PAM).  They're automatically created and destroyed as needed.  Defaults to @samp{30}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16776
+#: doc/guix.texi:16933
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-gssapi-hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16781
+#: doc/guix.texi:16938
 msgid "Host name to use in GSSAPI principal names.  The default is to use the name returned by gethostname().  Use @samp{$ALL} (with quotes) to allow all keytab entries.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16783
+#: doc/guix.texi:16940
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-krb5-keytab"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16789
+#: doc/guix.texi:16946
 msgid "Kerberos keytab to use for the GSSAPI mechanism.  Will use the system default (usually @file{/etc/krb5.keytab}) if not specified.  You may need to change the auth service to run as root to be able to read this file.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16791
+#: doc/guix.texi:16948
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-use-winbind?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16796
+#: doc/guix.texi:16953
 msgid "Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and @samp{ntlm-auth} helper.  .  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16798
+#: doc/guix.texi:16955
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name auth-winbind-helper-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16801
+#: doc/guix.texi:16958
 msgid "Path for Samba's @samp{ntlm-auth} helper binary.  Defaults to @samp{\"/usr/bin/ntlm_auth\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16803
+#: doc/guix.texi:16960
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-failure-delay"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16806
+#: doc/guix.texi:16963
 msgid "Time to delay before replying to failed authentications.  Defaults to @samp{\"2 secs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16808
+#: doc/guix.texi:16965
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-require-client-cert?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16812
+#: doc/guix.texi:16969
 msgid "Require a valid SSL client certificate or the authentication fails.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16814
+#: doc/guix.texi:16971
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-username-from-cert?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16819
+#: doc/guix.texi:16976
 msgid "Take the username from client's SSL certificate, using @code{X509_NAME_get_text_by_NID()} which returns the subject's DN's CommonName.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16821
+#: doc/guix.texi:16978
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-mechanisms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16827
+#: doc/guix.texi:16984
 msgid "List of wanted authentication mechanisms.  Supported mechanisms are: @samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, @samp{ntlm}, @samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, @samp{otp}, @samp{skey}, and @samp{gss-spnego}.  NOTE: See also @samp{disable-plaintext-auth} setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16829
+#: doc/guix.texi:16986
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-servers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16834
+#: doc/guix.texi:16991
 msgid "List of IPs or hostnames to all director servers, including ourself.  Ports can be specified as ip:port.  The default port is the same as what director service's @samp{inet-listener} is using.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16836
+#: doc/guix.texi:16993
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-mail-servers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16840
+#: doc/guix.texi:16997
 msgid "List of IPs or hostnames to all backend mail servers.  Ranges are allowed too, like 10.0.0.10-10.0.0.30.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16842
+#: doc/guix.texi:16999
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string director-user-expire"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16846
+#: doc/guix.texi:17003
 msgid "How long to redirect users to a specific server after it no longer has any connections.  Defaults to @samp{\"15 min\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16848
+#: doc/guix.texi:17005
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string director-username-hash"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16853
+#: doc/guix.texi:17010
 msgid "How the username is translated before being hashed.  Useful values include %Ln if user can log in with or without @@domain, %Ld if mailboxes are shared within domain.  Defaults to @samp{\"%Lu\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16855
+#: doc/guix.texi:17012
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16859
+#: doc/guix.texi:17016
 msgid "Log file to use for error messages.  @samp{syslog} logs to syslog, @samp{/dev/stderr} logs to stderr.  Defaults to @samp{\"syslog\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16861
+#: doc/guix.texi:17018
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string info-log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16865
+#: doc/guix.texi:17022
 msgid "Log file to use for informational messages.  Defaults to @samp{log-path}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16867
+#: doc/guix.texi:17024
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string debug-log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16871
+#: doc/guix.texi:17028
 msgid "Log file to use for debug messages.  Defaults to @samp{info-log-path}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16873
+#: doc/guix.texi:17030
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string syslog-facility"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16878
+#: doc/guix.texi:17035
 msgid "Syslog facility to use if you're logging to syslog.  Usually if you don't want to use @samp{mail}, you'll use local0..local7.  Also other standard facilities are supported.  Defaults to @samp{\"mail\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16880
+#: doc/guix.texi:17037
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16884
+#: doc/guix.texi:17041
 msgid "Log unsuccessful authentication attempts and the reasons why they failed.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16886
+#: doc/guix.texi:17043
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-verbose-passwords"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16893
+#: doc/guix.texi:17050
 msgid "In case of password mismatches, log the attempted password.  Valid values are no, plain and sha1.  sha1 can be useful for detecting brute force password attempts vs.  user simply trying the same password over and over again.  You can also truncate the value to n chars by appending \":n\" (e.g.@: sha1:6).  Defaults to @samp{\"no\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16895
+#: doc/guix.texi:17052
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-debug?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16899
+#: doc/guix.texi:17056
 msgid "Even more verbose logging for debugging purposes.  Shows for example SQL queries.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16901
+#: doc/guix.texi:17058
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-debug-passwords?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16906
+#: doc/guix.texi:17063
 msgid "In case of password mismatches, log the passwords and used scheme so the problem can be debugged.  Enabling this also enables @samp{auth-debug}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16908
+#: doc/guix.texi:17065
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-debug?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16912
+#: doc/guix.texi:17069
 msgid "Enable mail process debugging.  This can help you figure out why Dovecot isn't finding your mails.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16914
+#: doc/guix.texi:17071
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean verbose-ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16917
+#: doc/guix.texi:17074
 msgid "Show protocol level SSL errors.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16919
+#: doc/guix.texi:17076
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string log-timestamp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16923
+#: doc/guix.texi:17080
 msgid "Prefix for each line written to log file.  % codes are in strftime(3) format.  Defaults to @samp{\"\\\"%b %d %H:%M:%S \\\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16925
+#: doc/guix.texi:17082
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-log-format-elements"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16929
+#: doc/guix.texi:17086
 msgid "List of elements we want to log.  The elements which have a non-empty variable value are joined together to form a comma-separated string."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16931
+#: doc/guix.texi:17088
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string login-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16935
+#: doc/guix.texi:17092
 msgid "Login log format.  %s contains @samp{login-log-format-elements} string, %$ contains the data we want to log.  Defaults to @samp{\"%$: %s\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16937
+#: doc/guix.texi:17094
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-log-prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16941
+#: doc/guix.texi:17098
 msgid "Log prefix for mail processes.  See doc/wiki/Variables.txt for list of possible variables you can use.  Defaults to @samp{\"\\\"%s(%u)<%@{pid@}><%@{session@}>: \\\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16943
+#: doc/guix.texi:17100
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string deliver-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16945
+#: doc/guix.texi:17102
 msgid "Format to use for logging mail deliveries.  You can use variables:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16946
+#: doc/guix.texi:17103
 #, no-wrap
 msgid "%$"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16948
+#: doc/guix.texi:17105
 msgid "Delivery status message (e.g.@: @samp{saved to INBOX})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16948
+#: doc/guix.texi:17105
 #, no-wrap
 msgid "%m"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16950
+#: doc/guix.texi:17107
 msgid "Message-ID"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16950 doc/guix.texi:17482
+#: doc/guix.texi:17107 doc/guix.texi:17639
 #, no-wrap
 msgid "%s"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16952
+#: doc/guix.texi:17109
 msgid "Subject"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16952
+#: doc/guix.texi:17109
 #, no-wrap
 msgid "%f"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16954
+#: doc/guix.texi:17111
 msgid "From address"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16956
+#: doc/guix.texi:17113
 msgid "Physical size"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16956
+#: doc/guix.texi:17113
 #, no-wrap
 msgid "%w"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16958
+#: doc/guix.texi:17115
 msgid "Virtual size."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16960
+#: doc/guix.texi:17117
 msgid "Defaults to @samp{\"msgid=%m: %$\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16962
+#: doc/guix.texi:17119
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16967
+#: doc/guix.texi:17124
 msgid "Location for users' mailboxes.  The default is empty, which means that Dovecot tries to find the mailboxes automatically.  This won't work if the user doesn't yet have any mail, so you should explicitly tell Dovecot the full location."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16973
+#: doc/guix.texi:17130
 msgid "If you're using mbox, giving a path to the INBOX file (e.g.@: /var/mail/%u) isn't enough.  You'll also need to tell Dovecot where the other mailboxes are kept.  This is called the \"root mail directory\", and it must be the first path given in the @samp{mail-location} setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16975
+#: doc/guix.texi:17132
 msgid "There are a few special variables you can use, eg.:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16979
+#: doc/guix.texi:17136
 msgid "username"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16979 doc/guix.texi:17478
+#: doc/guix.texi:17136 doc/guix.texi:17635
 #, no-wrap
 msgid "%n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16981
+#: doc/guix.texi:17138
 msgid "user part in user@@domain, same as %u if there's no domain"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16981
+#: doc/guix.texi:17138
 #, no-wrap
 msgid "%d"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16983
+#: doc/guix.texi:17140
 msgid "domain part in user@@domain, empty if there's no domain"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16983
+#: doc/guix.texi:17140
 #, no-wrap
 msgid "%h"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16985
+#: doc/guix.texi:17142
 msgid "home director"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16988
+#: doc/guix.texi:17145
 msgid "See doc/wiki/Variables.txt for full list.  Some examples:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16989
+#: doc/guix.texi:17146
 #, no-wrap
 msgid "maildir:~/Maildir"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16990
+#: doc/guix.texi:17147
 #, no-wrap
 msgid "mbox:~/mail:INBOX=/var/mail/%u"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16991
+#: doc/guix.texi:17148
 #, no-wrap
 msgid "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16996
+#: doc/guix.texi:17153
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17001
+#: doc/guix.texi:17158
 msgid "System user and group used to access mails.  If you use multiple, userdb can override these by returning uid or gid fields.  You can use either numbers or names.  .  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17003
+#: doc/guix.texi:17160
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17008
+#: doc/guix.texi:17165
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-privileged-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17014
+#: doc/guix.texi:17171
 msgid "Group to enable temporarily for privileged operations.  Currently this is used only with INBOX when either its initial creation or dotlocking fails.  Typically this is set to \"mail\" to give access to /var/mail.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17016
+#: doc/guix.texi:17173
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-access-groups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17024
+#: doc/guix.texi:17181
 msgid "Grant access to these supplementary groups for mail processes.  Typically these are used to set up access to shared mailboxes.  Note that it may be dangerous to set these if users can create symlinks (e.g.@: if \"mail\" group is set here, ln -s /var/mail ~/mail/var could allow a user to delete others' mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it).  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17026
+#: doc/guix.texi:17183
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17032
+#: doc/guix.texi:17189
 msgid "Allow full file system access to clients.  There's no access checks other than what the operating system does for the active UID/GID.  It works with both maildir and mboxes, allowing you to prefix mailboxes names with e.g.@: /path/ or ~user/.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17034
+#: doc/guix.texi:17191
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mmap-disable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17038
+#: doc/guix.texi:17195
 msgid "Don't use mmap() at all.  This is required if you store indexes to shared file systems (NFS or clustered file system).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17040
+#: doc/guix.texi:17197
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean dotlock-use-excl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17045
+#: doc/guix.texi:17202
 msgid "Rely on @samp{O_EXCL} to work when creating dotlock files.  NFS supports @samp{O_EXCL} since version 3, so this should be safe to use nowadays by default.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17047
+#: doc/guix.texi:17204
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-fsync"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17049
+#: doc/guix.texi:17206
 msgid "When to use fsync() or fdatasync() calls:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17050
+#: doc/guix.texi:17207
 #, no-wrap
 msgid "optimized"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17052
+#: doc/guix.texi:17209
 msgid "Whenever necessary to avoid losing important data"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17054
+#: doc/guix.texi:17211
 msgid "Useful with e.g.@: NFS when write()s are delayed"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17056
+#: doc/guix.texi:17213
 msgid "Never use it (best performance, but crashes can lose data)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17058
+#: doc/guix.texi:17215
 msgid "Defaults to @samp{\"optimized\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17060
+#: doc/guix.texi:17217
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-storage?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17065
+#: doc/guix.texi:17222
 msgid "Mail storage exists in NFS.  Set this to yes to make Dovecot flush NFS caches whenever needed.  If you're using only a single mail server this isn't needed.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17067
+#: doc/guix.texi:17224
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-index?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17071
+#: doc/guix.texi:17228
 msgid "Mail index files also exist in NFS.  Setting this to yes requires @samp{mmap-disable? #t} and @samp{fsync-disable? #f}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17073
+#: doc/guix.texi:17230
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string lock-method"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17079
+#: doc/guix.texi:17236
 msgid "Locking method for index files.  Alternatives are fcntl, flock and dotlock.  Dotlocking uses some tricks which may create more disk I/O than other locking methods.  NFS users: flock doesn't work, remember to change @samp{mmap-disable}.  Defaults to @samp{\"fcntl\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17081
+#: doc/guix.texi:17238
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name mail-temp-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17085
+#: doc/guix.texi:17242
 msgid "Directory in which LDA/LMTP temporarily stores incoming mails >128 kB.  Defaults to @samp{\"/tmp\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17087
+#: doc/guix.texi:17244
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17093
+#: doc/guix.texi:17250
 msgid "Valid UID range for users.  This is mostly to make sure that users can't log in as daemons or other system users.  Note that denying root logins is hardcoded to dovecot binary and can't be done even if @samp{first-valid-uid} is set to 0.  Defaults to @samp{500}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17095
+#: doc/guix.texi:17252
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17100
+#: doc/guix.texi:17257
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17105
+#: doc/guix.texi:17262
 msgid "Valid GID range for users.  Users having non-valid GID as primary group ID aren't allowed to log in.  If user belongs to supplementary groups with non-valid GIDs, those groups are not set.  Defaults to @samp{1}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17107
+#: doc/guix.texi:17264
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17112
+#: doc/guix.texi:17269
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-max-keyword-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17116
+#: doc/guix.texi:17273
 msgid "Maximum allowed length for mail keyword name.  It's only forced when trying to create new keywords.  Defaults to @samp{50}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17118
+#: doc/guix.texi:17275
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} colon-separated-file-name-list valid-chroot-dirs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17128
+#: doc/guix.texi:17285
 msgid "List of directories under which chrooting is allowed for mail processes (i.e.@: /var/mail will allow chrooting to /var/mail/foo/bar too).  This setting doesn't affect @samp{login-chroot} @samp{mail-chroot} or auth chroot settings.  If this setting is empty, \"/./\" in home dirs are ignored.  WARNING: Never add directories here which local users can modify, that may lead to root exploit.  Usually this should be done only if you don't allow shell access for users.  .  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17130
+#: doc/guix.texi:17287
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-chroot"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17139
+#: doc/guix.texi:17296
 msgid "Default chroot directory for mail processes.  This can be overridden for specific users in user database by giving /./ in user's home directory (e.g.@: /home/./user chroots into /home).  Note that usually there is no real need to do chrooting, Dovecot doesn't allow users to access files outside their mail directory anyway.  If your home directories are prefixed with the chroot directory, append \"/.\"@: to @samp{mail-chroot}.  .  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17141
+#: doc/guix.texi:17298
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name auth-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17145
+#: doc/guix.texi:17302
 msgid "UNIX socket path to master authentication server to find users.  This is used by imap (for shared users) and lda.  Defaults to @samp{\"/var/run/dovecot/auth-userdb\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17147
+#: doc/guix.texi:17304
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name mail-plugin-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17150
+#: doc/guix.texi:17307
 msgid "Directory where to look up mail plugins.  Defaults to @samp{\"/usr/lib/dovecot\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17152
+#: doc/guix.texi:17309
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17156
+#: doc/guix.texi:17313
 msgid "List of plugins to load for all services.  Plugins specific to IMAP, LDA, etc.@: are added to this list in their own .conf files.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17158
+#: doc/guix.texi:17315
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-cache-min-mail-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17163
+#: doc/guix.texi:17320
 msgid "The minimum number of mails in a mailbox before updates are done to cache file.  This allows optimizing Dovecot's behavior to do less disk writes at the cost of more disk reads.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17165
+#: doc/guix.texi:17322
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mailbox-idle-check-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17172
+#: doc/guix.texi:17329
 msgid "When IDLE command is running, mailbox is checked once in a while to see if there are any new mails or other changes.  This setting defines the minimum time to wait between those checks.  Dovecot can also use dnotify, inotify and kqueue to find out immediately when changes occur.  Defaults to @samp{\"30 secs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17174
+#: doc/guix.texi:17331
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-save-crlf?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17181
+#: doc/guix.texi:17338
 msgid "Save mails with CR+LF instead of plain LF.  This makes sending those mails take less CPU, especially with sendfile() syscall with Linux and FreeBSD.  But it also creates a bit more disk I/O which may just make it slower.  Also note that if other software reads the mboxes/maildirs, they may handle the extra CRs wrong and cause problems.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17183
+#: doc/guix.texi:17340
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean maildir-stat-dirs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17191
+#: doc/guix.texi:17348
 msgid "By default LIST command returns all entries in maildir beginning with a dot.  Enabling this option makes Dovecot return only entries which are directories.  This is done by stat()ing each entry, so it causes more disk I/O.  (For systems setting struct @samp{dirent->d_type} this check is free and it's done always regardless of this setting).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17193
+#: doc/guix.texi:17350
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean maildir-copy-with-hardlinks?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17198
+#: doc/guix.texi:17355
 msgid "When copying a message, do it with hard links whenever possible.  This makes the performance much better, and it's unlikely to have any side effects.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17200
+#: doc/guix.texi:17357
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean maildir-very-dirty-syncs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17205
+#: doc/guix.texi:17362
 msgid "Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only when its mtime changes unexpectedly or when we can't find the mail otherwise.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17207
+#: doc/guix.texi:17364
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-read-locks"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17210
+#: doc/guix.texi:17367
 msgid "Which locking methods to use for locking mbox.  There are four available:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17212
+#: doc/guix.texi:17369
 #, no-wrap
 msgid "dotlock"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17216
+#: doc/guix.texi:17373
 msgid "Create .lock file.  This is the oldest and most NFS-safe solution.  If you want to use /var/mail/ like directory, the users will need write access to that directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17216
+#: doc/guix.texi:17373
 #, no-wrap
 msgid "dotlock-try"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17219
+#: doc/guix.texi:17376
 msgid "Same as dotlock, but if it fails because of permissions or because there isn't enough disk space, just skip it."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17219
+#: doc/guix.texi:17376
 #, no-wrap
 msgid "fcntl"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17221
+#: doc/guix.texi:17378
 msgid "Use this if possible.  Works with NFS too if lockd is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17221
+#: doc/guix.texi:17378
 #, no-wrap
 msgid "flock"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17223 doc/guix.texi:17225
+#: doc/guix.texi:17380 doc/guix.texi:17382
 msgid "May not exist in all systems.  Doesn't work with NFS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17223
+#: doc/guix.texi:17380
 #, no-wrap
 msgid "lockf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17231
+#: doc/guix.texi:17388
 msgid "You can use multiple locking methods; if you do the order they're declared in is important to avoid deadlocks if other MTAs/MUAs are using multiple locking methods as well.  Some operating systems don't allow using some of them simultaneously."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17233
+#: doc/guix.texi:17390
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-write-locks"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17237
+#: doc/guix.texi:17394
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mbox-lock-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17240
+#: doc/guix.texi:17397
 msgid "Maximum time to wait for lock (all of them) before aborting.  Defaults to @samp{\"5 mins\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17242
+#: doc/guix.texi:17399
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mbox-dotlock-change-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17246
+#: doc/guix.texi:17403
 msgid "If dotlock exists but the mailbox isn't modified in any way, override the lock file after this much time.  Defaults to @samp{\"2 mins\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17248
+#: doc/guix.texi:17405
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-dirty-syncs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17259
+#: doc/guix.texi:17416
 msgid "When mbox changes unexpectedly we have to fully read it to find out what changed.  If the mbox is large this can take a long time.  Since the change is usually just a newly appended mail, it'd be faster to simply read the new mails.  If this setting is enabled, Dovecot does this but still safely fallbacks to re-reading the whole mbox file whenever something in mbox isn't how it's expected to be.  The only real downside to this setting is that if some other MUA changes message flags, Dovecot doesn't notice it immediately.  Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK commands.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17261
+#: doc/guix.texi:17418
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-very-dirty-syncs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17266
+#: doc/guix.texi:17423
 msgid "Like @samp{mbox-dirty-syncs}, but don't do full syncs even with SELECT, EXAMINE, EXPUNGE or CHECK commands.  If this is set, @samp{mbox-dirty-syncs} is ignored.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17268
+#: doc/guix.texi:17425
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-lazy-writes?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17274
+#: doc/guix.texi:17431
 msgid "Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK commands and when closing the mailbox).  This is especially useful for POP3 where clients often delete all mails.  The downside is that our changes aren't immediately visible to other MUAs.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17276
+#: doc/guix.texi:17433
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mbox-min-index-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17281
+#: doc/guix.texi:17438
 msgid "If mbox size is smaller than this (e.g.@: 100k), don't write index files.  If an index file already exists it's still read, just not updated.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17283
+#: doc/guix.texi:17440
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17286
+#: doc/guix.texi:17443
 msgid "Maximum dbox file size until it's rotated.  Defaults to @samp{10000000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17288
+#: doc/guix.texi:17445
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mdbox-rotate-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17293
+#: doc/guix.texi:17450
 msgid "Maximum dbox file age until it's rotated.  Typically in days.  Day begins from midnight, so 1d = today, 2d = yesterday, etc.  0 = check disabled.  Defaults to @samp{\"1d\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17295
+#: doc/guix.texi:17452
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mdbox-preallocate-space?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17300
+#: doc/guix.texi:17457
 msgid "When creating new mdbox files, immediately preallocate their size to @samp{mdbox-rotate-size}.  This setting currently works only in Linux with some file systems (ext4, xfs).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17302
+#: doc/guix.texi:17459
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-attachment-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17306
+#: doc/guix.texi:17463
 msgid "sdbox and mdbox support saving mail attachments to external files, which also allows single instance storage for them.  Other backends don't support this for now."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17308
+#: doc/guix.texi:17465
 msgid "WARNING: This feature hasn't been tested much yet.  Use at your own risk."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17311
+#: doc/guix.texi:17468
 msgid "Directory root where to store mail attachments.  Disabled, if empty.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17313
+#: doc/guix.texi:17470
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-attachment-min-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17318
+#: doc/guix.texi:17475
 msgid "Attachments smaller than this aren't saved externally.  It's also possible to write a plugin to disable saving specific attachments externally.  Defaults to @samp{128000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17320
+#: doc/guix.texi:17477
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-attachment-fs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17322
+#: doc/guix.texi:17479
 msgid "File system backend to use for saving attachments:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17323
+#: doc/guix.texi:17480
 #, no-wrap
 msgid "posix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17325
+#: doc/guix.texi:17482
 msgid "No SiS done by Dovecot (but this might help FS's own deduplication)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17325
+#: doc/guix.texi:17482
 #, no-wrap
 msgid "sis posix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17327
+#: doc/guix.texi:17484
 msgid "SiS with immediate byte-by-byte comparison during saving"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17327
+#: doc/guix.texi:17484
 #, no-wrap
 msgid "sis-queue posix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17329
+#: doc/guix.texi:17486
 msgid "SiS with delayed comparison and deduplication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17331
+#: doc/guix.texi:17488
 msgid "Defaults to @samp{\"sis posix\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17333
+#: doc/guix.texi:17490
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-attachment-hash"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17339
+#: doc/guix.texi:17496
 msgid "Hash format to use in attachment filenames.  You can add any text and variables: @code{%@{md4@}}, @code{%@{md5@}}, @code{%@{sha1@}}, @code{%@{sha256@}}, @code{%@{sha512@}}, @code{%@{size@}}.  Variables can be truncated, e.g.@: @code{%@{sha256:80@}} returns only first 80 bits.  Defaults to @samp{\"%@{sha1@}\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17341
+#: doc/guix.texi:17498
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-process-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17346
+#: doc/guix.texi:17503
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-client-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17349 doc/guix.texi:23295
+#: doc/guix.texi:17506 doc/guix.texi:23516
 msgid "Defaults to @samp{1000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17351
+#: doc/guix.texi:17508
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-vsz-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17356
+#: doc/guix.texi:17513
 msgid "Default VSZ (virtual memory size) limit for service processes.  This is mainly intended to catch and kill processes that leak memory before they eat up everything.  Defaults to @samp{256000000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17358
+#: doc/guix.texi:17515
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string default-login-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17363
+#: doc/guix.texi:17520
 msgid "Login user is internally used by login processes.  This is the most untrusted user in Dovecot system.  It shouldn't have access to anything at all.  Defaults to @samp{\"dovenull\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17365
+#: doc/guix.texi:17522
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string default-internal-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17370
+#: doc/guix.texi:17527
 msgid "Internal user is used by unprivileged processes.  It should be separate from login user, so that login processes can't disturb other processes.  Defaults to @samp{\"dovecot\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17372
+#: doc/guix.texi:17529
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17375
+#: doc/guix.texi:17532
 msgid "SSL/TLS support: yes, no, required.  .  Defaults to @samp{\"required\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17377
+#: doc/guix.texi:17534
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17380
+#: doc/guix.texi:17537
 msgid "PEM encoded X.509 SSL/TLS certificate (public key).  Defaults to @samp{\" was automatically rejected:%n%r\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17490
+#: doc/guix.texi:17647
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string recipient-delimiter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17494
+#: doc/guix.texi:17651
 msgid "Delimiter character between local-part and detail in email address.  Defaults to @samp{\"+\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17496
+#: doc/guix.texi:17653
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string lda-original-recipient-header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17502
+#: doc/guix.texi:17659
 msgid "Header where the original recipient address (SMTP's RCPT TO: address) is taken from if not available elsewhere.  With dovecot-lda -a parameter overrides this.  A commonly used header for this is X-Original-To.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17504
+#: doc/guix.texi:17661
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autocreate?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17508
+#: doc/guix.texi:17665
 msgid "Should saving a mail to a nonexistent mailbox automatically create it?.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17510
+#: doc/guix.texi:17667
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autosubscribe?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17514
+#: doc/guix.texi:17671
 msgid "Should automatically created mailboxes be also automatically subscribed?.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17516
+#: doc/guix.texi:17673
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17522
+#: doc/guix.texi:17679
 msgid "Maximum IMAP command line length.  Some clients generate very long command lines with huge mailboxes, so you may need to raise this if you get \"Too long argument\" or \"IMAP command line too large\" errors often.  Defaults to @samp{64000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17524
+#: doc/guix.texi:17681
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-logout-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17526
+#: doc/guix.texi:17683
 msgid "IMAP logout format string:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17527
+#: doc/guix.texi:17684
 #, no-wrap
 msgid "%i"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17529
+#: doc/guix.texi:17686
 msgid "total number of bytes read from client"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17529
+#: doc/guix.texi:17686
 #, no-wrap
 msgid "%o"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17531
+#: doc/guix.texi:17688
 msgid "total number of bytes sent to client."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17534
+#: doc/guix.texi:17691
 msgid "See @file{doc/wiki/Variables.txt} for a list of all the variables you can use.  Defaults to @samp{\"in=%i out=%o deleted=%@{deleted@} expunged=%@{expunged@} trashed=%@{trashed@} hdr_count=%@{fetch_hdr_count@} hdr_bytes=%@{fetch_hdr_bytes@} body_count=%@{fetch_body_count@} body_bytes=%@{fetch_body_bytes@}\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17536
+#: doc/guix.texi:17693
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-capability"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17540
+#: doc/guix.texi:17697
 msgid "Override the IMAP CAPABILITY response.  If the value begins with '+', add the given capabilities on top of the defaults (e.g.@: +XFOO XBAR).  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17542
+#: doc/guix.texi:17699
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-idle-notify-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17546
+#: doc/guix.texi:17703
 msgid "How long to wait between \"OK Still here\" notifications when client is IDLEing.  Defaults to @samp{\"2 mins\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17548
+#: doc/guix.texi:17705
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-id-send"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17554
+#: doc/guix.texi:17711
 msgid "ID field names and values to send to clients.  Using * as the value makes Dovecot use the default value.  The following fields have default values currently: name, version, os, os-version, support-url, support-email.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17556
+#: doc/guix.texi:17713
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-id-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17559
+#: doc/guix.texi:17716
 msgid "ID fields sent by client to log.  * means everything.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17561
+#: doc/guix.texi:17718
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list imap-client-workarounds"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17563
+#: doc/guix.texi:17720
 msgid "Workarounds for various client bugs:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17565
+#: doc/guix.texi:17722
 #, no-wrap
 msgid "delay-newmail"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17572
+#: doc/guix.texi:17729
 msgid "Send EXISTS/RECENT new mail notifications only when replying to NOOP and CHECK commands.  Some clients ignore them otherwise, for example OSX Mail (' before setting it here, to get a feel for which cipher suites you will get.  After setting this option, it is recommend that you inspect your Murmur log to ensure that Murmur is using the cipher suites that you expected it to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18709
+#: doc/guix.texi:18866
 msgid "Note: Changing this option may impact the backwards compatibility of your Murmur server, and can remove the ability for older Mumble clients to be able to connect to it."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18710
+#: doc/guix.texi:18867
 #, no-wrap
 msgid "@code{public-registration} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18712
+#: doc/guix.texi:18869
 msgid "Must be a @code{} record or @code{#f}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18717
+#: doc/guix.texi:18874
 msgid "You can optionally register your server in the public server list that the @code{mumble} client shows on startup.  You cannot register your server if you have set a @code{server-password}, or set @code{allow-ping} to @code{#f}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18719
+#: doc/guix.texi:18876
 msgid "It might take a few hours until it shows up in the public list."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18720 doc/guix.texi:20151
+#: doc/guix.texi:18877 doc/guix.texi:20308
 #, no-wrap
 msgid "@code{file} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18722
+#: doc/guix.texi:18879
 msgid "Optional alternative override for this configuration."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18725
+#: doc/guix.texi:18882
 #, no-wrap
 msgid "{Data Type} murmur-public-registration-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18727
+#: doc/guix.texi:18884
 msgid "Configuration for public registration of a murmur service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18731
+#: doc/guix.texi:18888
 msgid "This is a display name for your server. Not to be confused with the hostname."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:18732 doc/guix.texi:25806
+#: doc/guix.texi:18889 doc/guix.texi:26069
 #, no-wrap
 msgid "password"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18735
+#: doc/guix.texi:18892
 msgid "A password to identify your registration.  Subsequent updates will need the same password. Don't lose your password."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18736
+#: doc/guix.texi:18893
 #, no-wrap
 msgid "url"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18739
+#: doc/guix.texi:18896
 msgid "This should be a @code{http://} or @code{https://} link to your web site."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18740
+#: doc/guix.texi:18897
 #, no-wrap
 msgid "@code{hostname} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18743
+#: doc/guix.texi:18900
 msgid "By default your server will be listed by its IP address.  If it is set your server will be linked by this host name instead."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18751
+#: doc/guix.texi:18908
 #, no-wrap
 msgid "Tailon Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18755
+#: doc/guix.texi:18912
 msgid "@uref{https://tailon.readthedocs.io/, Tailon} is a web application for viewing and searching log files."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18758
+#: doc/guix.texi:18915
 msgid "The following example will configure the service with default values.  By default, Tailon can be accessed on port 8080 (@code{http://localhost:8080})."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:18761
+#: doc/guix.texi:18918
 #, no-wrap
 msgid "(service tailon-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18765
+#: doc/guix.texi:18922
 msgid "The following example customises more of the Tailon configuration, adding @command{sed} to the list of allowed commands."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:18772
+#: doc/guix.texi:18929
 #, no-wrap
 msgid ""
 "(service tailon-service-type\n"
@@ -34387,34 +34862,34 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18775
+#: doc/guix.texi:18932
 #, no-wrap
 msgid "{Data Type} tailon-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18778
+#: doc/guix.texi:18935
 msgid "Data type representing the configuration of Tailon.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18780
+#: doc/guix.texi:18937
 #, no-wrap
 msgid "@code{config-file} (default: @code{(tailon-configuration-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18784
+#: doc/guix.texi:18941
 msgid "The configuration file to use for Tailon. This can be set to a @dfn{tailon-configuration-file} record value, or any gexp (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18787
+#: doc/guix.texi:18944
 msgid "For example, to instead use a local file, the @code{local-file} function can be used:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:18792
+#: doc/guix.texi:18949
 #, no-wrap
 msgid ""
 "(service tailon-service-type\n"
@@ -34423,144 +34898,144 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18794
+#: doc/guix.texi:18951
 #, no-wrap
 msgid "@code{package} (default: @code{tailon})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18796
+#: doc/guix.texi:18953
 msgid "The tailon package to use."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18800
+#: doc/guix.texi:18957
 #, no-wrap
 msgid "{Data Type} tailon-configuration-file"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18803
+#: doc/guix.texi:18960
 msgid "Data type representing the configuration options for Tailon.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18805
+#: doc/guix.texi:18962
 #, no-wrap
 msgid "@code{files} (default: @code{(list \"/var/log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18810
+#: doc/guix.texi:18967
 msgid "List of files to display. The list can include strings for a single file or directory, or a list, where the first item is the name of a subsection, and the remaining items are the files or directories in that subsection."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18811
+#: doc/guix.texi:18968
 #, no-wrap
 msgid "@code{bind} (default: @code{\"localhost:8080\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18813
+#: doc/guix.texi:18970
 msgid "Address and port to which Tailon should bind on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18814
+#: doc/guix.texi:18971
 #, no-wrap
 msgid "@code{relative-root} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18816
+#: doc/guix.texi:18973
 msgid "URL path to use for Tailon, set to @code{#f} to not use a path."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18817
+#: doc/guix.texi:18974
 #, no-wrap
 msgid "@code{allow-transfers?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18819
+#: doc/guix.texi:18976
 msgid "Allow downloading the log files in the web interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18820
+#: doc/guix.texi:18977
 #, no-wrap
 msgid "@code{follow-names?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18822
+#: doc/guix.texi:18979
 msgid "Allow tailing of not-yet existent files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18823
+#: doc/guix.texi:18980
 #, no-wrap
 msgid "@code{tail-lines} (default: @code{200})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18825
+#: doc/guix.texi:18982
 msgid "Number of lines to read initially from each file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18826
+#: doc/guix.texi:18983
 #, no-wrap
 msgid "@code{allowed-commands} (default: @code{(list \"tail\" \"grep\" \"awk\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18828
+#: doc/guix.texi:18985
 msgid "Commands to allow running. By default, @code{sed} is disabled."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18831
+#: doc/guix.texi:18988
 msgid "Set @code{debug?} to @code{#t} to show debug messages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18832
+#: doc/guix.texi:18989
 #, no-wrap
 msgid "@code{wrap-lines} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18836
+#: doc/guix.texi:18993
 msgid "Initial line wrapping state in the web interface. Set to @code{#t} to initially wrap lines (the default), or to @code{#f} to initially not wrap lines."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18837
+#: doc/guix.texi:18994
 #, no-wrap
 msgid "@code{http-auth} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18841
+#: doc/guix.texi:18998
 msgid "HTTP authentication type to use. Set to @code{#f} to disable authentication (the default). Supported values are @code{\"digest\"} or @code{\"basic\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18842
+#: doc/guix.texi:18999
 #, no-wrap
 msgid "@code{users} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18847
+#: doc/guix.texi:19004
 msgid "If HTTP authentication is enabled (see @code{http-auth}), access will be restricted to the credentials provided here. To configure users, use a list of pairs, where the first element of the pair is the username, and the 2nd element of the pair is the password."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:18853
+#: doc/guix.texi:19010
 #, no-wrap
 msgid ""
 "(tailon-configuration-file\n"
@@ -34570,35 +35045,35 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18859
+#: doc/guix.texi:19016
 #, no-wrap
 msgid "Darkstat Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18860
+#: doc/guix.texi:19017
 #, no-wrap
 msgid "darkstat"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18863
+#: doc/guix.texi:19020
 msgid "Darkstat is a packet sniffer that captures network traffic, calculates statistics about usage, and serves reports over HTTP."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:18864
+#: doc/guix.texi:19021
 #, no-wrap
 msgid "{Scheme Variable} darkstat-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:18869
+#: doc/guix.texi:19026
 msgid "This is the service type for the @uref{https://unix4lyfe.org/darkstat/, darkstat} service, its value must be a @code{darkstat-configuration} record as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:18874
+#: doc/guix.texi:19031
 #, no-wrap
 msgid ""
 "(service darkstat-service-type\n"
@@ -34607,101 +35082,101 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18877
+#: doc/guix.texi:19034
 #, no-wrap
 msgid "{Data Type} darkstat-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18879
+#: doc/guix.texi:19036
 msgid "Data type representing the configuration of @command{darkstat}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18881
+#: doc/guix.texi:19038
 #, no-wrap
 msgid "@code{package} (default: @code{darkstat})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18883
+#: doc/guix.texi:19040
 msgid "The darkstat package to use."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18884
+#: doc/guix.texi:19041
 #, no-wrap
 msgid "interface"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18886
+#: doc/guix.texi:19043
 msgid "Capture traffic on the specified network interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18887
+#: doc/guix.texi:19044
 #, no-wrap
 msgid "@code{port} (default: @code{\"667\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18889
+#: doc/guix.texi:19046
 msgid "Bind the web interface to the specified port."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18890
+#: doc/guix.texi:19047
 #, no-wrap
 msgid "@code{bind-address} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18892 doc/guix.texi:18930
+#: doc/guix.texi:19049 doc/guix.texi:19087
 msgid "Bind the web interface to the specified address."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18893
+#: doc/guix.texi:19050
 #, no-wrap
 msgid "@code{base} (default: @code{\"/\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18896
+#: doc/guix.texi:19053
 msgid "Specify the path of the base URL.  This can be useful if @command{darkstat} is accessed via a reverse proxy."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18900
+#: doc/guix.texi:19057
 #, no-wrap
 msgid "Prometheus Node Exporter Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18902
+#: doc/guix.texi:19059
 #, no-wrap
 msgid "prometheus-node-exporter"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18907
+#: doc/guix.texi:19064
 msgid "The Prometheus ``node exporter'' makes hardware and operating system statistics provided by the Linux kernel available for the Prometheus monitoring system.  This service should be deployed on all physical nodes and virtual machines, where monitoring these statistics is desirable."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:18908
+#: doc/guix.texi:19065
 #, no-wrap
 msgid "{Scheme variable} prometheus-node-exporter-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:18913
+#: doc/guix.texi:19070
 msgid "This is the service type for the @uref{https://github.com/prometheus/node_exporter/, prometheus-node-exporter} service, its value must be a @code{prometheus-node-exporter-configuration} record as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:18918
+#: doc/guix.texi:19075
 #, no-wrap
 msgid ""
 "(service prometheus-node-exporter-service-type\n"
@@ -34710,609 +35185,609 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18921
+#: doc/guix.texi:19078
 #, no-wrap
 msgid "{Data Type} prometheus-node-exporter-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18923
+#: doc/guix.texi:19080
 msgid "Data type representing the configuration of @command{node_exporter}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18925
+#: doc/guix.texi:19082
 #, no-wrap
 msgid "@code{package} (default: @code{go-github-com-prometheus-node-exporter})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18927
+#: doc/guix.texi:19084
 msgid "The prometheus-node-exporter package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18928
+#: doc/guix.texi:19085
 #, no-wrap
 msgid "@code{web-listen-address} (default: @code{\":9100\"})"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18934
+#: doc/guix.texi:19091
 #, no-wrap
 msgid "Zabbix server"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18935
+#: doc/guix.texi:19092
 #, no-wrap
 msgid "zabbix zabbix-server"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18938
+#: doc/guix.texi:19095
 msgid "Zabbix provides monitoring metrics, among others network utilization, CPU load and disk space consumption:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18940
+#: doc/guix.texi:19097
 #, no-wrap
 msgid "High performance, high capacity (able to monitor hundreds of thousands of devices)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18941
+#: doc/guix.texi:19098
 #, no-wrap
 msgid "Auto-discovery of servers and network devices and interfaces."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18942
+#: doc/guix.texi:19099
 #, no-wrap
 msgid "Low-level discovery, allows to automatically start monitoring new items, file systems or network interfaces among others."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18943
+#: doc/guix.texi:19100
 #, no-wrap
 msgid "Distributed monitoring with centralized web administration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18944
+#: doc/guix.texi:19101
 #, no-wrap
 msgid "Native high performance agents."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18945
+#: doc/guix.texi:19102
 #, no-wrap
 msgid "SLA, and ITIL KPI metrics on reporting."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18946
+#: doc/guix.texi:19103
 #, no-wrap
 msgid "High-level (business) view of monitored resources through user-defined visual console screens and dashboards."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18947
+#: doc/guix.texi:19104
 #, no-wrap
 msgid "Remote command execution through Zabbix proxies."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18953
+#: doc/guix.texi:19110
 msgid "Available @code{zabbix-server-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18954
+#: doc/guix.texi:19111
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} package zabbix-server"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18956
+#: doc/guix.texi:19113
 msgid "The zabbix-server package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18959
+#: doc/guix.texi:19116
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18961
+#: doc/guix.texi:19118
 msgid "User who will run the Zabbix server."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18963 doc/guix.texi:18970 doc/guix.texi:18984
-#: doc/guix.texi:18991 doc/guix.texi:19092 doc/guix.texi:19099
-#: doc/guix.texi:19210 doc/guix.texi:19217
+#: doc/guix.texi:19120 doc/guix.texi:19127 doc/guix.texi:19141
+#: doc/guix.texi:19148 doc/guix.texi:19249 doc/guix.texi:19256
+#: doc/guix.texi:19367 doc/guix.texi:19374
 msgid "Defaults to @samp{\"zabbix\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18966
+#: doc/guix.texi:19123
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} group group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18968
+#: doc/guix.texi:19125
 msgid "Group who will run the Zabbix server."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18973
+#: doc/guix.texi:19130
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string db-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18975 doc/guix.texi:19194
+#: doc/guix.texi:19132 doc/guix.texi:19351
 msgid "Database host name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18977
+#: doc/guix.texi:19134
 msgid "Defaults to @samp{\"127.0.0.1\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18980
+#: doc/guix.texi:19137
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string db-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18982 doc/guix.texi:19208
+#: doc/guix.texi:19139 doc/guix.texi:19365
 msgid "Database name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18987
+#: doc/guix.texi:19144
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string db-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18989 doc/guix.texi:19215
+#: doc/guix.texi:19146 doc/guix.texi:19372
 msgid "Database user."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18994
+#: doc/guix.texi:19151
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string db-password"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18997
+#: doc/guix.texi:19154
 msgid "Database password.  Please, use @code{include-files} with @code{DBPassword=SECRET} inside a specified file instead."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19002
+#: doc/guix.texi:19159
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} number db-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19004 doc/guix.texi:19201
+#: doc/guix.texi:19161 doc/guix.texi:19358
 msgid "Database port."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19006 doc/guix.texi:19203
+#: doc/guix.texi:19163 doc/guix.texi:19360
 msgid "Defaults to @samp{5432}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19009
+#: doc/guix.texi:19166
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string log-type"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19011 doc/guix.texi:19112
+#: doc/guix.texi:19168 doc/guix.texi:19269
 msgid "Specifies where log messages are written to:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:19015 doc/guix.texi:19116
+#: doc/guix.texi:19172 doc/guix.texi:19273
 msgid "@code{system} - syslog."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:19018 doc/guix.texi:19119
+#: doc/guix.texi:19175 doc/guix.texi:19276
 msgid "@code{file} - file specified with @code{log-file} parameter."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:19021 doc/guix.texi:19122
+#: doc/guix.texi:19178 doc/guix.texi:19279
 msgid "@code{console} - standard output."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19028
+#: doc/guix.texi:19185
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string log-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19030 doc/guix.texi:19131
+#: doc/guix.texi:19187 doc/guix.texi:19288
 msgid "Log file name for @code{log-type} @code{file} parameter."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19032
+#: doc/guix.texi:19189
 msgid "Defaults to @samp{\"/var/log/zabbix/server.log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19035
+#: doc/guix.texi:19192
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19037 doc/guix.texi:19138
+#: doc/guix.texi:19194 doc/guix.texi:19295
 msgid "Name of PID file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19039
+#: doc/guix.texi:19196
 msgid "Defaults to @samp{\"/var/run/zabbix/zabbix_server.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19042
+#: doc/guix.texi:19199
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string ssl-ca-location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19045
+#: doc/guix.texi:19202
 msgid "The location of certificate authority (CA) files for SSL server certificate verification."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19047
+#: doc/guix.texi:19204
 msgid "Defaults to @samp{\"/etc/ssl/certs/ca-certificates.crt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19050
+#: doc/guix.texi:19207
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string ssl-cert-location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19052
+#: doc/guix.texi:19209
 msgid "Location of SSL client certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19054
+#: doc/guix.texi:19211
 msgid "Defaults to @samp{\"/etc/ssl/certs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19057
+#: doc/guix.texi:19214
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string extra-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19059 doc/guix.texi:19163
+#: doc/guix.texi:19216 doc/guix.texi:19320
 msgid "Extra options will be appended to Zabbix server configuration file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19064
+#: doc/guix.texi:19221
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} include-files include-files"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19067 doc/guix.texi:19171
+#: doc/guix.texi:19224 doc/guix.texi:19328
 msgid "You may include individual files or all files in a directory in the configuration file."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19074
+#: doc/guix.texi:19231
 #, no-wrap
 msgid "Zabbix agent"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19075
+#: doc/guix.texi:19232
 #, no-wrap
 msgid "zabbix zabbix-agent"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19078
+#: doc/guix.texi:19235
 msgid "Zabbix agent gathers information for Zabbix server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19082
+#: doc/guix.texi:19239
 msgid "Available @code{zabbix-agent-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19083
+#: doc/guix.texi:19240
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} package zabbix-agent"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19085
+#: doc/guix.texi:19242
 msgid "The zabbix-agent package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19088
+#: doc/guix.texi:19245
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19090
+#: doc/guix.texi:19247
 msgid "User who will run the Zabbix agent."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19095
+#: doc/guix.texi:19252
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} group group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19097
+#: doc/guix.texi:19254
 msgid "Group who will run the Zabbix agent."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19102
+#: doc/guix.texi:19259
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19105
+#: doc/guix.texi:19262
 msgid "Unique, case sensitive hostname which is required for active checks and must match hostname as configured on the server."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19107
+#: doc/guix.texi:19264
 msgid "Defaults to @samp{\"Zabbix server\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19110
+#: doc/guix.texi:19267
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string log-type"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19129
+#: doc/guix.texi:19286
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string log-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19133
+#: doc/guix.texi:19290
 msgid "Defaults to @samp{\"/var/log/zabbix/agent.log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19136
+#: doc/guix.texi:19293
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19140
+#: doc/guix.texi:19297
 msgid "Defaults to @samp{\"/var/run/zabbix/zabbix_agent.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19143
+#: doc/guix.texi:19300
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} list server"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19147
+#: doc/guix.texi:19304
 msgid "List of IP addresses, optionally in CIDR notation, or hostnames of Zabbix servers and Zabbix proxies.  Incoming connections will be accepted only from the hosts listed here."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19149 doc/guix.texi:19158
+#: doc/guix.texi:19306 doc/guix.texi:19315
 msgid "Defaults to @samp{(\"127.0.0.1\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19152
+#: doc/guix.texi:19309
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} list server-active"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19156
+#: doc/guix.texi:19313
 msgid "List of IP:port (or hostname:port) pairs of Zabbix servers and Zabbix proxies for active checks.  If port is not specified, default port is used.  If this parameter is not specified, active checks are disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19161
+#: doc/guix.texi:19318
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string extra-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19168
+#: doc/guix.texi:19325
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} include-files include-files"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19178
+#: doc/guix.texi:19335
 #, no-wrap
 msgid "Zabbix front-end"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19179
+#: doc/guix.texi:19336
 #, no-wrap
 msgid "zabbix zabbix-front-end"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19182
+#: doc/guix.texi:19339
 msgid "This service provides a WEB interface to Zabbix server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19186
+#: doc/guix.texi:19343
 msgid "Available @code{zabbix-front-end-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19187
+#: doc/guix.texi:19344
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} nginx-server-configuration-list nginx"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19189 doc/guix.texi:23981
+#: doc/guix.texi:19346 doc/guix.texi:24202
 msgid "NGINX configuration."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19192
+#: doc/guix.texi:19349
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string db-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19199
+#: doc/guix.texi:19356
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} number db-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19206
+#: doc/guix.texi:19363
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string db-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19213
+#: doc/guix.texi:19370
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string db-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19220
+#: doc/guix.texi:19377
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string db-password"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19222
+#: doc/guix.texi:19379
 msgid "Database password.  Please, use @code{db-secret-file} instead."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19227
+#: doc/guix.texi:19384
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string db-secret-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19231
+#: doc/guix.texi:19388
 msgid "Secret file which will be appended to @file{zabbix.conf.php} file.  This file contains credentials for use by Zabbix front-end.  You are expected to create it manually."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19236
+#: doc/guix.texi:19393
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string zabbix-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19238
+#: doc/guix.texi:19395
 msgid "Zabbix server hostname."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19243
+#: doc/guix.texi:19400
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} number zabbix-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19245
+#: doc/guix.texi:19402
 msgid "Zabbix server port."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19247
+#: doc/guix.texi:19404
 msgid "Defaults to @samp{10051}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19255
+#: doc/guix.texi:19412
 #, no-wrap
 msgid "Kerberos"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19259
+#: doc/guix.texi:19416
 msgid "The @code{(gnu services kerberos)} module provides services relating to the authentication protocol @dfn{Kerberos}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19260
+#: doc/guix.texi:19417
 #, no-wrap
 msgid "Krb5 Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19267
+#: doc/guix.texi:19424
 msgid "Programs using a Kerberos client library normally expect a configuration file in @file{/etc/krb5.conf}.  This service generates such a file from a definition provided in the operating system declaration.  It does not cause any daemon to be started."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19271
+#: doc/guix.texi:19428
 msgid "No ``keytab'' files are provided by this service---you must explicitly create them.  This service is known to work with the MIT client library, @code{mit-krb5}.  Other implementations have not been tested."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19272
+#: doc/guix.texi:19429
 #, no-wrap
 msgid "{Scheme Variable} krb5-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19274
+#: doc/guix.texi:19431
 msgid "A service type for Kerberos 5 clients."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19278
+#: doc/guix.texi:19435
 msgid "Here is an example of its use:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:19292
+#: doc/guix.texi:19449
 #, no-wrap
 msgid ""
 "(service krb5-service-type\n"
@@ -35331,206 +35806,206 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19296
+#: doc/guix.texi:19453
 msgid "This example provides a Kerberos@tie{}5 client configuration which:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19297
+#: doc/guix.texi:19454
 #, no-wrap
 msgid "Recognizes two realms, @i{viz:} ``EXAMPLE.COM'' and ``ARGRX.EDU'', both"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:19299
+#: doc/guix.texi:19456
 msgid "of which have distinct administration servers and key distribution centers;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19299
+#: doc/guix.texi:19456
 #, no-wrap
 msgid "Will default to the realm ``EXAMPLE.COM'' if the realm is not explicitly"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:19301
+#: doc/guix.texi:19458
 msgid "specified by clients;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19301
+#: doc/guix.texi:19458
 #, no-wrap
 msgid "Accepts services which only support encryption types known to be weak."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19309
+#: doc/guix.texi:19466
 msgid "The @code{krb5-realm} and @code{krb5-configuration} types have many fields.  Only the most commonly used ones are described here.  For a full list, and more detailed explanation of each, see the MIT @uref{https://web.mit.edu/kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf} documentation."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19311
+#: doc/guix.texi:19468
 #, no-wrap
 msgid "{Data Type} krb5-realm"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19312
+#: doc/guix.texi:19469
 #, no-wrap
 msgid "realm, kerberos"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19318
+#: doc/guix.texi:19475
 msgid "This field is a string identifying the name of the realm.  A common convention is to use the fully qualified DNS name of your organization, converted to upper case."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19319
+#: doc/guix.texi:19476
 #, no-wrap
 msgid "admin-server"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19322
+#: doc/guix.texi:19479
 msgid "This field is a string identifying the host where the administration server is running."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19323
+#: doc/guix.texi:19480
 #, no-wrap
 msgid "kdc"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19326
+#: doc/guix.texi:19483
 msgid "This field is a string identifying the key distribution center for the realm."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19329
+#: doc/guix.texi:19486
 #, no-wrap
 msgid "{Data Type} krb5-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19332
+#: doc/guix.texi:19489
 #, no-wrap
 msgid "@code{allow-weak-crypto?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19335
+#: doc/guix.texi:19492
 msgid "If this flag is @code{#t} then services which only offer encryption algorithms known to be weak will be accepted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19336
+#: doc/guix.texi:19493
 #, no-wrap
 msgid "@code{default-realm} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19343
+#: doc/guix.texi:19500
 msgid "This field should be a string identifying the default Kerberos realm for the client.  You should set this field to the name of your Kerberos realm.  If this value is @code{#f} then a realm must be specified with every Kerberos principal when invoking programs such as @command{kinit}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19344
+#: doc/guix.texi:19501
 #, no-wrap
 msgid "realms"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19349
+#: doc/guix.texi:19506
 msgid "This should be a non-empty list of @code{krb5-realm} objects, which clients may access.  Normally, one of them will have a @code{name} field matching the @code{default-realm} field."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19353
+#: doc/guix.texi:19510
 #, no-wrap
 msgid "PAM krb5 Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19354
+#: doc/guix.texi:19511
 #, no-wrap
 msgid "pam-krb5"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19360
+#: doc/guix.texi:19517
 msgid "The @code{pam-krb5} service allows for login authentication and password management via Kerberos.  You will need this service if you want PAM enabled applications to authenticate users using Kerberos."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19361
+#: doc/guix.texi:19518
 #, no-wrap
 msgid "{Scheme Variable} pam-krb5-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19363
+#: doc/guix.texi:19520
 msgid "A service type for the Kerberos 5 PAM module."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19365
+#: doc/guix.texi:19522
 #, no-wrap
 msgid "{Data Type} pam-krb5-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19368
+#: doc/guix.texi:19525
 msgid "Data type representing the configuration of the Kerberos 5 PAM module.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19369
+#: doc/guix.texi:19526
 #, no-wrap
 msgid "@code{pam-krb5} (default: @code{pam-krb5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19371
+#: doc/guix.texi:19528
 msgid "The pam-krb5 package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19372
+#: doc/guix.texi:19529
 #, no-wrap
 msgid "@code{minimum-uid} (default: @code{1000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19375
+#: doc/guix.texi:19532
 msgid "The smallest user ID for which Kerberos authentications should be attempted.  Local accounts with lower values will silently fail to authenticate."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19381
+#: doc/guix.texi:19538
 #, no-wrap
 msgid "LDAP"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19382
+#: doc/guix.texi:19539
 #, no-wrap
 msgid "nslcd, LDAP service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19389
+#: doc/guix.texi:19546
 msgid "The @code{(gnu services authentication)} module provides the @code{nslcd-service-type}, which can be used to authenticate against an LDAP server.  In addition to configuring the service itself, you may want to add @code{ldap} as a name service to the Name Service Switch. @xref{Name Service Switch} for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19393
+#: doc/guix.texi:19550
 msgid "Here is a simple operating system declaration with a default configuration of the @code{nslcd-service-type} and a Name Service Switch configuration that consults the @code{ldap} name service last:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:19416
+#: doc/guix.texi:19573
 #, no-wrap
 msgid ""
 "(use-service-modules authentication)\n"
@@ -35557,671 +36032,671 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19421
+#: doc/guix.texi:19578
 msgid "Available @code{nslcd-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19422
+#: doc/guix.texi:19579
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} package nss-pam-ldapd"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19424
+#: doc/guix.texi:19581
 msgid "The @code{nss-pam-ldapd} package to use."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19427
+#: doc/guix.texi:19584
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number threads"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19431
+#: doc/guix.texi:19588
 msgid "The number of threads to start that can handle requests and perform LDAP queries.  Each thread opens a separate connection to the LDAP server.  The default is to start 5 threads."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19433 doc/guix.texi:19475 doc/guix.texi:19483
-#: doc/guix.texi:19491 doc/guix.texi:19499 doc/guix.texi:19508
-#: doc/guix.texi:19516 doc/guix.texi:19523 doc/guix.texi:19531
-#: doc/guix.texi:19539 doc/guix.texi:19549 doc/guix.texi:19556
-#: doc/guix.texi:19580 doc/guix.texi:19588 doc/guix.texi:19614
-#: doc/guix.texi:19623 doc/guix.texi:19632 doc/guix.texi:19641
-#: doc/guix.texi:19650 doc/guix.texi:19659 doc/guix.texi:19667
-#: doc/guix.texi:19675 doc/guix.texi:19682 doc/guix.texi:19690
-#: doc/guix.texi:19697 doc/guix.texi:19705 doc/guix.texi:19713
-#: doc/guix.texi:19722 doc/guix.texi:19731 doc/guix.texi:19739
-#: doc/guix.texi:19747 doc/guix.texi:19755 doc/guix.texi:19766
-#: doc/guix.texi:19776 doc/guix.texi:19787 doc/guix.texi:19796
-#: doc/guix.texi:19806 doc/guix.texi:19814 doc/guix.texi:19825
-#: doc/guix.texi:19834 doc/guix.texi:19844 doc/guix.texi:22464
-#: doc/guix.texi:22471 doc/guix.texi:22478 doc/guix.texi:22485
-#: doc/guix.texi:22492 doc/guix.texi:22499 doc/guix.texi:22507
-#: doc/guix.texi:22515 doc/guix.texi:22522 doc/guix.texi:22529
-#: doc/guix.texi:22536 doc/guix.texi:22543 doc/guix.texi:22573
-#: doc/guix.texi:22611 doc/guix.texi:22618 doc/guix.texi:22627
-#: doc/guix.texi:22649 doc/guix.texi:22657 doc/guix.texi:22664
-#: doc/guix.texi:22819 doc/guix.texi:22839 doc/guix.texi:22854
-#: doc/guix.texi:22861 doc/guix.texi:24719 doc/guix.texi:24727
-#: doc/guix.texi:24735 doc/guix.texi:24743 doc/guix.texi:24751
-#: doc/guix.texi:24759
+#: doc/guix.texi:19590 doc/guix.texi:19632 doc/guix.texi:19640
+#: doc/guix.texi:19648 doc/guix.texi:19656 doc/guix.texi:19665
+#: doc/guix.texi:19673 doc/guix.texi:19680 doc/guix.texi:19688
+#: doc/guix.texi:19696 doc/guix.texi:19706 doc/guix.texi:19713
+#: doc/guix.texi:19737 doc/guix.texi:19745 doc/guix.texi:19771
+#: doc/guix.texi:19780 doc/guix.texi:19789 doc/guix.texi:19798
+#: doc/guix.texi:19807 doc/guix.texi:19816 doc/guix.texi:19824
+#: doc/guix.texi:19832 doc/guix.texi:19839 doc/guix.texi:19847
+#: doc/guix.texi:19854 doc/guix.texi:19862 doc/guix.texi:19870
+#: doc/guix.texi:19879 doc/guix.texi:19888 doc/guix.texi:19896
+#: doc/guix.texi:19904 doc/guix.texi:19912 doc/guix.texi:19923
+#: doc/guix.texi:19933 doc/guix.texi:19944 doc/guix.texi:19953
+#: doc/guix.texi:19963 doc/guix.texi:19971 doc/guix.texi:19982
+#: doc/guix.texi:19991 doc/guix.texi:20001 doc/guix.texi:22685
+#: doc/guix.texi:22692 doc/guix.texi:22699 doc/guix.texi:22706
+#: doc/guix.texi:22713 doc/guix.texi:22720 doc/guix.texi:22728
+#: doc/guix.texi:22736 doc/guix.texi:22743 doc/guix.texi:22750
+#: doc/guix.texi:22757 doc/guix.texi:22764 doc/guix.texi:22794
+#: doc/guix.texi:22832 doc/guix.texi:22839 doc/guix.texi:22848
+#: doc/guix.texi:22870 doc/guix.texi:22878 doc/guix.texi:22885
+#: doc/guix.texi:23040 doc/guix.texi:23060 doc/guix.texi:23075
+#: doc/guix.texi:23082 doc/guix.texi:24940 doc/guix.texi:24948
+#: doc/guix.texi:24956 doc/guix.texi:24964 doc/guix.texi:24972
+#: doc/guix.texi:24980
 msgid "Defaults to @samp{disabled}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19436
+#: doc/guix.texi:19593
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} string uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19438
+#: doc/guix.texi:19595
 msgid "This specifies the user id with which the daemon should be run."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19440 doc/guix.texi:19447
+#: doc/guix.texi:19597 doc/guix.texi:19604
 msgid "Defaults to @samp{\"nslcd\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19443
+#: doc/guix.texi:19600
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} string gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19445
+#: doc/guix.texi:19602
 msgid "This specifies the group id with which the daemon should be run."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19450
+#: doc/guix.texi:19607
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} log-option log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19457
+#: doc/guix.texi:19614
 msgid "This option controls the way logging is done via a list containing SCHEME and LEVEL.  The SCHEME argument may either be the symbols \"none\" or \"syslog\", or an absolute file name.  The LEVEL argument is optional and specifies the log level.  The log level may be one of the following symbols: \"crit\", \"error\", \"warning\", \"notice\", \"info\" or \"debug\".  All messages with the specified log level or higher are logged."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19459
+#: doc/guix.texi:19616
 msgid "Defaults to @samp{(\"/var/log/nslcd\" info)}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19462
+#: doc/guix.texi:19619
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} list uri"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19465
+#: doc/guix.texi:19622
 msgid "The list of LDAP server URIs.  Normally, only the first server will be used with the following servers as fall-back."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19467
+#: doc/guix.texi:19624
 msgid "Defaults to @samp{(\"ldap://localhost:389/\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19470
+#: doc/guix.texi:19627
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string ldap-version"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19473
+#: doc/guix.texi:19630
 msgid "The version of the LDAP protocol to use.  The default is to use the maximum version supported by the LDAP library."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19478
+#: doc/guix.texi:19635
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string binddn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19481
+#: doc/guix.texi:19638
 msgid "Specifies the distinguished name with which to bind to the directory server for lookups.  The default is to bind anonymously."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19486
+#: doc/guix.texi:19643
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string bindpw"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19489
+#: doc/guix.texi:19646
 msgid "Specifies the credentials with which to bind.  This option is only applicable when used with binddn."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19494
+#: doc/guix.texi:19651
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string rootpwmoddn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19497
+#: doc/guix.texi:19654
 msgid "Specifies the distinguished name to use when the root user tries to modify a user's password using the PAM module."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19502
+#: doc/guix.texi:19659
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string rootpwmodpw"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19506
+#: doc/guix.texi:19663
 msgid "Specifies the credentials with which to bind if the root user tries to change a user's password.  This option is only applicable when used with rootpwmoddn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19511
+#: doc/guix.texi:19668
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-mech"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19514
+#: doc/guix.texi:19671
 msgid "Specifies the SASL mechanism to be used when performing SASL authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19519
+#: doc/guix.texi:19676
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-realm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19521
+#: doc/guix.texi:19678
 msgid "Specifies the SASL realm to be used when performing SASL authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19526
+#: doc/guix.texi:19683
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-authcid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19529
+#: doc/guix.texi:19686
 msgid "Specifies the authentication identity to be used when performing SASL authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19534
+#: doc/guix.texi:19691
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-authzid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19537
+#: doc/guix.texi:19694
 msgid "Specifies the authorization identity to be used when performing SASL authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19542
+#: doc/guix.texi:19699
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean sasl-canonicalize?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19547
+#: doc/guix.texi:19704
 msgid "Determines whether the LDAP server host name should be canonicalised.  If this is enabled the LDAP library will do a reverse host name lookup.  By default, it is left up to the LDAP library whether this check is performed or not."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19552
+#: doc/guix.texi:19709
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string krb5-ccname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19554
+#: doc/guix.texi:19711
 msgid "Set the name for the GSS-API Kerberos credentials cache."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19559
+#: doc/guix.texi:19716
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} string base"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19561
+#: doc/guix.texi:19718
 msgid "The directory search base."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19563
+#: doc/guix.texi:19720
 msgid "Defaults to @samp{\"dc=example,dc=com\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19566
+#: doc/guix.texi:19723
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} scope-option scope"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19570
+#: doc/guix.texi:19727
 msgid "Specifies the search scope (subtree, onelevel, base or children).  The default scope is subtree; base scope is almost never useful for name service lookups; children scope is not supported on all servers."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19572
+#: doc/guix.texi:19729
 msgid "Defaults to @samp{(subtree)}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19575
+#: doc/guix.texi:19732
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-deref-option deref"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19578
+#: doc/guix.texi:19735
 msgid "Specifies the policy for dereferencing aliases.  The default policy is to never dereference aliases."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19583
+#: doc/guix.texi:19740
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean referrals"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19586
+#: doc/guix.texi:19743
 msgid "Specifies whether automatic referral chasing should be enabled.  The default behaviour is to chase referrals."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19591
+#: doc/guix.texi:19748
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} list-of-map-entries maps"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19596
+#: doc/guix.texi:19753
 msgid "This option allows for custom attributes to be looked up instead of the default RFC 2307 attributes.  It is a list of maps, each consisting of the name of a map, the RFC 2307 attribute to match and the query expression for the attribute as it is available in the directory."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19601
+#: doc/guix.texi:19758
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} list-of-filter-entries filters"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19604
+#: doc/guix.texi:19761
 msgid "A list of filters consisting of the name of a map to which the filter applies and an LDAP search filter expression."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19609
+#: doc/guix.texi:19766
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number bind-timelimit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19612
+#: doc/guix.texi:19769
 msgid "Specifies the time limit in seconds to use when connecting to the directory server.  The default value is 10 seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19617
+#: doc/guix.texi:19774
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number timelimit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19621
+#: doc/guix.texi:19778
 msgid "Specifies the time limit (in seconds) to wait for a response from the LDAP server.  A value of zero, which is the default, is to wait indefinitely for searches to be completed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19626
+#: doc/guix.texi:19783
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number idle-timelimit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19630
+#: doc/guix.texi:19787
 msgid "Specifies the period if inactivity (in seconds) after which the con‐ nection to the LDAP server will be closed.  The default is not to time out connections."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19635
+#: doc/guix.texi:19792
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number reconnect-sleeptime"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19639
+#: doc/guix.texi:19796
 msgid "Specifies the number of seconds to sleep when connecting to all LDAP servers fails.  By default one second is waited between the first failure and the first retry."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19644
+#: doc/guix.texi:19801
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number reconnect-retrytime"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19648
+#: doc/guix.texi:19805
 msgid "Specifies the time after which the LDAP server is considered to be permanently unavailable.  Once this time is reached retries will be done only once per this time period.  The default value is 10 seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19653
+#: doc/guix.texi:19810
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-ssl-option ssl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19657
+#: doc/guix.texi:19814
 msgid "Specifies whether to use SSL/TLS or not (the default is not to).  If 'start-tls is specified then StartTLS is used rather than raw LDAP over SSL."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19662
+#: doc/guix.texi:19819
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-tls-reqcert-option tls-reqcert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19665
+#: doc/guix.texi:19822
 msgid "Specifies what checks to perform on a server-supplied certificate.  The meaning of the values is described in the ldap.conf(5) manual page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19670
+#: doc/guix.texi:19827
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cacertdir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19673
+#: doc/guix.texi:19830
 msgid "Specifies the directory containing X.509 certificates for peer authen‐ tication.  This parameter is ignored when using GnuTLS."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19678
+#: doc/guix.texi:19835
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cacertfile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19680
+#: doc/guix.texi:19837
 msgid "Specifies the path to the X.509 certificate for peer authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19685
+#: doc/guix.texi:19842
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-randfile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19688
+#: doc/guix.texi:19845
 msgid "Specifies the path to an entropy source.  This parameter is ignored when using GnuTLS."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19693
+#: doc/guix.texi:19850
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-ciphers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19695
+#: doc/guix.texi:19852
 msgid "Specifies the ciphers to use for TLS as a string."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19700
+#: doc/guix.texi:19857
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19703
+#: doc/guix.texi:19860
 msgid "Specifies the path to the file containing the local certificate for client TLS authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19708
+#: doc/guix.texi:19865
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19711
+#: doc/guix.texi:19868
 msgid "Specifies the path to the file containing the private key for client TLS authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19716
+#: doc/guix.texi:19873
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number pagesize"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19720
+#: doc/guix.texi:19877
 msgid "Set this to a number greater than 0 to request paged results from the LDAP server in accordance with RFC2696.  The default (0) is to not request paged results."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19725
+#: doc/guix.texi:19882
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-ignore-users-option nss-initgroups-ignoreusers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19729
+#: doc/guix.texi:19886
 msgid "This option prevents group membership lookups through LDAP for the specified users.  Alternatively, the value 'all-local may be used.  With that value nslcd builds a full list of non-LDAP users on startup."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19734
+#: doc/guix.texi:19891
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number nss-min-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19737
+#: doc/guix.texi:19894
 msgid "This option ensures that LDAP users with a numeric user id lower than the specified value are ignored."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19742
+#: doc/guix.texi:19899
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number nss-uid-offset"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19745
+#: doc/guix.texi:19902
 msgid "This option specifies an offset that is added to all LDAP numeric user ids.  This can be used to avoid user id collisions with local users."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19750
+#: doc/guix.texi:19907
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number nss-gid-offset"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19753
+#: doc/guix.texi:19910
 msgid "This option specifies an offset that is added to all LDAP numeric group ids.  This can be used to avoid user id collisions with local groups."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19758
+#: doc/guix.texi:19915
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-nested-groups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19764
+#: doc/guix.texi:19921
 msgid "If this option is set, the member attribute of a group may point to another group.  Members of nested groups are also returned in the higher level group and parent groups are returned when finding groups for a specific user.  The default is not to perform extra searches for nested groups."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19769
+#: doc/guix.texi:19926
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-getgrent-skipmembers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19774
+#: doc/guix.texi:19931
 msgid "If this option is set, the group member list is not retrieved when looking up groups.  Lookups for finding which groups a user belongs to will remain functional so the user will likely still get the correct groups assigned on login."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19779
+#: doc/guix.texi:19936
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-disable-enumeration"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19785
+#: doc/guix.texi:19942
 msgid "If this option is set, functions which cause all user/group entries to be loaded from the directory will not succeed in doing so.  This can dramatically reduce LDAP server load in situations where there are a great number of users and/or groups.  This option is not recommended for most configurations."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19790
+#: doc/guix.texi:19947
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string validnames"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19794
+#: doc/guix.texi:19951
 msgid "This option can be used to specify how user and group names are verified within the system.  This pattern is used to check all user and group names that are requested and returned from LDAP."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19799
+#: doc/guix.texi:19956
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean ignorecase"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19804
+#: doc/guix.texi:19961
 msgid "This specifies whether or not to perform searches using case-insensitive matching.  Enabling this could open up the system to authorization bypass vulnerabilities and introduce nscd cache poisoning vulnerabilities which allow denial of service."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19809
+#: doc/guix.texi:19966
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean pam-authc-ppolicy"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19812
+#: doc/guix.texi:19969
 msgid "This option specifies whether password policy controls are requested and handled from the LDAP server when performing user authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19817
+#: doc/guix.texi:19974
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string pam-authc-search"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19823
+#: doc/guix.texi:19980
 msgid "By default nslcd performs an LDAP search with the user's credentials after BIND (authentication) to ensure that the BIND operation was successful.  The default search is a simple check to see if the user's DN exists.  A search filter can be specified that will be used instead.  It should return at least one entry."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19828
+#: doc/guix.texi:19985
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string pam-authz-search"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19832
+#: doc/guix.texi:19989
 msgid "This option allows flexible fine tuning of the authorisation check that should be performed.  The search filter specified is executed and if any entries match, access is granted, otherwise access is denied."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19837
+#: doc/guix.texi:19994
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string pam-password-prohibit-message"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19842
+#: doc/guix.texi:19999
 msgid "If this option is set password modification using pam_ldap will be denied and the specified message will be presented to the user instead.  The message can be used to direct the user to an alternative means of changing their password."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19847
+#: doc/guix.texi:20004
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} list pam-services"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19849
+#: doc/guix.texi:20006
 msgid "List of pam service names for which LDAP authentication should suffice."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19860
+#: doc/guix.texi:20017
 #, no-wrap
 msgid "web"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19861
+#: doc/guix.texi:20018
 #, no-wrap
 msgid "www"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19862
+#: doc/guix.texi:20019
 #, no-wrap
 msgid "HTTP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19865
+#: doc/guix.texi:20022
 msgid "The @code{(gnu services web)} module provides the Apache HTTP Server, the nginx web server, and also a fastcgi wrapper daemon."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19866
+#: doc/guix.texi:20023
 #, no-wrap
 msgid "Apache HTTP Server"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19868
+#: doc/guix.texi:20025
 #, no-wrap
 msgid "{Scheme Variable} httpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19872
+#: doc/guix.texi:20029
 msgid "Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server (@dfn{httpd}).  The value for this service type is a @code{httpd-configuration} record."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19874 doc/guix.texi:20055
+#: doc/guix.texi:20031 doc/guix.texi:20212
 msgid "A simple example configuration is given below."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:19882
+#: doc/guix.texi:20039
 #, no-wrap
 msgid ""
 "(service httpd-service-type\n"
@@ -36233,12 +36708,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19886
+#: doc/guix.texi:20043
 msgid "Other services can also extend the @code{httpd-service-type} to add to the configuration."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:19895 doc/guix.texi:20035
+#: doc/guix.texi:20052 doc/guix.texi:20192
 #, no-wrap
 msgid ""
 "(simple-service 'www.example.com-server httpd-service-type\n"
@@ -36251,115 +36726,115 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19901
+#: doc/guix.texi:20058
 msgid "The details for the @code{httpd-configuration}, @code{httpd-module}, @code{httpd-config-file} and @code{httpd-virtualhost} record types are given below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19902
+#: doc/guix.texi:20059
 #, no-wrap
 msgid "{Data Type} httpd-configuration"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19904
+#: doc/guix.texi:20061
 msgid "This data type represents the configuration for the httpd service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19906
+#: doc/guix.texi:20063
 #, no-wrap
 msgid "@code{package} (default: @code{httpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19908
+#: doc/guix.texi:20065
 msgid "The httpd package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19909 doc/guix.texi:19998
+#: doc/guix.texi:20066 doc/guix.texi:20155
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19911
+#: doc/guix.texi:20068
 msgid "The pid file used by the shepherd-service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19912
+#: doc/guix.texi:20069
 #, no-wrap
 msgid "@code{config} (default: @code{(httpd-config-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19917
+#: doc/guix.texi:20074
 msgid "The configuration file to use with the httpd service. The default value is a @code{httpd-config-file} record, but this can also be a different G-expression that generates a file, for example a @code{plain-file}. A file outside of the store can also be specified through a string."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19921
+#: doc/guix.texi:20078
 #, no-wrap
 msgid "{Data Type} httpd-module"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19923
+#: doc/guix.texi:20080
 msgid "This data type represents a module for the httpd service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19927
+#: doc/guix.texi:20084
 msgid "The name of the module."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19933
+#: doc/guix.texi:20090
 msgid "The file for the module. This can be relative to the httpd package being used, the absolute location of a file, or a G-expression for a file within the store, for example @code{(file-append mod-wsgi \"/modules/mod_wsgi.so\")}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19937
+#: doc/guix.texi:20094
 #, no-wrap
 msgid "{Scheme Variable} %default-httpd-modules"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19939
+#: doc/guix.texi:20096
 msgid "A default list of @code{httpd-module} objects."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19941
+#: doc/guix.texi:20098
 #, no-wrap
 msgid "{Data Type} httpd-config-file"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19943
+#: doc/guix.texi:20100
 msgid "This data type represents a configuration file for the httpd service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19945
+#: doc/guix.texi:20102
 #, no-wrap
 msgid "@code{modules} (default: @code{%default-httpd-modules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19948
+#: doc/guix.texi:20105
 msgid "The modules to load. Additional modules can be added here, or loaded by additional configuration."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19951
+#: doc/guix.texi:20108
 msgid "For example, in order to handle requests for PHP files, you can use Apache’s @code{mod_proxy_fcgi} module along with @code{php-fpm-service-type}:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:19973
+#: doc/guix.texi:20130
 #, no-wrap
 msgid ""
 "(service httpd-service-type\n"
@@ -36385,165 +36860,165 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19975
+#: doc/guix.texi:20132
 #, no-wrap
 msgid "@code{server-root} (default: @code{httpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19979
+#: doc/guix.texi:20136
 msgid "The @code{ServerRoot} in the configuration file, defaults to the httpd package. Directives including @code{Include} and @code{LoadModule} are taken as relative to the server root."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19980
+#: doc/guix.texi:20137
 #, no-wrap
 msgid "@code{server-name} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19984
+#: doc/guix.texi:20141
 msgid "The @code{ServerName} in the configuration file, used to specify the request scheme, hostname and port that the server uses to identify itself."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19988
-msgid "This doesn't need to be set in the server config, and can be specifyed in virtual hosts. The default is @code{#f} to not specify a @code{ServerName}."
+#: doc/guix.texi:20145
+msgid "This doesn't need to be set in the server config, and can be specified in virtual hosts. The default is @code{#f} to not specify a @code{ServerName}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19989
+#: doc/guix.texi:20146
 #, no-wrap
 msgid "@code{document-root} (default: @code{\"/srv/http\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19991
+#: doc/guix.texi:20148
 msgid "The @code{DocumentRoot} from which files will be served."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19992
+#: doc/guix.texi:20149
 #, no-wrap
 msgid "@code{listen} (default: @code{'(\"80\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19997
+#: doc/guix.texi:20154
 msgid "The list of values for the @code{Listen} directives in the config file. The value should be a list of strings, when each string can specify the port number to listen on, and optionally the IP address and protocol to use."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20002
+#: doc/guix.texi:20159
 msgid "The @code{PidFile} to use. This should match the @code{pid-file} set in the @code{httpd-configuration} so that the Shepherd service is configured correctly."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20003
+#: doc/guix.texi:20160
 #, no-wrap
 msgid "@code{error-log} (default: @code{\"/var/log/httpd/error_log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20005
+#: doc/guix.texi:20162
 msgid "The @code{ErrorLog} to which the server will log errors."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20006 doc/guix.texi:20534
+#: doc/guix.texi:20163 doc/guix.texi:20702
 #, no-wrap
 msgid "@code{user} (default: @code{\"httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20008
+#: doc/guix.texi:20165
 msgid "The @code{User} which the server will answer requests as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20009
+#: doc/guix.texi:20166
 #, no-wrap
 msgid "@code{group} (default: @code{\"httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20011
+#: doc/guix.texi:20168
 msgid "The @code{Group} which the server will answer requests as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20012
+#: doc/guix.texi:20169
 #, no-wrap
 msgid "@code{extra-config} (default: @code{(list \"TypesConfig etc/httpd/mime.types\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20015
+#: doc/guix.texi:20172
 msgid "A flat list of strings and G-expressions which will be added to the end of the configuration file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20018
+#: doc/guix.texi:20175
 msgid "Any values which the service is extended with will be appended to this list."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20022
+#: doc/guix.texi:20179
 #, no-wrap
 msgid "{Data Type} httpd-virtualhost"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20024
+#: doc/guix.texi:20181
 msgid "This data type represents a virtualhost configuration block for the httpd service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20026
+#: doc/guix.texi:20183
 msgid "These should be added to the extra-config for the httpd-service."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20038
+#: doc/guix.texi:20195
 #, no-wrap
 msgid "addresses-and-ports"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20040
+#: doc/guix.texi:20197
 msgid "The addresses and ports for the @code{VirtualHost} directive."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20041
+#: doc/guix.texi:20198
 #, no-wrap
 msgid "contents"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20044
+#: doc/guix.texi:20201
 msgid "The contents of the @code{VirtualHost} directive, this should be a list of strings and G-expressions."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:20048
+#: doc/guix.texi:20205
 #, no-wrap
 msgid "NGINX"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20050
+#: doc/guix.texi:20207
 #, no-wrap
 msgid "{Scheme Variable} nginx-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20053
+#: doc/guix.texi:20210
 msgid "Service type for the @uref{https://nginx.org/,NGinx} web server.  The value for this service type is a @code{} record."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20063 doc/guix.texi:20117
+#: doc/guix.texi:20220 doc/guix.texi:20274
 #, no-wrap
 msgid ""
 "(service nginx-service-type\n"
@@ -36555,12 +37030,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20068
+#: doc/guix.texi:20225
 msgid "In addition to adding server blocks to the service configuration directly, this service can be extended by other services to add server blocks, as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20074
+#: doc/guix.texi:20231
 #, no-wrap
 msgid ""
 "(simple-service 'my-extra-server nginx-service-type\n"
@@ -36570,88 +37045,88 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20085
+#: doc/guix.texi:20242
 msgid "At startup, @command{nginx} has not yet read its configuration file, so it uses a default file to log error messages.  If it fails to load its configuration file, that is where error messages are logged.  After the configuration file is loaded, the default error log file changes as per configuration.  In our case, startup error messages can be found in @file{/var/run/nginx/logs/error.log}, and after configuration in @file{/var/log/nginx/error.log}.  The second location can be changed with the @var{log-directory} configuration option."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20086
+#: doc/guix.texi:20243
 #, no-wrap
 msgid "{Data Type} nginx-configuration"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20090
+#: doc/guix.texi:20247
 msgid "This data type represents the configuration for NGinx. Some configuration can be done through this and the other provided record types, or alternatively, a config file can be provided."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20092
+#: doc/guix.texi:20249
 #, no-wrap
 msgid "@code{nginx} (default: @code{nginx})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20094
+#: doc/guix.texi:20251
 msgid "The nginx package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20095
+#: doc/guix.texi:20252
 #, no-wrap
 msgid "@code{log-directory} (default: @code{\"/var/log/nginx\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20097
+#: doc/guix.texi:20254
 msgid "The directory to which NGinx will write log files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20098
+#: doc/guix.texi:20255
 #, no-wrap
 msgid "@code{run-directory} (default: @code{\"/var/run/nginx\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20101
+#: doc/guix.texi:20258
 msgid "The directory in which NGinx will create a pid file, and write temporary files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20102
+#: doc/guix.texi:20259
 #, no-wrap
 msgid "@code{server-blocks} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20106
+#: doc/guix.texi:20263
 msgid "A list of @dfn{server blocks} to create in the generated configuration file, the elements should be of type @code{}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20110
+#: doc/guix.texi:20267
 msgid "The following example would setup NGinx to serve @code{www.example.com} from the @code{/srv/http/www.example.com} directory, without using HTTPS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20119
+#: doc/guix.texi:20276
 #, no-wrap
 msgid "@code{upstream-blocks} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20123
+#: doc/guix.texi:20280
 msgid "A list of @dfn{upstream blocks} to create in the generated configuration file, the elements should be of type @code{}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20130
+#: doc/guix.texi:20287
 msgid "Configuring upstreams through the @code{upstream-blocks} can be useful when combined with @code{locations} in the @code{} records.  The following example creates a server configuration with one location configuration, that will proxy requests to a upstream configuration, which will handle requests with two servers."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20149
+#: doc/guix.texi:20306
 #, no-wrap
 msgid ""
 "(service\n"
@@ -36674,44 +37149,44 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20157
+#: doc/guix.texi:20314
 msgid "If a configuration @var{file} is provided, this will be used, rather than generating a configuration file from the provided @code{log-directory}, @code{run-directory}, @code{server-blocks} and @code{upstream-blocks}.  For proper operation, these arguments should match what is in @var{file} to ensure that the directories are created when the service is activated."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20161
+#: doc/guix.texi:20318
 msgid "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."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20162
+#: doc/guix.texi:20319
 #, no-wrap
 msgid "@code{server-names-hash-bucket-size} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20165
+#: doc/guix.texi:20322
 msgid "Bucket size for the server names hash tables, defaults to @code{#f} to use the size of the processors cache line."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20166
+#: doc/guix.texi:20323
 #, no-wrap
 msgid "@code{server-names-hash-bucket-max-size} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20168
+#: doc/guix.texi:20325
 msgid "Maximum bucket size for the server names hash tables."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20172
+#: doc/guix.texi:20329
 msgid "List of nginx dynamic modules to load.  This should be a list of file names of loadable modules, as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20178
+#: doc/guix.texi:20335
 #, no-wrap
 msgid ""
 "(modules\n"
@@ -36720,313 +37195,335 @@ msgid ""
 "/etc/nginx/modules/ngx_http_accept_language_module.so\")))\n"
 msgstr ""
 
+#. type: item
+#: doc/guix.texi:20337
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{global-directives} (default: @code{'((events . ()))})"
+msgstr "@code{features} (default: @code{'()})"
+
+#. type: table
+#: doc/guix.texi:20340
+msgid "Association list of global directives for the top level of the nginx configuration.  Values may themselves be association lists."
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:20346
+#, no-wrap
+msgid ""
+"(global-directives\n"
+" `((worker_processes . 16)\n"
+"   (pcre_jit . on)\n"
+"   (events . ((worker_connections . 1024)))))\n"
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:20183
+#: doc/guix.texi:20351
 msgid "Extra content for the @code{http} block.  Should be string or a string valued G-expression."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20187
+#: doc/guix.texi:20355
 #, no-wrap
 msgid "{Data Type} nginx-server-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20190
+#: doc/guix.texi:20358
 msgid "Data type representing the configuration of an nginx server block.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20192
+#: doc/guix.texi:20360
 #, no-wrap
 msgid "@code{listen} (default: @code{'(\"80\" \"443 ssl\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20197
+#: doc/guix.texi:20365
 msgid "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:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20200
+#: doc/guix.texi:20368
 #, no-wrap
 msgid "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20202
+#: doc/guix.texi:20370
 #, no-wrap
 msgid "@code{server-name} (default: @code{(list 'default)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20205
+#: doc/guix.texi:20373
 msgid "A list of server names this server represents. @code{'default} represents the default server for connections matching no other server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20206
+#: doc/guix.texi:20374
 #, no-wrap
 msgid "@code{root} (default: @code{\"/srv/http\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20208
+#: doc/guix.texi:20376
 msgid "Root of the website nginx will serve."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20209
+#: doc/guix.texi:20377
 #, no-wrap
 msgid "@code{locations} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20213
+#: doc/guix.texi:20381
 msgid "A list of @dfn{nginx-location-configuration} or @dfn{nginx-named-location-configuration} records to use within this server block."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20214
+#: doc/guix.texi:20382
 #, no-wrap
 msgid "@code{index} (default: @code{(list \"index.html\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20217
+#: doc/guix.texi:20385
 msgid "Index files to look for when clients ask for a directory.  If it cannot be found, Nginx will send the list of files in the directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20218
+#: doc/guix.texi:20386
 #, no-wrap
 msgid "@code{try-files} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20221
+#: doc/guix.texi:20389
 msgid "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."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20222
+#: doc/guix.texi:20390
 #, no-wrap
 msgid "@code{ssl-certificate} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20225
+#: doc/guix.texi:20393
 msgid "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."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20226
+#: doc/guix.texi:20394
 #, no-wrap
 msgid "@code{ssl-certificate-key} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20229
+#: doc/guix.texi:20397
 msgid "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."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20230
+#: doc/guix.texi:20398
 #, no-wrap
 msgid "@code{server-tokens?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20232
+#: doc/guix.texi:20400
 msgid "Whether the server should add its configuration to response."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20233
+#: doc/guix.texi:20401
 #, no-wrap
 msgid "@code{raw-content} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20235
+#: doc/guix.texi:20403
 msgid "A list of raw lines added to the server block."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20239
+#: doc/guix.texi:20407
 #, no-wrap
 msgid "{Data Type} nginx-upstream-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20242
+#: doc/guix.texi:20410
 msgid "Data type representing the configuration of an nginx @code{upstream} block.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20246
+#: doc/guix.texi:20414
 msgid "Name for this group of servers."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20247
+#: doc/guix.texi:20415
 #, no-wrap
 msgid "servers"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20254
+#: doc/guix.texi:20422
 msgid "Specify the addresses of the servers in the group.  The address can be specified as a IP address (e.g.@: @samp{127.0.0.1}), domain name (e.g.@: @samp{backend1.example.com}) or a path to a UNIX socket using the prefix @samp{unix:}.  For addresses using an IP address or domain name, the default port is 80, and a different port can be specified explicitly."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20258
+#: doc/guix.texi:20426
 #, no-wrap
 msgid "{Data Type} nginx-location-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20261
+#: doc/guix.texi:20429
 msgid "Data type representing the configuration of an nginx @code{location} block.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20265
+#: doc/guix.texi:20433
 msgid "URI which this location block matches."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:20267
+#: doc/guix.texi:20435
 msgid "nginx-location-configuration body"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20267 doc/guix.texi:20288
+#: doc/guix.texi:20435 doc/guix.texi:20456
 #, no-wrap
 msgid "body"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20274
+#: doc/guix.texi:20442
 msgid "Body of the location block, specified as a list of strings. This can contain many configuration directives.  For example, to pass requests to a upstream server group defined using an @code{nginx-upstream-configuration} block, the following directive would be specified in the body @samp{(list \"proxy_pass http://upstream-name;\")}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20278
+#: doc/guix.texi:20446
 #, no-wrap
 msgid "{Data Type} nginx-named-location-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20283
+#: doc/guix.texi:20451
 msgid "Data type representing the configuration of an nginx named location block.  Named location blocks are used for request redirection, and not used for regular request processing.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20287
+#: doc/guix.texi:20455
 msgid "Name to identify this location block."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20293
+#: doc/guix.texi:20461
 msgid "@xref{nginx-location-configuration body}, as the body for named location blocks can be used in a similar way to the @code{nginx-location-configuration body}.  One restriction is that the body of a named location block cannot contain location blocks."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:20297
+#: doc/guix.texi:20465
 #, no-wrap
 msgid "Varnish Cache"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20298
+#: doc/guix.texi:20466
 #, no-wrap
 msgid "Varnish"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20303
+#: doc/guix.texi:20471
 msgid "Varnish is a fast cache server that sits in between web applications and end users.  It proxies requests from clients and caches the accessed URLs such that multiple requests for the same resource only creates one request to the back-end."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20304
+#: doc/guix.texi:20472
 #, no-wrap
 msgid "{Scheme Variable} varnish-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20306
+#: doc/guix.texi:20474
 msgid "Service type for the Varnish daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20308
+#: doc/guix.texi:20476
 #, no-wrap
 msgid "{Data Type} varnish-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20311
+#: doc/guix.texi:20479
 msgid "Data type representing the @code{varnish} service configuration.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20313
+#: doc/guix.texi:20481
 #, no-wrap
 msgid "@code{package} (default: @code{varnish})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20315
+#: doc/guix.texi:20483
 msgid "The Varnish package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20316
+#: doc/guix.texi:20484
 #, no-wrap
 msgid "@code{name} (default: @code{\"default\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20321
+#: doc/guix.texi:20489
 msgid "A name for this Varnish instance.  Varnish will create a directory in @file{/var/varnish/} with this name and keep temporary files there.  If the name starts with a forward slash, it is interpreted as an absolute directory name."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20324
+#: doc/guix.texi:20492
 msgid "Pass the @code{-n} argument to other Varnish programs to connect to the named instance, e.g.@: @command{varnishncsa -n default}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20325
+#: doc/guix.texi:20493
 #, no-wrap
 msgid "@code{backend} (default: @code{\"localhost:8080\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20327
+#: doc/guix.texi:20495
 msgid "The backend to use.  This option has no effect if @code{vcl} is set."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20328
+#: doc/guix.texi:20496
 #, no-wrap
 msgid "@code{vcl} (default: #f)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20333
+#: doc/guix.texi:20501
 msgid "The @dfn{VCL} (Varnish Configuration Language) program to run.  If this is @code{#f}, Varnish will proxy @code{backend} using the default configuration.  Otherwise this must be a file-like object with valid VCL syntax."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20337
-msgid "For example, to mirror @url{http://www.gnu.org,www.gnu.org} with VCL you can do something along these lines:"
+#: doc/guix.texi:20505
+msgid "For example, to mirror @url{https://www.gnu.org,www.gnu.org} with VCL you can do something along these lines:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20343
+#: doc/guix.texi:20511
 #, no-wrap
 msgid ""
 "(define %gnu-mirror\n"
@@ -37037,7 +37534,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20351
+#: doc/guix.texi:20519
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -37050,84 +37547,84 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20355
+#: doc/guix.texi:20523
 msgid "The configuration of an already running Varnish instance can be inspected and changed using the @command{varnishadm} program."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20359
+#: doc/guix.texi:20527
 msgid "Consult the @url{https://varnish-cache.org/docs/,Varnish User Guide} and @url{https://book.varnish-software.com/4.0/,Varnish Book} for comprehensive documentation on Varnish and its configuration language."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20360
+#: doc/guix.texi:20528
 #, no-wrap
 msgid "@code{listen} (default: @code{'(\"localhost:80\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20362
+#: doc/guix.texi:20530
 msgid "List of addresses Varnish will listen on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20363
+#: doc/guix.texi:20531
 #, no-wrap
 msgid "@code{storage} (default: @code{'(\"malloc,128m\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20365
+#: doc/guix.texi:20533
 msgid "List of storage backends that will be available in VCL."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20366
+#: doc/guix.texi:20534
 #, no-wrap
 msgid "@code{parameters} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20368
+#: doc/guix.texi:20536
 msgid "List of run-time parameters in the form @code{'((\"parameter\" . \"value\"))}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20371
+#: doc/guix.texi:20539
 msgid "Additional arguments to pass to the @command{varnishd} process."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20375 doc/guix.texi:20376
+#: doc/guix.texi:20543 doc/guix.texi:20544
 #, no-wrap
 msgid "Patchwork"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20379
+#: doc/guix.texi:20547
 msgid "Patchwork is a patch tracking system.  It can collect patches sent to a mailing list, and display them in a web interface."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20380
+#: doc/guix.texi:20548
 #, no-wrap
 msgid "{Scheme Variable} patchwork-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20382
+#: doc/guix.texi:20550
 #, fuzzy
 #| msgid "Share your work."
 msgid "Service type for Patchwork."
 msgstr "Поделитесь своей работой."
 
 #. type: Plain text
-#: doc/guix.texi:20386
+#: doc/guix.texi:20554
 msgid "The following example is an example of a minimal service for Patchwork, for the @code{patchwork.example.com} domain."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20406
+#: doc/guix.texi:20574
 #, no-wrap
 msgid ""
 "(service patchwork-service-type\n"
@@ -37152,859 +37649,923 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20412
+#: doc/guix.texi:20580
 msgid "There are three records for configuring the Patchwork service.  The @code{} relates to the configuration for Patchwork within the HTTPD service."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20416
+#: doc/guix.texi:20584
 msgid "The @code{settings-module} field within the @code{} record can be populated with the @code{} record, which describes a settings module that is generated within the Guix store."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20420
+#: doc/guix.texi:20588
 msgid "For the @code{database-configuration} field within the @code{}, the @code{} must be used."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20421
+#: doc/guix.texi:20589
 #, no-wrap
 msgid "{Data Type} patchwork-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20424
+#: doc/guix.texi:20592
 msgid "Data type representing the Patchwork service configuration.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20426
+#: doc/guix.texi:20594
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{patchwork} (default: @code{patchwork})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:20428
+#: doc/guix.texi:20596
 #, fuzzy
 #| msgid "The package data type."
 msgid "The Patchwork package to use."
 msgstr "Тип данных пакет"
 
 #. type: code{#1}
-#: doc/guix.texi:20429
+#: doc/guix.texi:20597
 #, no-wrap
 msgid "domain"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20432
+#: doc/guix.texi:20600
 msgid "The domain to use for Patchwork, this is used in the HTTPD service virtual host."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20433
+#: doc/guix.texi:20601
 #, no-wrap
 msgid "settings-module"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20439
+#: doc/guix.texi:20607
 msgid "The settings module to use for Patchwork. As a Django application, Patchwork is configured with a Python module containing the settings. This can either be an instance of the @code{} record, any other record that represents the settings in the store, or a directory outside of the store."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20440
+#: doc/guix.texi:20608
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{static-path}  (default: @code{\"/static/\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:20442
+#: doc/guix.texi:20610
 msgid "The path under which the HTTPD service should serve the static files."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20443
+#: doc/guix.texi:20611
 #, no-wrap
 msgid "getmail-retriever-config"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20447
+#: doc/guix.texi:20615
 msgid "The getmail-retriever-configuration record value to use with Patchwork. Getmail will be configured with this value, the messages will be delivered to Patchwork."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20451
+#: doc/guix.texi:20619
 #, no-wrap
 msgid "{Data Type} patchwork-settings-module"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20456
+#: doc/guix.texi:20624
 msgid "Data type representing a settings module for Patchwork.  Some of these settings relate directly to Patchwork, but others relate to Django, the web framework used by Patchwork, or the Django Rest Framework library.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20458
+#: doc/guix.texi:20626
 #, no-wrap
 msgid "@code{database-configuration} (default: @code{(patchwork-database-configuration)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20461
+#: doc/guix.texi:20629
 msgid "The database connection settings used for Patchwork.  See the @code{} record type for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20462
+#: doc/guix.texi:20630
 #, fuzzy, no-wrap
 #| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
 msgid "@code{secret-key-file} (default: @code{\"/etc/patchwork/django-secret-key\"})"
 msgstr "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
 
 #. type: table
-#: doc/guix.texi:20465
+#: doc/guix.texi:20633
 msgid "Patchwork, as a Django web application uses a secret key for cryptographically signing values.  This file should contain a unique unpredictable value."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20468
+#: doc/guix.texi:20636
 msgid "If this file does not exist, it will be created and populated with a random value by the patchwork-setup shepherd service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20470
+#: doc/guix.texi:20638
 msgid "This setting relates to Django."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20471
+#: doc/guix.texi:20639
 #, no-wrap
 msgid "allowed-hosts"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20474
+#: doc/guix.texi:20642
 msgid "A list of valid hosts for this Patchwork service. This should at least include the domain specified in the @code{} record."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20476 doc/guix.texi:20490 doc/guix.texi:20496
-#: doc/guix.texi:20502
+#: doc/guix.texi:20644 doc/guix.texi:20658 doc/guix.texi:20664
+#: doc/guix.texi:20670
 msgid "This is a Django setting."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20477
+#: doc/guix.texi:20645
 #, no-wrap
 msgid "default-from-email"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20479
+#: doc/guix.texi:20647
 msgid "The email address from which Patchwork should send email by default."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20481 doc/guix.texi:20507 doc/guix.texi:20512
-#: doc/guix.texi:20517
+#: doc/guix.texi:20649 doc/guix.texi:20675 doc/guix.texi:20680
+#: doc/guix.texi:20685
 msgid "This is a Patchwork setting."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20482
+#: doc/guix.texi:20650
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{static-url} (default: @code{#f})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:20485
+#: doc/guix.texi:20653
 msgid "The URL to use when serving static assets. It can be part of a URL, or a full URL, but must end in a @code{/}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20488
+#: doc/guix.texi:20656
 msgid "If the default value is used, the @code{static-path} value from the @code{} record will be used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20491
+#: doc/guix.texi:20659
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{admins} (default: @code{'()})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:20494
+#: doc/guix.texi:20662
 msgid "Email addresses to send the details of errors that occur.  Each value should be a list containing two elements, the name and then the email address."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20500
+#: doc/guix.texi:20668
 msgid "Whether to run Patchwork in debug mode.  If set to @code{#t}, detailed error messages will be shown."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20503
+#: doc/guix.texi:20671
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{enable-rest-api?} (default: @code{#t})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:20505
+#: doc/guix.texi:20673
 msgid "Whether to enable the Patchwork REST API."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20508
+#: doc/guix.texi:20676
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{enable-xmlrpc?} (default: @code{#t})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:20510
+#: doc/guix.texi:20678
 msgid "Whether to enable the XML RPC API."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20513
+#: doc/guix.texi:20681
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{force-https-links?} (default: @code{#t})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:20515
+#: doc/guix.texi:20683
 msgid "Whether to use HTTPS links on Patchwork pages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20520
+#: doc/guix.texi:20688
 msgid "Extra code to place at the end of the Patchwork settings module."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20524
+#: doc/guix.texi:20692
 #, no-wrap
 msgid "{Data Type} patchwork-database-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20526
+#: doc/guix.texi:20694
 msgid "Data type representing the database configuration for Patchwork."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20528
+#: doc/guix.texi:20696
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{engine} (default: @code{\"django.db.backends.postgresql_psycopg2\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:20530
+#: doc/guix.texi:20698
 msgid "The database engine to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20531
+#: doc/guix.texi:20699
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{name} (default: @code{\"patchwork\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:20533
+#: doc/guix.texi:20701
 #, fuzzy
 #| msgid "The host name of the remote machine."
 msgid "The name of the database to use."
 msgstr "Имя хоста удалённой машины"
 
 #. type: table
-#: doc/guix.texi:20536
+#: doc/guix.texi:20704
 msgid "The user to connect to the database as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20537
+#: doc/guix.texi:20705
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{password} (default: @code{\"\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:20539
+#: doc/guix.texi:20707
 msgid "The password to use when connecting to the database."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20540
+#: doc/guix.texi:20708
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{host} (default: @code{\"\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:20542
+#: doc/guix.texi:20710
 msgid "The host to make the database connection to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20543
+#: doc/guix.texi:20711
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{port} (default: @code{\"\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:20545
+#: doc/guix.texi:20713
 msgid "The port on which to connect to the database."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:20549
+#: doc/guix.texi:20717
 #, no-wrap
 msgid "Mumi"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20551
+#: doc/guix.texi:20719
 #, fuzzy, no-wrap
 #| msgid "user interfaces"
 msgid "Mumi, Debbugs Web interface"
 msgstr "пользовательские интерфейсы"
 
 #. type: cindex
-#: doc/guix.texi:20552
+#: doc/guix.texi:20720
 #, fuzzy, no-wrap
 #| msgid "user interfaces"
 msgid "Debbugs, Mumi Web interface"
 msgstr "пользовательские интерфейсы"
 
 #. type: Plain text
-#: doc/guix.texi:20557
+#: doc/guix.texi:20725
 msgid "@uref{https://git.elephly.net/gitweb.cgi?p=software/mumi.git, Mumi} is a Web interface to the Debbugs bug tracker, by default for @uref{https://bugs.gnu.org, the GNU instance}.  Mumi is a Web server, but it also fetches and indexes mail retrieved from Debbugs."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20558
+#: doc/guix.texi:20726
 #, no-wrap
 msgid "{Scheme Variable} mumi-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20560
+#: doc/guix.texi:20728
 msgid "This is the service type for Mumi."
 msgstr ""
 
+#. type: deftp
+#: doc/guix.texi:20730
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} mumi-configuration"
+msgstr "{Тип данных} build-machine"
+
+#. type: deftp
+#: doc/guix.texi:20733
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the Mumi service configuration.  This type has the following fields:"
+msgstr "Управление конфигурацией операционной системы."
+
+#. type: item
+#: doc/guix.texi:20735
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{mumi} (default: @code{mumi})"
+msgstr "@code{port} (default: @code{22})"
+
+#. type: table
+#: doc/guix.texi:20737
+#, fuzzy
+#| msgid "The package data type."
+msgid "The Mumi package to use."
+msgstr "Тип данных пакет"
+
+#. type: item
+#: doc/guix.texi:20738
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{mailer?} (default: @code{#true})"
+msgstr "@code{speed} (default: @code{1.0})"
+
+#. type: table
+#: doc/guix.texi:20740
+msgid "Whether to enable or disable the mailer component."
+msgstr ""
+
+#. type: code{#1}
+#: doc/guix.texi:20741
+#, fuzzy, no-wrap
+#| msgid "System Configuration"
+msgid "mumi-configuration-sender"
+msgstr "Конфигурирование системы"
+
+#. type: table
+#: doc/guix.texi:20743
+msgid "The email address used as the sender for comments."
+msgstr ""
+
+#. type: code{#1}
+#: doc/guix.texi:20744
+#, fuzzy, no-wrap
+#| msgid "System Configuration"
+msgid "mumi-configuration-smtp"
+msgstr "Конфигурирование системы"
+
+#. type: table
+#: doc/guix.texi:20749
+msgid "A URI to configure the SMTP settings for Mailutils.  This could be something like @code{sendmail:///path/to/bin/msmtp} or any other URI supported by Mailutils.  @xref{SMTP Mailboxes, SMTP Mailboxes,, mailutils, GNU@tie{}Mailutils}."
+msgstr ""
+
 #. type: subsubheading
-#: doc/guix.texi:20562
+#: doc/guix.texi:20754
 #, no-wrap
 msgid "FastCGI"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20563
+#: doc/guix.texi:20755
 #, no-wrap
 msgid "fastcgi"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20564
+#: doc/guix.texi:20756
 #, no-wrap
 msgid "fcgiwrap"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20571
+#: doc/guix.texi:20763
 msgid "FastCGI is an interface between the front-end and the back-end of a web service.  It is a somewhat legacy facility; new web services should generally just talk HTTP between the front-end and the back-end.  However there are a number of back-end services such as PHP or the optimized HTTP Git repository access that use FastCGI, so we have support for it in Guix."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20578
+#: doc/guix.texi:20770
 msgid "To use FastCGI, you configure the front-end web server (e.g., nginx) to dispatch some subset of its requests to the fastcgi backend, which listens on a local TCP or UNIX socket.  There is an intermediary @code{fcgiwrap} program that sits between the actual backend process and the web server.  The front-end indicates which backend program to run, passing that information to the @code{fcgiwrap} process."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20579
+#: doc/guix.texi:20771
 #, no-wrap
 msgid "{Scheme Variable} fcgiwrap-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20581
+#: doc/guix.texi:20773
 msgid "A service type for the @code{fcgiwrap} FastCGI proxy."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20583
+#: doc/guix.texi:20775
 #, no-wrap
 msgid "{Data Type} fcgiwrap-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20586
+#: doc/guix.texi:20778
 msgid "Data type representing the configuration of the @code{fcgiwrap} service.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20587
+#: doc/guix.texi:20779
 #, no-wrap
 msgid "@code{package} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20589
+#: doc/guix.texi:20781
 msgid "The fcgiwrap package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20590
+#: doc/guix.texi:20782
 #, no-wrap
 msgid "@code{socket} (default: @code{tcp:127.0.0.1:9000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20596
+#: doc/guix.texi:20788
 msgid "The socket on which the @code{fcgiwrap} process should listen, as a string.  Valid @var{socket} values include @code{unix:@var{/path/to/unix/socket}}, @code{tcp:@var{dot.ted.qu.ad}:@var{port}} and @code{tcp6:[@var{ipv6_addr}]:port}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20597
+#: doc/guix.texi:20789
 #, no-wrap
 msgid "@code{user} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:20598
+#: doc/guix.texi:20790
 #, no-wrap
 msgid "@code{group} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20603
+#: doc/guix.texi:20795
 msgid "The user and group names, as strings, under which to run the @code{fcgiwrap} process.  The @code{fastcgi} service will ensure that if the user asks for the specific user or group names @code{fcgiwrap} that the corresponding user and/or group is present on the system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20610
+#: doc/guix.texi:20802
 msgid "It is possible to configure a FastCGI-backed web service to pass HTTP authentication information from the front-end to the back-end, and to allow @code{fcgiwrap} to run the back-end process as a corresponding local user.  To enable this capability on the back-end, run @code{fcgiwrap} as the @code{root} user and group.  Note that this capability also has to be configured on the front-end as well."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20613
+#: doc/guix.texi:20805
 #, no-wrap
 msgid "php-fpm"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20616
+#: doc/guix.texi:20808
 msgid "PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI implementation with some additional features useful for sites of any size."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20618
+#: doc/guix.texi:20810
 msgid "These features include:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20619
+#: doc/guix.texi:20811
 #, no-wrap
 msgid "Adaptive process spawning"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20620
+#: doc/guix.texi:20812
 #, no-wrap
 msgid "Basic statistics (similar to Apache's mod_status)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20621
+#: doc/guix.texi:20813
 #, no-wrap
 msgid "Advanced process management with graceful stop/start"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20622
+#: doc/guix.texi:20814
 #, no-wrap
 msgid "Ability to start workers with different uid/gid/chroot/environment"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:20624
+#: doc/guix.texi:20816
 msgid "and different php.ini (replaces safe_mode)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20624
+#: doc/guix.texi:20816
 #, no-wrap
 msgid "Stdout & stderr logging"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20625
+#: doc/guix.texi:20817
 #, no-wrap
 msgid "Emergency restart in case of accidental opcode cache destruction"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20626
+#: doc/guix.texi:20818
 #, no-wrap
 msgid "Accelerated upload support"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20627
+#: doc/guix.texi:20819
 #, no-wrap
 msgid "Support for a \"slowlog\""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20628
+#: doc/guix.texi:20820
 #, no-wrap
 msgid "Enhancements to FastCGI, such as fastcgi_finish_request() -"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:20631
+#: doc/guix.texi:20823
 msgid "a special function to finish request & flush all data while continuing to do something time-consuming (video converting, stats processing, etc.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20633
+#: doc/guix.texi:20825
 msgid "...@: and much more."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20634
+#: doc/guix.texi:20826
 #, no-wrap
 msgid "{Scheme Variable} php-fpm-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20636
+#: doc/guix.texi:20828
 msgid "A Service type for @code{php-fpm}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20638
+#: doc/guix.texi:20830
 #, no-wrap
 msgid "{Data Type} php-fpm-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20640
+#: doc/guix.texi:20832
 msgid "Data Type for php-fpm service configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20641
+#: doc/guix.texi:20833
 #, no-wrap
 msgid "@code{php} (default: @code{php})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20643
+#: doc/guix.texi:20835
 msgid "The php package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20643
+#: doc/guix.texi:20835
 #, no-wrap
 msgid "@code{socket} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20645
+#: doc/guix.texi:20837
 msgid "The address on which to accept FastCGI requests.  Valid syntaxes are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20646
+#: doc/guix.texi:20838
 #, no-wrap
 msgid "\"ip.add.re.ss:port\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20648
+#: doc/guix.texi:20840
 msgid "Listen on a TCP socket to a specific address on a specific port."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20648
+#: doc/guix.texi:20840
 #, no-wrap
 msgid "\"port\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20650
+#: doc/guix.texi:20842
 msgid "Listen on a TCP socket to all addresses on a specific port."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20650
+#: doc/guix.texi:20842
 #, no-wrap
 msgid "\"/path/to/unix/socket\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20652
+#: doc/guix.texi:20844
 msgid "Listen on a unix socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20654
+#: doc/guix.texi:20846
 #, no-wrap
 msgid "@code{user} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20656
+#: doc/guix.texi:20848
 msgid "User who will own the php worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20656
+#: doc/guix.texi:20848
 #, no-wrap
 msgid "@code{group} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20658
+#: doc/guix.texi:20850
 msgid "Group of the worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20658
+#: doc/guix.texi:20850
 #, no-wrap
 msgid "@code{socket-user} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20660
+#: doc/guix.texi:20852
 msgid "User who can speak to the php-fpm socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20660
+#: doc/guix.texi:20852
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{socket-group} (default: @code{nginx})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:20662
+#: doc/guix.texi:20854
 msgid "Group that can speak to the php-fpm socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20662
+#: doc/guix.texi:20854
 #, no-wrap
 msgid "@code{pid-file} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20665
+#: doc/guix.texi:20857
 msgid "The process id of the php-fpm process is written to this file once the service has started."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20665
+#: doc/guix.texi:20857
 #, no-wrap
 msgid "@code{log-file} (default: @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20667
+#: doc/guix.texi:20859
 msgid "Log for the php-fpm master process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20667
+#: doc/guix.texi:20859
 #, no-wrap
 msgid "@code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20670
+#: doc/guix.texi:20862
 msgid "Detailed settings for the php-fpm process manager.  Must be one of:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20671
+#: doc/guix.texi:20863
 #, no-wrap
 msgid ""
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20672
+#: doc/guix.texi:20864
 #, no-wrap
 msgid ""
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20673
+#: doc/guix.texi:20865
 #, no-wrap
 msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20675
+#: doc/guix.texi:20867
 #, no-wrap
 msgid "@code{display-errors} (default @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20680
+#: doc/guix.texi:20872
 msgid "Determines whether 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."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20680
+#: doc/guix.texi:20872
 #, no-wrap
 msgid "@code{timezone} (default @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20682
+#: doc/guix.texi:20874
 msgid "Specifies @code{php_admin_value[date.timezone]} parameter."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20682
+#: doc/guix.texi:20874
 #, no-wrap
 msgid "@code{workers-logfile} (default @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.www.log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20685
+#: doc/guix.texi:20877
 msgid "This file will log the @code{stderr} outputs of php worker processes.  Can be set to @code{#f} to disable logging."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20685
+#: doc/guix.texi:20877
 #, no-wrap
 msgid "@code{file} (default @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20688
+#: doc/guix.texi:20880
 msgid "An optional override of the whole configuration.  You can use the @code{mixed-text-file} function or an absolute filepath for it."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20691
+#: doc/guix.texi:20883
 #, no-wrap
 msgid "{Data type} php-fpm-dynamic-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20695
+#: doc/guix.texi:20887
 msgid "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."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20696 doc/guix.texi:20712 doc/guix.texi:20722
+#: doc/guix.texi:20888 doc/guix.texi:20904 doc/guix.texi:20914
 #, no-wrap
 msgid "@code{max-children} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20698 doc/guix.texi:20714 doc/guix.texi:20724
+#: doc/guix.texi:20890 doc/guix.texi:20906 doc/guix.texi:20916
 msgid "Maximum of worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20698
+#: doc/guix.texi:20890
 #, no-wrap
 msgid "@code{start-servers} (default: @code{2})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20700
+#: doc/guix.texi:20892
 msgid "How many worker processes should be started on start-up."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20700
+#: doc/guix.texi:20892
 #, no-wrap
 msgid "@code{min-spare-servers} (default: @code{1})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20702
+#: doc/guix.texi:20894
 msgid "How many spare worker processes should be kept around at minimum."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20702
+#: doc/guix.texi:20894
 #, no-wrap
 msgid "@code{max-spare-servers} (default: @code{3})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20704
+#: doc/guix.texi:20896
 msgid "How many spare worker processes should be kept around at maximum."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20707
+#: doc/guix.texi:20899
 #, no-wrap
 msgid "{Data type} php-fpm-static-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20711
+#: doc/guix.texi:20903
 msgid "Data Type for the @code{static} php-fpm process manager.  With the @code{static} process manager, an unchanging number of worker processes are created."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20717
+#: doc/guix.texi:20909
 #, no-wrap
 msgid "{Data type} php-fpm-on-demand-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20721
+#: doc/guix.texi:20913
 msgid "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."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20724
+#: doc/guix.texi:20916
 #, no-wrap
 msgid "@code{process-idle-timeout} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20726
+#: doc/guix.texi:20918
 msgid "The time in seconds after which a process with no requests is killed."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20730
+#: doc/guix.texi:20922
 #, no-wrap
 msgid "{Scheme Procedure} nginx-php-fpm-location @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20736
+#: doc/guix.texi:20928
 msgid "[#: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}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20739
+#: doc/guix.texi:20931
 msgid "A simple services setup for nginx with php can look like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20752
+#: doc/guix.texi:20944
 #, no-wrap
 msgid ""
 "(services (cons* (service dhcp-client-service-type)\n"
@@ -38022,34 +38583,34 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20754
+#: doc/guix.texi:20946
 #, no-wrap
 msgid "cat-avatar-generator"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20758
+#: doc/guix.texi:20950
 msgid "The cat avatar generator is a simple service to demonstrate the use of php-fpm in @code{Nginx}.  It is used to generate cat avatar from a seed, for instance the hash of a user's email address."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20759
+#: doc/guix.texi:20951
 #, no-wrap
 msgid "{Scheme Procedure} cat-avatar-generator-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20767
+#: doc/guix.texi:20959
 msgid "[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-configuration)] Returns an nginx-server-configuration that inherits @code{configuration}.  It extends the nginx configuration to add a server block that serves @code{package}, a version of cat-avatar-generator.  During execution, cat-avatar-generator will be able to use @code{cache-dir} as its cache directory."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20770
+#: doc/guix.texi:20962
 msgid "A simple setup for cat-avatar-generator can look like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20777
+#: doc/guix.texi:20969
 #, no-wrap
 msgid ""
 "(services (cons* (cat-avatar-generator-service\n"
@@ -38061,155 +38622,155 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:20779
+#: doc/guix.texi:20971
 #, no-wrap
 msgid "Hpcguix-web"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20781
+#: doc/guix.texi:20973
 #, no-wrap
 msgid "hpcguix-web"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20786
+#: doc/guix.texi:20978
 msgid "The @uref{https://github.com/UMCUGenetics/hpcguix-web/, hpcguix-web} program is a customizable web interface to browse Guix packages, initially designed for users of high-performance computing (HPC)  clusters."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20787
+#: doc/guix.texi:20979
 #, no-wrap
 msgid "{Scheme Variable} hpcguix-web-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20789
+#: doc/guix.texi:20981
 msgid "The service type for @code{hpcguix-web}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20791
+#: doc/guix.texi:20983
 #, no-wrap
 msgid "{Data Type} hpcguix-web-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20793
+#: doc/guix.texi:20985
 msgid "Data type for the hpcguix-web service configuration."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20795
+#: doc/guix.texi:20987
 #, no-wrap
 msgid "specs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20798
+#: doc/guix.texi:20990
 msgid "A gexp (@pxref{G-Expressions}) specifying the hpcguix-web service configuration.  The main items available in this spec are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20800
+#: doc/guix.texi:20992
 #, no-wrap
 msgid "@code{title-prefix} (default: @code{\"hpcguix | \"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20802
+#: doc/guix.texi:20994
 msgid "The page title prefix."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20803
+#: doc/guix.texi:20995
 #, no-wrap
 msgid "@code{guix-command} (default: @code{\"guix\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20805
+#: doc/guix.texi:20997
 msgid "The @command{guix} command."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20806
+#: doc/guix.texi:20998
 #, no-wrap
 msgid "@code{package-filter-proc} (default: @code{(const #t)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20808
+#: doc/guix.texi:21000
 msgid "A procedure specifying how to filter packages that are displayed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20809
+#: doc/guix.texi:21001
 #, no-wrap
 msgid "@code{package-page-extension-proc} (default: @code{(const '())})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20811
+#: doc/guix.texi:21003
 msgid "Extension package for @code{hpcguix-web}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20812
+#: doc/guix.texi:21004
 #, no-wrap
 msgid "@code{menu} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20814
+#: doc/guix.texi:21006
 msgid "Additional entry in page @code{menu}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20815
+#: doc/guix.texi:21007
 #, no-wrap
 msgid "@code{channels} (default: @code{%default-channels})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20817
+#: doc/guix.texi:21009
 msgid "List of channels from which the package list is built (@pxref{Channels})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20818
+#: doc/guix.texi:21010
 #, no-wrap
 msgid "@code{package-list-expiration} (default: @code{(* 12 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20821
+#: doc/guix.texi:21013
 msgid "The expiration time, in seconds, after which the package list is rebuilt from the latest instances of the given channels."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20826
+#: doc/guix.texi:21018
 msgid "See the hpcguix-web repository for a @uref{https://github.com/UMCUGenetics/hpcguix-web/blob/master/hpcweb-configuration.scm, complete example}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20827
+#: doc/guix.texi:21019
 #, no-wrap
 msgid "@code{package} (default: @code{hpcguix-web})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20829
+#: doc/guix.texi:21021
 msgid "The hpcguix-web package to use."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20833
+#: doc/guix.texi:21025
 msgid "A typical hpcguix-web service declaration looks like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20842
+#: doc/guix.texi:21034
 #, no-wrap
 msgid ""
 "(service hpcguix-web-service-type\n"
@@ -38222,77 +38783,77 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:20849
+#: doc/guix.texi:21041
 msgid "The hpcguix-web service periodically updates the package list it publishes by pulling channels from Git.  To that end, it needs to access X.509 certificates so that it can authenticate Git servers when communicating over HTTPS, and it assumes that @file{/etc/ssl/certs} contains those certificates."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:20853
+#: doc/guix.texi:21045
 msgid "Thus, make sure to add @code{nss-certs} or another certificate package to the @code{packages} field of your configuration.  @ref{X.509 Certificates}, for more information on X.509 certificates."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20858
+#: doc/guix.texi:21050
 #, no-wrap
 msgid "Web"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20859
+#: doc/guix.texi:21051
 #, no-wrap
 msgid "HTTP, HTTPS"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20860
+#: doc/guix.texi:21052
 #, no-wrap
 msgid "Let's Encrypt"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20861
+#: doc/guix.texi:21053
 #, no-wrap
 msgid "TLS certificates"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20868
+#: doc/guix.texi:21060
 msgid "The @code{(gnu services certbot)} module provides a service to automatically obtain a valid TLS certificate from the Let's Encrypt certificate authority.  These certificates can then be used to serve content securely over HTTPS or other TLS-based protocols, with the knowledge that the client will be able to verify the server's authenticity."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20880
+#: doc/guix.texi:21072
 msgid "@url{https://letsencrypt.org/, Let's Encrypt} provides the @code{certbot} tool to automate the certification process.  This tool first securely generates a key on the server.  It then makes a request to the Let's Encrypt certificate authority (CA) to sign the key.  The CA checks that the request originates from the host in question by using a challenge-response protocol, requiring the server to provide its response over HTTP.  If that protocol completes successfully, the CA signs the key, resulting in a certificate.  That certificate is valid for a limited period of time, and therefore to continue to provide TLS services, the server needs to periodically ask the CA to renew its signature."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20887
+#: doc/guix.texi:21079
 msgid "The certbot service automates this process: the initial key generation, the initial certification request to the Let's Encrypt service, the web server challenge/response integration, writing the certificate to disk, the automated periodic renewals, and the deployment tasks associated with the renewal (e.g.@: reloading services, copying keys with different permissions)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20893
+#: doc/guix.texi:21085
 msgid "Certbot is run twice a day, at a random minute within the hour.  It won't do anything until your certificates are due for renewal or revoked, but running it regularly would give your service a chance of staying online in case a Let's Encrypt-initiated revocation happened for some reason."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20897
+#: doc/guix.texi:21089
 msgid "By using this service, you agree to the ACME Subscriber Agreement, which can be found there: @url{https://acme-v01.api.letsencrypt.org/directory}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20898
+#: doc/guix.texi:21090
 #, no-wrap
 msgid "{Scheme Variable} certbot-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20901
+#: doc/guix.texi:21093
 msgid "A service type for the @code{certbot} Let's Encrypt client.  Its value must be a @code{certbot-configuration} record as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20908
+#: doc/guix.texi:21100
 #, no-wrap
 msgid ""
 "(define %nginx-deploy-hook\n"
@@ -38304,7 +38865,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:20919
+#: doc/guix.texi:21111
 #, no-wrap
 msgid ""
 "(service certbot-service-type\n"
@@ -38320,213 +38881,225 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20922
+#: doc/guix.texi:21114
 msgid "See below for details about @code{certbot-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20924
+#: doc/guix.texi:21116
 #, no-wrap
 msgid "{Data Type} certbot-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20927
+#: doc/guix.texi:21119
 msgid "Data type representing the configuration of the @code{certbot} service.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20929
+#: doc/guix.texi:21121
 #, no-wrap
 msgid "@code{package} (default: @code{certbot})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20931
+#: doc/guix.texi:21123
 msgid "The certbot package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20932
+#: doc/guix.texi:21124
 #, no-wrap
 msgid "@code{webroot} (default: @code{/var/www})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20935
+#: doc/guix.texi:21127
 msgid "The directory from which to serve the Let's Encrypt challenge/response files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20936
+#: doc/guix.texi:21128
 #, no-wrap
 msgid "@code{certificates} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20940
+#: doc/guix.texi:21132
 msgid "A list of @code{certificates-configuration}s for which to generate certificates and request signatures.  Each certificate has a @code{name} and several @code{domains}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20944
+#: doc/guix.texi:21136
 msgid "Mandatory email used for registration, recovery contact, and important account notifications."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20945
+#: doc/guix.texi:21137
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{server} (default: @code{#f})"
+msgstr "@code{features} (default: @code{'()})"
+
+#. type: table
+#: doc/guix.texi:21140
+msgid "Optional URL of ACME server.  Setting this overrides certbot's default, which is the Let's Encrypt server."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:21141
 #, no-wrap
 msgid "@code{rsa-key-size} (default: @code{2048})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20947
+#: doc/guix.texi:21143
 msgid "Size of the RSA key."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20948
+#: doc/guix.texi:21144
 #, no-wrap
 msgid "@code{default-location} (default: @i{see below})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20957
+#: doc/guix.texi:21153
 msgid "The default @code{nginx-location-configuration}.  Because @code{certbot} needs to be able to serve challenges and responses, it needs to be able to run a web server.  It does so by extending the @code{nginx} web service with an @code{nginx-server-configuration} listening on the @var{domains} on port 80, and which has a @code{nginx-location-configuration} for the @code{/.well-known/} URI path subspace used by Let's Encrypt.  @xref{Web Services}, for more on these nginx configuration data types."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20961
+#: doc/guix.texi:21157
 msgid "Requests to other URL paths will be matched by the @code{default-location}, which if present is added to all @code{nginx-server-configuration}s."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20965
+#: doc/guix.texi:21161
 msgid "By default, the @code{default-location} will issue a redirect from @code{http://@var{domain}/...} to @code{https://@var{domain}/...}, leaving you to define what to serve on your site via @code{https}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20967
+#: doc/guix.texi:21163
 msgid "Pass @code{#f} to not issue a default location."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20970
+#: doc/guix.texi:21166
 #, no-wrap
 msgid "{Data Type} certificate-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20973
+#: doc/guix.texi:21169
 msgid "Data type representing the configuration of a certificate.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20975
+#: doc/guix.texi:21171
 #, no-wrap
 msgid "@code{name} (default: @i{see below})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20979
+#: doc/guix.texi:21175
 msgid "This name is used by Certbot for housekeeping and in file paths; it doesn't affect the content of the certificate itself.  To see certificate names, run @code{certbot certificates}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20981
+#: doc/guix.texi:21177
 msgid "Its default is the first provided domain."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20982
+#: doc/guix.texi:21178
 #, no-wrap
 msgid "@code{domains} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20985
+#: doc/guix.texi:21181
 msgid "The first domain provided will be the subject CN of the certificate, and all domains will be Subject Alternative Names on the certificate."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20986
+#: doc/guix.texi:21182
 #, no-wrap
 msgid "@code{challenge} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20993
+#: doc/guix.texi:21189
 msgid "The challenge type that has to be run by certbot.  If @code{#f} is specified, default to the HTTP challenge.  If a value is specified, defaults to the manual plugin (see @code{authentication-hook}, @code{cleanup-hook} and the documentation at @url{https://certbot.eff.org/docs/using.html#hooks}), and gives Let's Encrypt permission to log the public IP address of the requesting machine."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20994
+#: doc/guix.texi:21190
 #, no-wrap
 msgid "@code{authentication-hook} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21000
+#: doc/guix.texi:21196
 msgid "Command to be run in a shell once for each certificate challenge to be answered.  For this command, the shell variable @code{$CERTBOT_DOMAIN} will contain the domain being authenticated, @code{$CERTBOT_VALIDATION} contains the validation string and @code{$CERTBOT_TOKEN} contains the file name of the resource requested when performing an HTTP-01 challenge."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21001
+#: doc/guix.texi:21197
 #, no-wrap
 msgid "@code{cleanup-hook} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21007
+#: doc/guix.texi:21203
 msgid "Command to be run in a shell once for each certificate challenge that have been answered by the @code{auth-hook}.  For this command, the shell variables available in the @code{auth-hook} script are still available, and additionally @code{$CERTBOT_AUTH_OUTPUT} will contain the standard output of the @code{auth-hook} script."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21008
+#: doc/guix.texi:21204
 #, no-wrap
 msgid "@code{deploy-hook} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21016
+#: doc/guix.texi:21212
 msgid "Command to be run in a shell once for each successfully issued certificate.  For this command, the shell variable @code{$RENEWED_LINEAGE} will point to the config live subdirectory (for example, @samp{\"/etc/letsencrypt/live/example.com\"}) containing the new certificates and keys; the shell variable @code{$RENEWED_DOMAINS} will contain a space-delimited list of renewed certificate domains (for example, @samp{\"example.com www.example.com\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21023
+#: doc/guix.texi:21219
 msgid "For each @code{certificate-configuration}, the certificate is saved to @code{/etc/letsencrypt/live/@var{name}/fullchain.pem} and the key is saved to @code{/etc/letsencrypt/live/@var{name}/privkey.pem}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21025
+#: doc/guix.texi:21221
 #, no-wrap
 msgid "DNS (domain name system)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21026
+#: doc/guix.texi:21222
 #, no-wrap
 msgid "domain name system (DNS)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21034
+#: doc/guix.texi:21230
 msgid "The @code{(gnu services dns)} module provides services related to the @dfn{domain name system} (DNS).  It provides a server service for hosting an @emph{authoritative} DNS server for multiple zones, slave or master.  This service uses @uref{https://www.knot-dns.cz/, Knot DNS}.  And also a caching and forwarding DNS server for the LAN, which uses @uref{http://www.thekelleys.org.uk/dnsmasq/doc.html, dnsmasq}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:21035
+#: doc/guix.texi:21231
 #, no-wrap
 msgid "Knot Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21039
+#: doc/guix.texi:21235
 msgid "An example configuration of an authoritative server for two zones, one master and one slave, is:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:21046
+#: doc/guix.texi:21242
 #, no-wrap
 msgid ""
 "(define-zone-entries example.org.zone\n"
@@ -38538,7 +39111,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:21053
+#: doc/guix.texi:21249
 #, no-wrap
 msgid ""
 "(define master-zone\n"
@@ -38551,7 +39124,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:21059
+#: doc/guix.texi:21255
 #, no-wrap
 msgid ""
 "(define slave-zone\n"
@@ -38563,7 +39136,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:21064
+#: doc/guix.texi:21260
 #, no-wrap
 msgid ""
 "(define plop-master\n"
@@ -38574,7 +39147,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:21073
+#: doc/guix.texi:21269
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -38588,878 +39161,878 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21075
+#: doc/guix.texi:21271
 #, no-wrap
 msgid "{Scheme Variable} knot-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21077
+#: doc/guix.texi:21273
 msgid "This is the type for the Knot DNS server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21085
+#: doc/guix.texi:21281
 msgid "Knot DNS is an authoritative DNS server, meaning that it can serve multiple zones, that is to say domain names you would buy from a registrar.  This server is not a resolver, meaning that it can only resolve names for which it is authoritative.  This server can be configured to serve zones as a master server or a slave server as a per-zone basis.  Slave zones will get their data from masters, and will serve it as an authoritative server.  From the point of view of a resolver, there is no difference between master and slave."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21087
+#: doc/guix.texi:21283
 msgid "The following data types are used to configure the Knot DNS server:"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21089
+#: doc/guix.texi:21285
 #, no-wrap
 msgid "{Data Type} knot-key-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21092
+#: doc/guix.texi:21288
 msgid "Data type representing a key.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21094 doc/guix.texi:21114 doc/guix.texi:21229
-#: doc/guix.texi:21255 doc/guix.texi:21290
+#: doc/guix.texi:21290 doc/guix.texi:21310 doc/guix.texi:21425
+#: doc/guix.texi:21451 doc/guix.texi:21486
 #, no-wrap
 msgid "@code{id} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21097
+#: doc/guix.texi:21293
 msgid "An identifier for other configuration fields to refer to this key. IDs must be unique and must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21098
+#: doc/guix.texi:21294
 #, no-wrap
 msgid "@code{algorithm} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21102
+#: doc/guix.texi:21298
 msgid "The algorithm to use.  Choose between @code{#f}, @code{'hmac-md5}, @code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, @code{'hmac-sha384} and @code{'hmac-sha512}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21103
+#: doc/guix.texi:21299
 #, no-wrap
 msgid "@code{secret} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21105
+#: doc/guix.texi:21301
 msgid "The secret key itself."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21109
+#: doc/guix.texi:21305
 #, no-wrap
 msgid "{Data Type} knot-acl-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21112
+#: doc/guix.texi:21308
 msgid "Data type representing an Access Control List (ACL) configuration.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21117
+#: doc/guix.texi:21313
 msgid "An identifier for ether configuration fields to refer to this key. IDs must be unique and must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21118 doc/guix.texi:21233
+#: doc/guix.texi:21314 doc/guix.texi:21429
 #, no-wrap
 msgid "@code{address} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21122
+#: doc/guix.texi:21318
 msgid "An ordered list of IP addresses, network subnets, or network ranges represented with strings.  The query must match one of them.  Empty value means that address match is not required."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21123
+#: doc/guix.texi:21319
 #, no-wrap
 msgid "@code{key} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21127
+#: doc/guix.texi:21323
 msgid "An ordered list of references to keys represented with strings.  The string must match a key ID defined in a @code{knot-key-configuration}.  No key means that a key is not require to match that ACL."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21128
+#: doc/guix.texi:21324
 #, no-wrap
 msgid "@code{action} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21132
+#: doc/guix.texi:21328
 msgid "An ordered list of actions that are permitted or forbidden by this ACL.  Possible values are lists of zero or more elements from @code{'transfer}, @code{'notify} and @code{'update}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21133
+#: doc/guix.texi:21329
 #, no-wrap
 msgid "@code{deny?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21136
+#: doc/guix.texi:21332
 msgid "When true, the ACL defines restrictions.  Listed actions are forbidden.  When false, listed actions are allowed."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21140
+#: doc/guix.texi:21336
 #, no-wrap
 msgid "{Data Type} zone-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21143
-msgid "Data type represnting a record entry in a zone file.  This type has the following parameters:"
+#: doc/guix.texi:21339
+msgid "Data type representing a record entry in a zone file.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21145
+#: doc/guix.texi:21341
 #, no-wrap
 msgid "@code{name} (default: @code{\"@@\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21151
+#: doc/guix.texi:21347
 msgid "The name of the record.  @code{\"@@\"} refers to the origin of the zone.  Names are relative to the origin of the zone.  For example, in the @code{example.org} zone, @code{\"ns.example.org\"} actually refers to @code{ns.example.org.example.org}.  Names ending with a dot are absolute, which means that @code{\"ns.example.org.\"} refers to @code{ns.example.org}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21152
+#: doc/guix.texi:21348
 #, no-wrap
 msgid "@code{ttl} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21154
+#: doc/guix.texi:21350
 msgid "The Time-To-Live (TTL) of this record.  If not set, the default TTL is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21155
+#: doc/guix.texi:21351
 #, no-wrap
 msgid "@code{class} (default: @code{\"IN\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21158
+#: doc/guix.texi:21354
 msgid "The class of the record.  Knot currently supports only @code{\"IN\"} and partially @code{\"CH\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21159
+#: doc/guix.texi:21355
 #, no-wrap
 msgid "@code{type} (default: @code{\"A\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21163
+#: doc/guix.texi:21359
 msgid "The type of the record.  Common types include A (IPv4 address), AAAA (IPv6 address), NS (Name Server) and MX (Mail eXchange).  Many other types are defined."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21164
+#: doc/guix.texi:21360
 #, no-wrap
 msgid "@code{data} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21168
+#: doc/guix.texi:21364
 msgid "The data contained in the record.  For instance an IP address associated with an A record, or a domain name associated with an NS record.  Remember that domain names are relative to the origin unless they end with a dot."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21172
+#: doc/guix.texi:21368
 #, no-wrap
 msgid "{Data Type} zone-file"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21175
+#: doc/guix.texi:21371
 msgid "Data type representing the content of a zone file.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21184
+#: doc/guix.texi:21380
 msgid "The list of entries.  The SOA record is taken care of, so you don't need to put it in the list of entries.  This list should probably contain an entry for your primary authoritative DNS server.  Other than using a list of entries directly, you can use @code{define-zone-entries} to define a object containing the list of entries more easily, that you can later pass to the @code{entries} field of the @code{zone-file}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21185
+#: doc/guix.texi:21381
 #, no-wrap
 msgid "@code{origin} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21187
+#: doc/guix.texi:21383
 msgid "The name of your zone.  This parameter cannot be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21188
+#: doc/guix.texi:21384
 #, no-wrap
 msgid "@code{ns} (default: @code{\"ns\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21193
+#: doc/guix.texi:21389
 msgid "The domain of your primary authoritative DNS server.  The name is relative to the origin, unless it ends with a dot.  It is mandatory that this primary DNS server corresponds to an NS record in the zone and that it is associated to an IP address in the list of entries."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21194
+#: doc/guix.texi:21390
 #, no-wrap
 msgid "@code{mail} (default: @code{\"hostmaster\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21197
+#: doc/guix.texi:21393
 msgid "An email address people can contact you at, as the owner of the zone.  This is translated as @code{@@}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21198
+#: doc/guix.texi:21394
 #, no-wrap
 msgid "@code{serial} (default: @code{1})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21202
+#: doc/guix.texi:21398
 msgid "The serial number of the zone.  As this is used to keep track of changes by both slaves and resolvers, it is mandatory that it @emph{never} decreases.  Always increment it when you make a change in your zone."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21203
+#: doc/guix.texi:21399
 #, no-wrap
 msgid "@code{refresh} (default: @code{(* 2 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21207
+#: doc/guix.texi:21403
 msgid "The frequency at which slaves will do a zone transfer.  This value is a number of seconds.  It can be computed by multiplications or with @code{(string->duration)}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21208
+#: doc/guix.texi:21404
 #, no-wrap
 msgid "@code{retry} (default: @code{(* 15 60)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21211
+#: doc/guix.texi:21407
 msgid "The period after which a slave will retry to contact its master when it fails to do so a first time."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21212
+#: doc/guix.texi:21408
 #, no-wrap
 msgid "@code{expiry} (default: @code{(* 14 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21216
+#: doc/guix.texi:21412
 msgid "Default TTL of records.  Existing records are considered correct for at most this amount of time.  After this period, resolvers will invalidate their cache and check again that it still exists."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21217
+#: doc/guix.texi:21413
 #, no-wrap
 msgid "@code{nx} (default: @code{3600})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21220
+#: doc/guix.texi:21416
 msgid "Default TTL of inexistant records.  This delay is usually short because you want your new domains to reach everyone quickly."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21224
+#: doc/guix.texi:21420
 #, no-wrap
 msgid "{Data Type} knot-remote-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21227
+#: doc/guix.texi:21423
 msgid "Data type representing a remote configuration.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21232
+#: doc/guix.texi:21428
 msgid "An identifier for other configuration fields to refer to this remote. IDs must be unique and must not be empty."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21237
+#: doc/guix.texi:21433
 msgid "An ordered list of destination IP addresses.  Addresses are tried in sequence.  An optional port can be given with the @@ separator.  For instance: @code{(list \"1.2.3.4\" \"2.3.4.5@@53\")}.  Default port is 53."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21238
+#: doc/guix.texi:21434
 #, no-wrap
 msgid "@code{via} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21242
+#: doc/guix.texi:21438
 msgid "An ordered list of source IP addresses.  An empty list will have Knot choose an appropriate source IP.  An optional port can be given with the @@ separator.  The default is to choose at random."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21243
+#: doc/guix.texi:21439
 #, no-wrap
 msgid "@code{key} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21246
+#: doc/guix.texi:21442
 msgid "A reference to a key, that is a string containing the identifier of a key defined in a @code{knot-key-configuration} field."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21250
+#: doc/guix.texi:21446
 #, no-wrap
 msgid "{Data Type} knot-keystore-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21253
+#: doc/guix.texi:21449
 msgid "Data type representing a keystore to hold dnssec keys.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21257
+#: doc/guix.texi:21453
 msgid "The id of the keystore.  It must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21258
+#: doc/guix.texi:21454
 #, no-wrap
 msgid "@code{backend} (default: @code{'pem})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21260
+#: doc/guix.texi:21456
 msgid "The backend to store the keys in.  Can be @code{'pem} or @code{'pkcs11}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21261
+#: doc/guix.texi:21457
 #, no-wrap
 msgid "@code{config} (default: @code{\"/var/lib/knot/keys/keys\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21265
-msgid "The configuration string of the backend.  An example for the PKCS#11 is: @code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so\"}.  For the pem backend, the string reprensents a path in the file system."
+#: doc/guix.texi:21461
+msgid "The configuration string of the backend.  An example for the PKCS#11 is: @code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so\"}.  For the pem backend, the string represents a path in the file system."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21269
+#: doc/guix.texi:21465
 #, no-wrap
 msgid "{Data Type} knot-policy-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21273
+#: doc/guix.texi:21469
 msgid "Data type representing a dnssec policy.  Knot DNS is able to automatically sign your zones.  It can either generate and manage your keys automatically or use keys that you generate."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21280
+#: doc/guix.texi:21476
 msgid "Dnssec is usually implemented using two keys: a Key Signing Key (KSK) that is used to sign the second, and a Zone Signing Key (ZSK) that is used to sign the zone.  In order to be trusted, the KSK needs to be present in the parent zone (usually a top-level domain).  If your registrar supports dnssec, you will have to send them your KSK's hash so they can add a DS record in their zone.  This is not automated and need to be done each time you change your KSK."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21286
+#: doc/guix.texi:21482
 msgid "The policy also defines the lifetime of keys.  Usually, ZSK can be changed easily and use weaker cryptographic functions (they use lower parameters) in order to sign records quickly, so they are changed often.  The KSK however requires manual interaction with the registrar, so they are changed less often and use stronger parameters because they sign only one record."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21288
+#: doc/guix.texi:21484
 msgid "This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21292
+#: doc/guix.texi:21488
 msgid "The id of the policy.  It must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21293
+#: doc/guix.texi:21489
 #, no-wrap
 msgid "@code{keystore} (default: @code{\"default\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21298
+#: doc/guix.texi:21494
 msgid "A reference to a keystore, that is a string containing the identifier of a keystore defined in a @code{knot-keystore-configuration} field.  The @code{\"default\"} identifier means the default keystore (a kasp database that was setup by this service)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21299
+#: doc/guix.texi:21495
 #, no-wrap
 msgid "@code{manual?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21301
+#: doc/guix.texi:21497
 msgid "Whether the key management is manual or automatic."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21302
+#: doc/guix.texi:21498
 #, no-wrap
 msgid "@code{single-type-signing?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21304
+#: doc/guix.texi:21500
 msgid "When @code{#t}, use the Single-Type Signing Scheme."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21305
+#: doc/guix.texi:21501
 #, no-wrap
 msgid "@code{algorithm} (default: @code{\"ecdsap256sha256\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21307
+#: doc/guix.texi:21503
 msgid "An algorithm of signing keys and issued signatures."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21308
+#: doc/guix.texi:21504
 #, no-wrap
 msgid "@code{ksk-size} (default: @code{256})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21311
+#: doc/guix.texi:21507
 msgid "The length of the KSK.  Note that this value is correct for the default algorithm, but would be unsecure for other algorithms."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21312
+#: doc/guix.texi:21508
 #, no-wrap
 msgid "@code{zsk-size} (default: @code{256})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21315
+#: doc/guix.texi:21511
 msgid "The length of the ZSK.  Note that this value is correct for the default algorithm, but would be unsecure for other algorithms."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21316
+#: doc/guix.texi:21512
 #, no-wrap
 msgid "@code{dnskey-ttl} (default: @code{'default})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21319
+#: doc/guix.texi:21515
 msgid "The TTL value for DNSKEY records added into zone apex.  The special @code{'default} value means same as the zone SOA TTL."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21320
+#: doc/guix.texi:21516
 #, no-wrap
 msgid "@code{zsk-lifetime} (default: @code{(* 30 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21322
+#: doc/guix.texi:21518
 msgid "The period between ZSK publication and the next rollover initiation."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21323
+#: doc/guix.texi:21519
 #, no-wrap
 msgid "@code{propagation-delay} (default: @code{(* 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21326
+#: doc/guix.texi:21522
 msgid "An extra delay added for each key rollover step.  This value should be high enough to cover propagation of data from the master server to all slaves."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21327
+#: doc/guix.texi:21523
 #, no-wrap
 msgid "@code{rrsig-lifetime} (default: @code{(* 14 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21329
+#: doc/guix.texi:21525
 msgid "A validity period of newly issued signatures."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21330
+#: doc/guix.texi:21526
 #, no-wrap
 msgid "@code{rrsig-refresh} (default: @code{(* 7 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21332
+#: doc/guix.texi:21528
 msgid "A period how long before a signature expiration the signature will be refreshed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21333
+#: doc/guix.texi:21529
 #, no-wrap
 msgid "@code{nsec3?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21335
+#: doc/guix.texi:21531
 msgid "When @code{#t}, NSEC3 will be used instead of NSEC."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21336
+#: doc/guix.texi:21532
 #, no-wrap
 msgid "@code{nsec3-iterations} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21338
+#: doc/guix.texi:21534
 msgid "The number of additional times the hashing is performed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21339
+#: doc/guix.texi:21535
 #, no-wrap
 msgid "@code{nsec3-salt-length} (default: @code{8})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21342
+#: doc/guix.texi:21538
 msgid "The length of a salt field in octets, which is appended to the original owner name before hashing."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21343
+#: doc/guix.texi:21539
 #, no-wrap
 msgid "@code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21345
+#: doc/guix.texi:21541
 msgid "The validity period of newly issued salt field."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21349
+#: doc/guix.texi:21545
 #, no-wrap
 msgid "{Data Type} knot-zone-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21352
+#: doc/guix.texi:21548
 msgid "Data type representing a zone served by Knot.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21354
+#: doc/guix.texi:21550
 #, no-wrap
 msgid "@code{domain} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21356
+#: doc/guix.texi:21552
 msgid "The domain served by this configuration.  It must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21357
+#: doc/guix.texi:21553
 #, no-wrap
 msgid "@code{file} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21360
+#: doc/guix.texi:21556
 msgid "The file where this zone is saved.  This parameter is ignored by master zones.  Empty means default location that depends on the domain name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21361
+#: doc/guix.texi:21557
 #, no-wrap
 msgid "@code{zone} (default: @code{(zone-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21364
+#: doc/guix.texi:21560
 msgid "The content of the zone file.  This parameter is ignored by slave zones.  It must contain a zone-file record."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21365
+#: doc/guix.texi:21561
 #, no-wrap
 msgid "@code{master} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21368
+#: doc/guix.texi:21564
 msgid "A list of master remotes.  When empty, this zone is a master.  When set, this zone is a slave.  This is a list of remotes identifiers."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21369
+#: doc/guix.texi:21565
 #, no-wrap
 msgid "@code{ddns-master} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21372
+#: doc/guix.texi:21568
 msgid "The main master.  When empty, it defaults to the first master in the list of masters."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21373
+#: doc/guix.texi:21569
 #, no-wrap
 msgid "@code{notify} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21375
+#: doc/guix.texi:21571
 msgid "A list of slave remote identifiers."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21376
+#: doc/guix.texi:21572
 #, no-wrap
 msgid "@code{acl} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21378
+#: doc/guix.texi:21574
 msgid "A list of acl identifiers."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21379
+#: doc/guix.texi:21575
 #, no-wrap
 msgid "@code{semantic-checks?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21381
+#: doc/guix.texi:21577
 msgid "When set, this adds more semantic checks to the zone."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21382
+#: doc/guix.texi:21578
 #, no-wrap
 msgid "@code{disable-any?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21384
+#: doc/guix.texi:21580
 msgid "When set, this forbids queries of the ANY type."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21385
+#: doc/guix.texi:21581
 #, no-wrap
 msgid "@code{zonefile-sync} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21388
+#: doc/guix.texi:21584
 msgid "The delay between a modification in memory and on disk.  0 means immediate synchronization."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21389
+#: doc/guix.texi:21585
 #, no-wrap
 msgid "@code{zonefile-load} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21392
+#: doc/guix.texi:21588
 msgid "The way the zone file contents are applied during zone load.  Possible values are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21394
+#: doc/guix.texi:21590
 #, no-wrap
 msgid "@code{#f} for using the default value from Knot,"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21395
+#: doc/guix.texi:21591
 #, no-wrap
 msgid "@code{'none} for not using the zone file at all,"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21396
+#: doc/guix.texi:21592
 #, no-wrap
 msgid "@code{'difference} for computing the difference between already available"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21398
+#: doc/guix.texi:21594
 msgid "contents and zone contents and applying it to the current zone contents,"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21398
+#: doc/guix.texi:21594
 #, no-wrap
 msgid "@code{'difference-no-serial} for the same as @code{'difference}, but"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21401
+#: doc/guix.texi:21597
 msgid "ignoring the SOA serial in the zone file, while the server takes care of it automatically."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21401
+#: doc/guix.texi:21597
 #, no-wrap
 msgid "@code{'whole} for loading zone contents from the zone file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21404
+#: doc/guix.texi:21600
 #, no-wrap
 msgid "@code{journal-content} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21409
+#: doc/guix.texi:21605
 msgid "The way the journal is used to store zone and its changes.  Possible values are @code{'none} to not use it at all, @code{'changes} to store changes and @code{'all} to store contents.  @code{#f} does not set this option, so the default value from Knot is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21410
+#: doc/guix.texi:21606
 #, no-wrap
 msgid "@code{max-journal-usage} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21413
+#: doc/guix.texi:21609
 msgid "The maximum size for the journal on disk.  @code{#f} does not set this option, so the default value from Knot is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21414
+#: doc/guix.texi:21610
 #, no-wrap
 msgid "@code{max-journal-depth} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21417
+#: doc/guix.texi:21613
 msgid "The maximum size of the history.  @code{#f} does not set this option, so the default value from Knot is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21418
+#: doc/guix.texi:21614
 #, no-wrap
 msgid "@code{max-zone-size} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21422
+#: doc/guix.texi:21618
 msgid "The maximum size of the zone file.  This limit is enforced for incoming transfer and updates.  @code{#f} does not set this option, so the default value from Knot is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21423
+#: doc/guix.texi:21619
 #, no-wrap
 msgid "@code{dnssec-policy} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21427
+#: doc/guix.texi:21623
 msgid "A reference to a @code{knot-policy-configuration} record, or the special name @code{\"default\"}.  If the value is @code{#f}, there is no dnssec signing on this zone."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21428
+#: doc/guix.texi:21624
 #, no-wrap
 msgid "@code{serial-policy} (default: @code{'increment})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21430
+#: doc/guix.texi:21626
 msgid "A policy between @code{'increment} and @code{'unixtime}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21434
+#: doc/guix.texi:21630
 #, no-wrap
 msgid "{Data Type} knot-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21437
+#: doc/guix.texi:21633
 msgid "Data type representing the Knot configuration.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21439
+#: doc/guix.texi:21635
 #, no-wrap
 msgid "@code{knot} (default: @code{knot})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21441
+#: doc/guix.texi:21637
 msgid "The Knot package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21442
+#: doc/guix.texi:21638
 #, no-wrap
 msgid "@code{run-directory} (default: @code{\"/var/run/knot\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21444
+#: doc/guix.texi:21640
 msgid "The run directory.  This directory will be used for pid file and sockets."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21445
+#: doc/guix.texi:21641
 #, no-wrap
 msgid "@code{includes} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21448
+#: doc/guix.texi:21644
 msgid "A list of strings or file-like objects denoting other files that must be included at the top of the configuration file."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21449
+#: doc/guix.texi:21645
 #, no-wrap
 msgid "secrets, Knot service"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21455
+#: doc/guix.texi:21651
 msgid "This can be used to manage secrets out-of-band.  For example, secret keys may be stored in an out-of-band file not managed by Guix, and thus not visible in @file{/gnu/store}---e.g., you could store secret key configuration in @file{/etc/knot/secrets.conf} and add this file to the @code{includes} list."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21460
+#: doc/guix.texi:21656
 msgid "One can generate a secret tsig key (for nsupdate and zone transfers with the keymgr command from the knot package.  Note that the package is not automatically installed by the service.  The following example shows how to generate a new tsig key:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21464
+#: doc/guix.texi:21660
 #, no-wrap
 msgid ""
 "keymgr -t mysecret > /etc/knot/secrets.conf\n"
@@ -39467,107 +40040,107 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21470
+#: doc/guix.texi:21666
 msgid "Also note that the generated key will be named @var{mysecret}, so it is the name that needs to be used in the @var{key} field of the @code{knot-acl-configuration} record and in other places that need to refer to that key."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21472
+#: doc/guix.texi:21668
 msgid "It can also be used to add configuration not supported by this interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21473
+#: doc/guix.texi:21669
 #, no-wrap
 msgid "@code{listen-v4} (default: @code{\"0.0.0.0\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21475 doc/guix.texi:21478
+#: doc/guix.texi:21671 doc/guix.texi:21674
 msgid "An ip address on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21476
+#: doc/guix.texi:21672
 #, no-wrap
 msgid "@code{listen-v6} (default: @code{\"::\"})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21479
+#: doc/guix.texi:21675
 #, no-wrap
 msgid "@code{listen-port} (default: @code{53})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21481
+#: doc/guix.texi:21677
 msgid "A port on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21482
+#: doc/guix.texi:21678
 #, no-wrap
 msgid "@code{keys} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21484
+#: doc/guix.texi:21680
 msgid "The list of knot-key-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21485
+#: doc/guix.texi:21681
 #, no-wrap
 msgid "@code{acls} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21487
+#: doc/guix.texi:21683
 msgid "The list of knot-acl-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21488
+#: doc/guix.texi:21684
 #, no-wrap
 msgid "@code{remotes} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21490
+#: doc/guix.texi:21686
 msgid "The list of knot-remote-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21491
+#: doc/guix.texi:21687
 #, no-wrap
 msgid "@code{zones} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21493
+#: doc/guix.texi:21689
 msgid "The list of knot-zone-configuration used by this configuration."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:21497
+#: doc/guix.texi:21693
 #, fuzzy, no-wrap
 #| msgid "Kerberos Services"
 msgid "Knot Resolver Service"
 msgstr "Сервисы Kerberos"
 
 #. type: deffn
-#: doc/guix.texi:21499
+#: doc/guix.texi:21695
 #, no-wrap
 msgid "{Scheme Variable} knot-resolver-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21502
+#: doc/guix.texi:21698
 msgid "This this the type of the knot resolver service, whose value should be an @code{knot-resolver-configuration} object as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:21512
+#: doc/guix.texi:21708
 #, no-wrap
 msgid ""
 "(service knot-resolver-service-type\n"
@@ -39581,78 +40154,78 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21515
+#: doc/guix.texi:21711
 msgid "For more information, refer its @url{https://knot-resolver.readthedocs.org/en/stable/daemon.html#configuration, manual}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21517
+#: doc/guix.texi:21713
 #, no-wrap
 msgid "{Data Type} knot-resolver-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21519
+#: doc/guix.texi:21715
 #, fuzzy
 #| msgid "Manage the operating system configuration."
 msgid "Data type representing the configuration of knot-resolver."
 msgstr "Управление конфигурацией операционной системы."
 
 #. type: item
-#: doc/guix.texi:21521
+#: doc/guix.texi:21717
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{package} (default: @var{knot-resolver})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:21523
+#: doc/guix.texi:21719
 msgid "Package object of the knot DNS resolver."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21524
+#: doc/guix.texi:21720
 #, fuzzy, no-wrap
 #| msgid "@code{compression-level} (default: @code{3})"
 msgid "@code{kresd-config-file} (default: %kresd.conf)"
 msgstr "@code{compression-level} (default: @code{3})"
 
 #. type: table
-#: doc/guix.texi:21527
+#: doc/guix.texi:21723
 msgid "File-like object of the kresd configuration file to use, by default it will listen on @code{127.0.0.1} and @code{::1}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21528
+#: doc/guix.texi:21724
 #, fuzzy, no-wrap
 #| msgid "@code{parallel-builds} (default: @code{1})"
 msgid "@code{garbage-collection-interval} (default: 1000)"
 msgstr "@code{parallel-builds} (default: @code{1})"
 
 #. type: table
-#: doc/guix.texi:21530
+#: doc/guix.texi:21726
 msgid "Number of milliseconds for @code{kres-cache-gc} to periodically trim the cache."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:21535
+#: doc/guix.texi:21731
 #, no-wrap
 msgid "Dnsmasq Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21537
+#: doc/guix.texi:21733
 #, no-wrap
 msgid "{Scheme Variable} dnsmasq-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21540
+#: doc/guix.texi:21736
 msgid "This is the type of the dnsmasq service, whose value should be an @code{dnsmasq-configuration} object as in this example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:21546
+#: doc/guix.texi:21742
 #, no-wrap
 msgid ""
 "(service dnsmasq-service-type\n"
@@ -39662,978 +40235,1011 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21549
+#: doc/guix.texi:21745
 #, no-wrap
 msgid "{Data Type} dnsmasq-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21551
+#: doc/guix.texi:21747
 msgid "Data type representing the configuration of dnsmasq."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21553
+#: doc/guix.texi:21749
 #, no-wrap
 msgid "@code{package} (default: @var{dnsmasq})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21555
+#: doc/guix.texi:21751
 msgid "Package object of the dnsmasq server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21556
+#: doc/guix.texi:21752
 #, no-wrap
 msgid "@code{no-hosts?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21558
+#: doc/guix.texi:21754
 msgid "When true, don't read the hostnames in /etc/hosts."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21559
+#: doc/guix.texi:21755
 #, no-wrap
 msgid "@code{port} (default: @code{53})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21562
+#: doc/guix.texi:21758
 msgid "The port to listen on.  Setting this to zero completely disables DNS responses, leaving only DHCP and/or TFTP functions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21563
+#: doc/guix.texi:21759
 #, no-wrap
 msgid "@code{local-service?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21566
+#: doc/guix.texi:21762
 msgid "Accept DNS queries only from hosts whose address is on a local subnet, ie a subnet for which an interface exists on the server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21567
+#: doc/guix.texi:21763
 #, no-wrap
 msgid "@code{listen-addresses} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21569
+#: doc/guix.texi:21765
 msgid "Listen on the given IP addresses."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21570
+#: doc/guix.texi:21766
 #, no-wrap
 msgid "@code{resolv-file} (default: @code{\"/etc/resolv.conf\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21572
+#: doc/guix.texi:21768
 msgid "The file to read the IP address of the upstream nameservers from."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21573
+#: doc/guix.texi:21769
 #, no-wrap
 msgid "@code{no-resolv?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21575
+#: doc/guix.texi:21771
 msgid "When true, don't read @var{resolv-file}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21576
+#: doc/guix.texi:21772
 #, no-wrap
 msgid "@code{servers} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21578
+#: doc/guix.texi:21774
 msgid "Specify IP address of upstream servers directly."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21579
+#: doc/guix.texi:21775
 #, no-wrap
 msgid "@code{cache-size} (default: @code{150})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21582
+#: doc/guix.texi:21778
 msgid "Set the size of dnsmasq's cache.  Setting the cache size to zero disables caching."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21583
+#: doc/guix.texi:21779
 #, no-wrap
 msgid "@code{negative-cache?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21585
+#: doc/guix.texi:21781
 msgid "When false, disable negative caching."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:21589
+#: doc/guix.texi:21785
 #, no-wrap
 msgid "ddclient Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21591
+#: doc/guix.texi:21787
 #, no-wrap
 msgid "ddclient"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21595
+#: doc/guix.texi:21791
 msgid "The ddclient service described below runs the ddclient daemon, which takes care of automatically updating DNS entries for service providers such as @uref{https://dyn.com/dns/, Dyn}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21598
+#: doc/guix.texi:21794
 msgid "The following example show instantiates the service with its default configuration:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:21601
+#: doc/guix.texi:21797
 #, no-wrap
 msgid "(service ddclient-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21610
+#: doc/guix.texi:21806
 msgid "Note that ddclient needs to access credentials that are stored in a @dfn{secret file}, by default @file{/etc/ddclient/secrets} (see @code{secret-file} below.)  You are expected to create this file manually, in an ``out-of-band'' fashion (you @emph{could} make this file part of the service configuration, for instance by using @code{plain-file}, but it will be world-readable @i{via} @file{/gnu/store}.)  See the examples in the @file{share/ddclient} directory of the @code{ddclient} package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21614
+#: doc/guix.texi:21810
 msgid "Available @code{ddclient-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21615
+#: doc/guix.texi:21811
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} package ddclient"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21617
+#: doc/guix.texi:21813
 msgid "The ddclient package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21620
+#: doc/guix.texi:21816
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} integer daemon"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21622
+#: doc/guix.texi:21818
 msgid "The period after which ddclient will retry to check IP and domain name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21627
+#: doc/guix.texi:21823
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} boolean syslog"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21629
+#: doc/guix.texi:21825
 msgid "Use syslog for the output."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21634
+#: doc/guix.texi:21830
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string mail"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21636
+#: doc/guix.texi:21832
 msgid "Mail to user."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21638 doc/guix.texi:21645 doc/guix.texi:23120
+#: doc/guix.texi:21834 doc/guix.texi:21841 doc/guix.texi:23341
 msgid "Defaults to @samp{\"root\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21641
+#: doc/guix.texi:21837
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string mail-failure"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21643
+#: doc/guix.texi:21839
 msgid "Mail failed update to user."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21648
+#: doc/guix.texi:21844
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string pid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21650
+#: doc/guix.texi:21846
 msgid "The ddclient PID file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21652
+#: doc/guix.texi:21848
 msgid "Defaults to @samp{\"/var/run/ddclient/ddclient.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21655
+#: doc/guix.texi:21851
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} boolean ssl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21657
+#: doc/guix.texi:21853
 msgid "Enable SSL support."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21662
+#: doc/guix.texi:21858
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21665
+#: doc/guix.texi:21861
 msgid "Specifies the user name or ID that is used when running ddclient program."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21667 doc/guix.texi:21674
+#: doc/guix.texi:21863 doc/guix.texi:21870
 msgid "Defaults to @samp{\"ddclient\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21670
+#: doc/guix.texi:21866
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21672
+#: doc/guix.texi:21868
 msgid "Group of the user who will run the ddclient program."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21677
+#: doc/guix.texi:21873
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string secret-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21681
+#: doc/guix.texi:21877
 msgid "Secret file which will be appended to @file{ddclient.conf} file.  This file contains credentials for use by ddclient.  You are expected to create it manually."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21683
+#: doc/guix.texi:21879
 msgid "Defaults to @samp{\"/etc/ddclient/secrets.conf\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21686
+#: doc/guix.texi:21882
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} list extra-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21688
+#: doc/guix.texi:21884
 msgid "Extra options will be appended to @file{ddclient.conf} file."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21699
+#: doc/guix.texi:21895
 #, no-wrap
 msgid "VPN (virtual private network)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21700
+#: doc/guix.texi:21896
 #, no-wrap
 msgid "virtual private network (VPN)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21706
+#: doc/guix.texi:21902
 msgid "The @code{(gnu services vpn)} module provides services related to @dfn{virtual private networks} (VPNs).  It provides a @emph{client} service for your machine to connect to a VPN, and a @emph{server} service for your machine to host a VPN.  Both services use @uref{https://openvpn.net/, OpenVPN}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21707
+#: doc/guix.texi:21903
 #, no-wrap
 msgid "{Scheme Procedure} openvpn-client-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21709
+#: doc/guix.texi:21905
 msgid "[#:config (openvpn-client-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21711
+#: doc/guix.texi:21907
 msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a client."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21713
+#: doc/guix.texi:21909
 #, no-wrap
 msgid "{Scheme Procedure} openvpn-server-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21715
+#: doc/guix.texi:21911
 msgid "[#:config (openvpn-server-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21717
+#: doc/guix.texi:21913
 msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21719
+#: doc/guix.texi:21915
 msgid "Both can be run simultaneously."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21724
+#: doc/guix.texi:21920
 msgid "Available @code{openvpn-client-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21725
+#: doc/guix.texi:21921
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} package openvpn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21727 doc/guix.texi:21863
+#: doc/guix.texi:21923 doc/guix.texi:22074
 msgid "The OpenVPN package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21730
+#: doc/guix.texi:21926
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21732 doc/guix.texi:21868
+#: doc/guix.texi:21928 doc/guix.texi:22079
 msgid "The OpenVPN pid file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21734 doc/guix.texi:21870
+#: doc/guix.texi:21930 doc/guix.texi:22081
 msgid "Defaults to @samp{\"/var/run/openvpn/openvpn.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21737
+#: doc/guix.texi:21933
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} proto proto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21740 doc/guix.texi:21876
+#: doc/guix.texi:21936 doc/guix.texi:22087
 msgid "The protocol (UDP or TCP) used to open a channel between clients and servers."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21742 doc/guix.texi:21878
+#: doc/guix.texi:21938 doc/guix.texi:22089
 msgid "Defaults to @samp{udp}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21745
+#: doc/guix.texi:21941
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} dev dev"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21747 doc/guix.texi:21883
+#: doc/guix.texi:21943 doc/guix.texi:22094
 msgid "The device type used to represent the VPN connection."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21749 doc/guix.texi:21885
+#: doc/guix.texi:21945 doc/guix.texi:22096
 msgid "Defaults to @samp{tun}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21752
+#: doc/guix.texi:21948
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string ca"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21754 doc/guix.texi:21890
+#: doc/guix.texi:21950 doc/guix.texi:22101
 msgid "The certificate authority to check connections against."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21756 doc/guix.texi:21892
+#: doc/guix.texi:21952 doc/guix.texi:22103
 msgid "Defaults to @samp{\"/etc/openvpn/ca.crt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21759
+#: doc/guix.texi:21955
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21762 doc/guix.texi:21898
+#: doc/guix.texi:21958 doc/guix.texi:22109
 msgid "The certificate of the machine the daemon is running on.  It should be signed by the authority given in @code{ca}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21764 doc/guix.texi:21900
+#: doc/guix.texi:21960 doc/guix.texi:22111
 msgid "Defaults to @samp{\"/etc/openvpn/client.crt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21767
+#: doc/guix.texi:21963
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21770 doc/guix.texi:21906
+#: doc/guix.texi:21966 doc/guix.texi:22117
 msgid "The key of the machine the daemon is running on.  It must be the key whose certificate is @code{cert}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21772 doc/guix.texi:21908
+#: doc/guix.texi:21968 doc/guix.texi:22119
 msgid "Defaults to @samp{\"/etc/openvpn/client.key\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21775
+#: doc/guix.texi:21971
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean comp-lzo?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21777 doc/guix.texi:21913
+#: doc/guix.texi:21973 doc/guix.texi:22124
 msgid "Whether to use the lzo compression algorithm."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21782
+#: doc/guix.texi:21978
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean persist-key?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21784 doc/guix.texi:21920
+#: doc/guix.texi:21980 doc/guix.texi:22131
 msgid "Don't re-read key files across SIGUSR1 or --ping-restart."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21789
+#: doc/guix.texi:21985
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean persist-tun?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21792 doc/guix.texi:21928
+#: doc/guix.texi:21988 doc/guix.texi:22139
 msgid "Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 or --ping-restart restarts."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21797
+#: doc/guix.texi:21993
+#, no-wrap
+msgid "{@code{openvpn-client-configuration} parameter} boolean fast-io?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:21996 doc/guix.texi:22147
+msgid "(Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to poll/epoll/select prior to the write operation."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:22000
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} number verbosity"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21799 doc/guix.texi:21935
+#: doc/guix.texi:22002 doc/guix.texi:22153
 msgid "Verbosity level."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21801 doc/guix.texi:21937 doc/guix.texi:23388
-#: doc/guix.texi:23611
+#: doc/guix.texi:22004 doc/guix.texi:22155 doc/guix.texi:23609
+#: doc/guix.texi:23832
 msgid "Defaults to @samp{3}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21804
+#: doc/guix.texi:22007
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} tls-auth-client tls-auth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21807 doc/guix.texi:21943
+#: doc/guix.texi:22010 doc/guix.texi:22161
 msgid "Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21812
+#: doc/guix.texi:22015
+#, no-wrap
+msgid "{@code{openvpn-client-configuration} parameter} maybe-string auth-user-pass"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:22019
+msgid "Authenticate with server using username/password.  The option is a file containing username/password on 2 lines.  Do not use a file-like object as it would be added to the store and readable by any user."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:22021
+msgid "Defaults to @samp{'disabled}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:22023
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21814
+#: doc/guix.texi:22025
 msgid "Whether to check the server certificate has server usage extension."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21819
+#: doc/guix.texi:22030
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} bind bind?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21821
+#: doc/guix.texi:22032
 msgid "Bind to a specific local port number."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21826
+#: doc/guix.texi:22037
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21828
+#: doc/guix.texi:22039
 msgid "Retry resolving server address."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21833
+#: doc/guix.texi:22044
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} openvpn-remote-list remote"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21835
+#: doc/guix.texi:22046
 msgid "A list of remote servers to connect to."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21839
+#: doc/guix.texi:22050
 msgid "Available @code{openvpn-remote-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21840
+#: doc/guix.texi:22051
 #, no-wrap
 msgid "{@code{openvpn-remote-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21842
+#: doc/guix.texi:22053
 msgid "Server name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21844
+#: doc/guix.texi:22055
 msgid "Defaults to @samp{\"my-server\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21847
+#: doc/guix.texi:22058
 #, no-wrap
 msgid "{@code{openvpn-remote-configuration} parameter} number port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21849
+#: doc/guix.texi:22060
 msgid "Port number the server listens to."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21851 doc/guix.texi:21952
+#: doc/guix.texi:22062 doc/guix.texi:22170
 msgid "Defaults to @samp{1194}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21860
+#: doc/guix.texi:22071
 msgid "Available @code{openvpn-server-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21861
+#: doc/guix.texi:22072
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} package openvpn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21866
+#: doc/guix.texi:22077
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21873
+#: doc/guix.texi:22084
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} proto proto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21881
+#: doc/guix.texi:22092
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} dev dev"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21888
+#: doc/guix.texi:22099
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string ca"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21895
+#: doc/guix.texi:22106
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21903
+#: doc/guix.texi:22114
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21911
+#: doc/guix.texi:22122
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean comp-lzo?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21918
+#: doc/guix.texi:22129
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean persist-key?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21925
+#: doc/guix.texi:22136
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean persist-tun?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21933
+#: doc/guix.texi:22144
+#, no-wrap
+msgid "{@code{openvpn-server-configuration} parameter} boolean fast-io?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:22151
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number verbosity"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21940
+#: doc/guix.texi:22158
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} tls-auth-server tls-auth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21948
+#: doc/guix.texi:22166
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21950
+#: doc/guix.texi:22168
 msgid "Specifies the port number on which the server listens."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21955
+#: doc/guix.texi:22173
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} ip-mask server"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21957
+#: doc/guix.texi:22175
 msgid "An ip and mask specifying the subnet inside the virtual network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21959
+#: doc/guix.texi:22177
 msgid "Defaults to @samp{\"10.8.0.0 255.255.255.0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21962
+#: doc/guix.texi:22180
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} cidr6 server-ipv6"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21964
+#: doc/guix.texi:22182
 msgid "A CIDR notation specifying the IPv6 subnet inside the virtual network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21969
+#: doc/guix.texi:22187
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string dh"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21971
+#: doc/guix.texi:22189
 msgid "The Diffie-Hellman parameters file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21973
+#: doc/guix.texi:22191
 msgid "Defaults to @samp{\"/etc/openvpn/dh2048.pem\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21976
+#: doc/guix.texi:22194
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string ifconfig-pool-persist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21978
+#: doc/guix.texi:22196
 msgid "The file that records client IPs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21980
+#: doc/guix.texi:22198
 msgid "Defaults to @samp{\"/etc/openvpn/ipp.txt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21983
+#: doc/guix.texi:22201
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} gateway redirect-gateway?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21985
+#: doc/guix.texi:22203
 msgid "When true, the server will act as a gateway for its clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21990
+#: doc/guix.texi:22208
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean client-to-client?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21992
+#: doc/guix.texi:22210
 msgid "When true, clients are allowed to talk to each other inside the VPN."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21997
+#: doc/guix.texi:22215
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} keepalive keepalive"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22003
+#: doc/guix.texi:22221
 msgid "Causes ping-like messages to be sent back and forth over the link so that each side knows when the other side has gone down.  @code{keepalive} requires a pair.  The first element is the period of the ping sending, and the second element is the timeout before considering the other side down."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22006
+#: doc/guix.texi:22224
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22008
+#: doc/guix.texi:22226
 msgid "The maximum number of clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22013
+#: doc/guix.texi:22231
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string status"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22016
+#: doc/guix.texi:22234
 msgid "The status file.  This file shows a small report on current connection.  It is truncated and rewritten every minute."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22018
+#: doc/guix.texi:22236
 msgid "Defaults to @samp{\"/var/run/openvpn/status\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22021
+#: doc/guix.texi:22239
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} openvpn-ccd-list client-config-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22023
+#: doc/guix.texi:22241
 msgid "The list of configuration for some clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22027
+#: doc/guix.texi:22245
 msgid "Available @code{openvpn-ccd-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22028
+#: doc/guix.texi:22246
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22030
+#: doc/guix.texi:22248
 msgid "Client name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22032
+#: doc/guix.texi:22250
 msgid "Defaults to @samp{\"client\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22035
+#: doc/guix.texi:22253
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask iroute"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22037
+#: doc/guix.texi:22255
 msgid "Client own network"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22042
+#: doc/guix.texi:22260
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask ifconfig-push"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22044
+#: doc/guix.texi:22262
 msgid "Client VPN IP."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22057
+#: doc/guix.texi:22275
 #, no-wrap
 msgid "NFS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22062
+#: doc/guix.texi:22280
 msgid "The @code{(gnu services nfs)} module provides the following services, which are most commonly used in relation to mounting or exporting directory trees as @dfn{network file systems} (NFS)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22066
+#: doc/guix.texi:22284
 msgid "While it is possible to use the individual components that together make up a Network File System service, we recommended to configure an NFS server with the @code{nfs-service-type}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:22067
+#: doc/guix.texi:22285
 #, fuzzy, no-wrap
 #| msgid "DNS Services"
 msgid "NFS Service"
 msgstr "Сервисы DNS"
 
 #. type: cindex
-#: doc/guix.texi:22068
+#: doc/guix.texi:22286
 #, fuzzy, no-wrap
 #| msgid "Web servers."
 msgid "NFS, server"
 msgstr "Веб-серверы."
 
 #. type: Plain text
-#: doc/guix.texi:22073
+#: doc/guix.texi:22291
 msgid "The NFS service takes care of setting up all NFS component services, kernel configuration file systems, and installs configuration files in the locations that NFS expects."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22074
+#: doc/guix.texi:22292
 #, no-wrap
 msgid "{Scheme Variable} nfs-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22076
+#: doc/guix.texi:22294
 msgid "A service type for a complete NFS server."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22078
+#: doc/guix.texi:22296
 #, fuzzy, no-wrap
 #| msgid "System Configuration"
 msgid "{Data Type} nfs-configuration"
 msgstr "Конфигурирование системы"
 
 #. type: deftp
-#: doc/guix.texi:22081
+#: doc/guix.texi:22299
 msgid "This data type represents the configuration of the NFS service and all of its subsystems."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22083
+#: doc/guix.texi:22301
 #, fuzzy
 #| msgid "GNU Guix depends on the following packages:"
 msgid "It has the following parameters:"
 msgstr "GNU Guix зависит от следующих пакетов:"
 
 #. type: item
-#: doc/guix.texi:22084 doc/guix.texi:22203 doc/guix.texi:22228
+#: doc/guix.texi:22302 doc/guix.texi:22421 doc/guix.texi:22446
 #, no-wrap
 msgid "@code{nfs-utils} (default: @code{nfs-utils})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22086
+#: doc/guix.texi:22304
 #, fuzzy
 #| msgid "The package data type."
 msgid "The nfs-utils package to use."
 msgstr "Тип данных пакет"
 
 #. type: item
-#: doc/guix.texi:22087
+#: doc/guix.texi:22305
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
-msgid "@code{nfs-version} (default: @code{#f})"
+msgid "@code{nfs-versions} (default: @code{'(\"4.2\" \"4.1\" \"4.0\")})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:22090
-msgid "If a string value is provided, the @command{rpc.nfsd} daemon will be limited to supporting the given version of the NFS protocol."
+#: doc/guix.texi:22308
+msgid "If a list of string values is provided, the @command{rpc.nfsd} daemon will be limited to supporting the given versions of the NFS protocol."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22091
+#: doc/guix.texi:22309
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{exports} (default: @code{'()})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:22096
+#: doc/guix.texi:22314
 msgid "This is a list of directories the NFS server should export.  Each entry is a list consisting of two elements: a directory name and a string containing all options.  This is an example in which the directory @file{/export} is served to all NFS clients as a read-only share:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:22102
+#: doc/guix.texi:22320
 #, no-wrap
 msgid ""
 "(nfs-configuration\n"
@@ -40643,369 +41249,369 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22104
+#: doc/guix.texi:22322
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{rpcmountd-port} (default: @code{#f})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:22106
+#: doc/guix.texi:22324
 msgid "The network port that the @command{rpc.mountd} daemon should use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22107
+#: doc/guix.texi:22325
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{rpcstatd-port} (default: @code{#f})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:22109
+#: doc/guix.texi:22327
 msgid "The network port that the @command{rpc.statd} daemon should use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22110 doc/guix.texi:22152
+#: doc/guix.texi:22328 doc/guix.texi:22370
 #, no-wrap
 msgid "@code{rpcbind} (default: @code{rpcbind})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22112 doc/guix.texi:22154
+#: doc/guix.texi:22330 doc/guix.texi:22372
 msgid "The rpcbind package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22113
+#: doc/guix.texi:22331
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{idmap-domain} (default: @code{\"localdomain\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:22115
+#: doc/guix.texi:22333
 msgid "The local NFSv4 domain name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22116
+#: doc/guix.texi:22334
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{nfsd-port} (default: @code{2049})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:22118
+#: doc/guix.texi:22336
 msgid "The network port that the @command{nfsd} daemon should use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22119
+#: doc/guix.texi:22337
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{nfsd-threads} (default: @code{8})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:22121
+#: doc/guix.texi:22339
 msgid "The number of threads used by the @command{nfsd} daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22122 doc/guix.texi:22206 doc/guix.texi:22231
+#: doc/guix.texi:22340 doc/guix.texi:22424 doc/guix.texi:22449
 #, no-wrap
 msgid "@code{pipefs-directory} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22124 doc/guix.texi:22208 doc/guix.texi:22233
+#: doc/guix.texi:22342 doc/guix.texi:22426 doc/guix.texi:22451
 msgid "The directory where the pipefs file system is mounted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22125
+#: doc/guix.texi:22343
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{debug} (default: @code{'()\"})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:22129
+#: doc/guix.texi:22347
 msgid "A list of subsystems for which debugging output should be enabled.  This is a list of symbols.  Any of these symbols are valid: @code{nfsd}, @code{nfs}, @code{rpc}, @code{idmap}, @code{statd}, or @code{mountd}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22134
+#: doc/guix.texi:22352
 msgid "If you don't need a complete NFS service or prefer to build it yourself you can use the individual component services that are documented below."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:22135
+#: doc/guix.texi:22353
 #, no-wrap
 msgid "RPC Bind Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22136
+#: doc/guix.texi:22354
 #, no-wrap
 msgid "rpcbind"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22142
+#: doc/guix.texi:22360
 msgid "The RPC Bind service provides a facility to map program numbers into universal addresses.  Many NFS related services use this facility.  Hence it is automatically started when a dependent service starts."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22143
+#: doc/guix.texi:22361
 #, no-wrap
 msgid "{Scheme Variable} rpcbind-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22145
+#: doc/guix.texi:22363
 msgid "A service type for the RPC portmapper daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22148
+#: doc/guix.texi:22366
 #, no-wrap
 msgid "{Data Type} rpcbind-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22151
+#: doc/guix.texi:22369
 msgid "Data type representing the configuration of the RPC Bind Service.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22155
+#: doc/guix.texi:22373
 #, no-wrap
 msgid "@code{warm-start?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22159
+#: doc/guix.texi:22377
 msgid "If this parameter is @code{#t}, then the daemon will read a state file on startup thus reloading state information saved by a previous instance."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:22163
+#: doc/guix.texi:22381
 #, no-wrap
 msgid "Pipefs Pseudo File System"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22164
+#: doc/guix.texi:22382
 #, no-wrap
 msgid "pipefs"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22165
+#: doc/guix.texi:22383
 #, no-wrap
 msgid "rpc_pipefs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22169
+#: doc/guix.texi:22387
 msgid "The pipefs file system is used to transfer NFS related data between the kernel and user space programs."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22170
+#: doc/guix.texi:22388
 #, no-wrap
 msgid "{Scheme Variable} pipefs-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22172
+#: doc/guix.texi:22390
 msgid "A service type for the pipefs pseudo file system."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22174
+#: doc/guix.texi:22392
 #, no-wrap
 msgid "{Data Type} pipefs-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22177
+#: doc/guix.texi:22395
 msgid "Data type representing the configuration of the pipefs pseudo file system service.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22178
+#: doc/guix.texi:22396
 #, no-wrap
 msgid "@code{mount-point} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22180
+#: doc/guix.texi:22398
 msgid "The directory to which the file system is to be attached."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:22184
+#: doc/guix.texi:22402
 #, no-wrap
 msgid "GSS Daemon Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22185
+#: doc/guix.texi:22403
 #, no-wrap
 msgid "GSSD"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22186
+#: doc/guix.texi:22404
 #, no-wrap
 msgid "GSS"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22187
+#: doc/guix.texi:22405
 #, no-wrap
 msgid "global security system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22194
+#: doc/guix.texi:22412
 msgid "The @dfn{global security system} (GSS) daemon provides strong security for RPC based protocols.  Before exchanging RPC requests an RPC client must establish a security context.  Typically this is done using the Kerberos command @command{kinit} or automatically at login time using PAM services (@pxref{Kerberos Services})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22195
+#: doc/guix.texi:22413
 #, no-wrap
 msgid "{Scheme Variable} gss-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22197
+#: doc/guix.texi:22415
 msgid "A service type for the Global Security System (GSS) daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22199
+#: doc/guix.texi:22417
 #, no-wrap
 msgid "{Data Type} gss-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22202
+#: doc/guix.texi:22420
 msgid "Data type representing the configuration of the GSS daemon service.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22205
+#: doc/guix.texi:22423
 msgid "The package in which the @command{rpc.gssd} command is to be found."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:22213
+#: doc/guix.texi:22431
 #, no-wrap
 msgid "IDMAP Daemon Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22214
+#: doc/guix.texi:22432
 #, no-wrap
 msgid "idmapd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22215
+#: doc/guix.texi:22433
 #, no-wrap
 msgid "name mapper"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22219
+#: doc/guix.texi:22437
 msgid "The idmap daemon service provides mapping between user IDs and user names.  Typically it is required in order to access file systems mounted via NFSv4."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22220
+#: doc/guix.texi:22438
 #, no-wrap
 msgid "{Scheme Variable} idmap-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22222
+#: doc/guix.texi:22440
 msgid "A service type for the Identity Mapper (IDMAP) daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22224
+#: doc/guix.texi:22442
 #, no-wrap
 msgid "{Data Type} idmap-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22227
+#: doc/guix.texi:22445
 msgid "Data type representing the configuration of the IDMAP daemon service.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22230
+#: doc/guix.texi:22448
 msgid "The package in which the @command{rpc.idmapd} command is to be found."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22234
+#: doc/guix.texi:22452
 #, no-wrap
 msgid "@code{domain} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22238
+#: doc/guix.texi:22456
 msgid "The local NFSv4 domain name.  This must be a string or @code{#f}.  If it is @code{#f} then the daemon will use the host's fully qualified domain name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22239
+#: doc/guix.texi:22457
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{verbosity} (default: @code{0})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:22241
+#: doc/guix.texi:22459
 #, fuzzy
 #| msgid "The host name of the remote machine."
 msgid "The verbosity level of the daemon."
 msgstr "Имя хоста удалённой машины"
 
 #. type: Plain text
-#: doc/guix.texi:22252
+#: doc/guix.texi:22470
 msgid "@uref{https://git.savannah.gnu.org/cgit/guix/guix-cuirass.git, Cuirass} is a continuous integration tool for Guix.  It can be used both for development and for providing substitutes to others (@pxref{Substitutes})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22254
+#: doc/guix.texi:22472
 msgid "The @code{(gnu services cuirass)} module provides the following service."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22255
+#: doc/guix.texi:22473
 #, no-wrap
 msgid "{Scheme Procedure} cuirass-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22258
+#: doc/guix.texi:22476
 msgid "The type of the Cuirass service.  Its value must be a @code{cuirass-configuration} object, as described below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22265
+#: doc/guix.texi:22483
 msgid "To add build jobs, you have to set the @code{specifications} field of the configuration.  Here is an example of a service that polls the Guix repository and builds the packages from a manifest.  Some of the packages are defined in the @code{\"custom-packages\"} input, which is the equivalent of @code{GUIX_PACKAGE_PATH}."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:22293
+#: doc/guix.texi:22511
 #, no-wrap
 msgid ""
 "(define %cuirass-specs\n"
@@ -41038,7 +41644,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:22297
+#: doc/guix.texi:22515
 #, no-wrap
 msgid ""
 "(service cuirass-service-type\n"
@@ -41047,1112 +41653,1117 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22302
+#: doc/guix.texi:22520
 msgid "While information related to build jobs is located directly in the specifications, global settings for the @command{cuirass} process are accessible in other @code{cuirass-configuration} fields."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22303
+#: doc/guix.texi:22521
 #, no-wrap
 msgid "{Data Type} cuirass-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22305
+#: doc/guix.texi:22523
 msgid "Data type representing the configuration of Cuirass."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22307
+#: doc/guix.texi:22525
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/cuirass.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22309
+#: doc/guix.texi:22527
 msgid "Location of the log file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22310
+#: doc/guix.texi:22528
 #, fuzzy, no-wrap
 #| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
 msgid "@code{web-log-file} (default: @code{\"/var/log/cuirass-web.log\"})"
 msgstr "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
 
 #. type: table
-#: doc/guix.texi:22312
+#: doc/guix.texi:22530
 msgid "Location of the log file used by the web interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22313
+#: doc/guix.texi:22531
 #, no-wrap
 msgid "@code{cache-directory} (default: @code{\"/var/cache/cuirass\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22315
+#: doc/guix.texi:22533
 msgid "Location of the repository cache."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22316
+#: doc/guix.texi:22534
 #, no-wrap
 msgid "@code{user} (default: @code{\"cuirass\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22318
+#: doc/guix.texi:22536
 msgid "Owner of the @code{cuirass} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22319
+#: doc/guix.texi:22537
 #, no-wrap
 msgid "@code{group} (default: @code{\"cuirass\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22321
+#: doc/guix.texi:22539
 msgid "Owner's group of the @code{cuirass} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22322
+#: doc/guix.texi:22540
 #, no-wrap
 msgid "@code{interval} (default: @code{60})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22325
+#: doc/guix.texi:22543
 msgid "Number of seconds between the poll of the repositories followed by the Cuirass jobs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22326
+#: doc/guix.texi:22544
 #, no-wrap
 msgid "@code{database} (default: @code{\"/var/lib/cuirass/cuirass.db\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22329
+#: doc/guix.texi:22547
 msgid "Location of sqlite database which contains the build results and previously added specifications."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22330
+#: doc/guix.texi:22548
 #, no-wrap
 msgid "@code{ttl} (default: @code{(* 30 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22334
+#: doc/guix.texi:22552
 msgid "Specifies the time-to-live (TTL) in seconds of garbage collector roots that are registered for build results.  This means that build results are protected from garbage collection for at least @var{ttl} seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22335
+#: doc/guix.texi:22553
 #, no-wrap
 msgid "@code{port} (default: @code{8081})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22337
+#: doc/guix.texi:22555
 msgid "Port number used by the HTTP server."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22341
+#: doc/guix.texi:22559
 msgid "Listen on the network interface for @var{host}.  The default is to accept connections from localhost."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22342
+#: doc/guix.texi:22560
 #, no-wrap
 msgid "@code{specifications} (default: @code{#~'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22348
+#: doc/guix.texi:22566
 msgid "A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications, where a specification is an association list (@pxref{Associations Lists,,, guile, GNU Guile Reference Manual}) whose keys are keywords (@code{#:keyword-example}) as shown in the example above."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22349
+#: doc/guix.texi:22567
 #, no-wrap
 msgid "@code{use-substitutes?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22352
+#: doc/guix.texi:22570
 msgid "This allows using substitutes to avoid building every dependencies of a job from source."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22353 doc/guix.texi:27586
+#: doc/guix.texi:22571 doc/guix.texi:27869
 #, no-wrap
 msgid "@code{one-shot?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22355
+#: doc/guix.texi:22573
 msgid "Only evaluate specifications and build derivations once."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22356
+#: doc/guix.texi:22574
 #, no-wrap
 msgid "@code{fallback?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22359
+#: doc/guix.texi:22577
 msgid "When substituting a pre-built binary fails, fall back to building packages locally."
 msgstr ""
 
+#. type: table
+#: doc/guix.texi:22580
+msgid "Extra options to pass when running the Cuirass processes."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:22360
+#: doc/guix.texi:22581
 #, no-wrap
 msgid "@code{cuirass} (default: @code{cuirass})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22362
+#: doc/guix.texi:22583
 msgid "The Cuirass package to use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22368
+#: doc/guix.texi:22589
 #, no-wrap
 msgid "tlp"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22369
+#: doc/guix.texi:22590
 #, no-wrap
 msgid "power management with TLP"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:22370
+#: doc/guix.texi:22591
 #, no-wrap
 msgid "TLP daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22374
+#: doc/guix.texi:22595
 msgid "The @code{(gnu services pm)} module provides a Guix service definition for the Linux power management tool TLP."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22380
+#: doc/guix.texi:22601
 msgid "TLP enables various powersaving modes in userspace and kernel.  Contrary to @code{upower-service}, it is not a passive, monitoring tool, as it will apply custom settings each time a new power source is detected.  More information can be found at @uref{https://linrunner.de/en/tlp/tlp.html, TLP home page}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22381
+#: doc/guix.texi:22602
 #, no-wrap
 msgid "{Scheme Variable} tlp-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22385
+#: doc/guix.texi:22606
 msgid "The service type for the TLP tool.  Its value should be a valid TLP configuration (see below).  To use the default settings, simply write:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:22387
+#: doc/guix.texi:22608
 #, no-wrap
 msgid "(service tlp-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22392
+#: doc/guix.texi:22613
 msgid "By default TLP does not need much configuration but most TLP parameters can be tweaked using @code{tlp-configuration}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22398
+#: doc/guix.texi:22619
 msgid "Each parameter definition is preceded by its type; for example, @samp{boolean foo} indicates that the @code{foo} parameter should be specified as a boolean.  Types starting with @code{maybe-} denote parameters that won't show up in TLP config file when their value is @code{'disabled}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22408
+#: doc/guix.texi:22629
 msgid "Available @code{tlp-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22409
+#: doc/guix.texi:22630
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} package tlp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22411
+#: doc/guix.texi:22632
 msgid "The TLP package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22414
+#: doc/guix.texi:22635
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean tlp-enable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22416
+#: doc/guix.texi:22637
 msgid "Set to true if you wish to enable TLP."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22421
+#: doc/guix.texi:22642
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string tlp-default-mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22424
+#: doc/guix.texi:22645
 msgid "Default mode when no power supply can be detected.  Alternatives are AC and BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22426
+#: doc/guix.texi:22647
 msgid "Defaults to @samp{\"AC\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22429
+#: doc/guix.texi:22650
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22432
+#: doc/guix.texi:22653
 msgid "Number of seconds Linux kernel has to wait after the disk goes idle, before syncing on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22437
+#: doc/guix.texi:22658
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22439
+#: doc/guix.texi:22660
 msgid "Same as @code{disk-idle-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22441
+#: doc/guix.texi:22662
 msgid "Defaults to @samp{2}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22444
+#: doc/guix.texi:22665
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22446
+#: doc/guix.texi:22667
 msgid "Dirty pages flushing periodicity, expressed in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22448 doc/guix.texi:22671 doc/guix.texi:24060
-#: doc/guix.texi:24068
+#: doc/guix.texi:22669 doc/guix.texi:22892 doc/guix.texi:24281
+#: doc/guix.texi:24289
 msgid "Defaults to @samp{15}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22451
+#: doc/guix.texi:22672
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22453
+#: doc/guix.texi:22674
 msgid "Same as @code{max-lost-work-secs-on-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22455
+#: doc/guix.texi:22676
 msgid "Defaults to @samp{60}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22458
+#: doc/guix.texi:22679
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22462
+#: doc/guix.texi:22683
 msgid "CPU frequency scaling governor on AC mode.  With intel_pstate driver, alternatives are powersave and performance.  With acpi-cpufreq driver, alternatives are ondemand, powersave, performance and conservative."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22467
+#: doc/guix.texi:22688
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22469
+#: doc/guix.texi:22690
 msgid "Same as @code{cpu-scaling-governor-on-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22474
+#: doc/guix.texi:22695
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22476
+#: doc/guix.texi:22697
 msgid "Set the min available frequency for the scaling governor on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22481
+#: doc/guix.texi:22702
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22483
+#: doc/guix.texi:22704
 msgid "Set the max available frequency for the scaling governor on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22488
+#: doc/guix.texi:22709
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22490
+#: doc/guix.texi:22711
 msgid "Set the min available frequency for the scaling governor on BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22495
+#: doc/guix.texi:22716
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22497
+#: doc/guix.texi:22718
 msgid "Set the max available frequency for the scaling governor on BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22502
+#: doc/guix.texi:22723
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22505
+#: doc/guix.texi:22726
 msgid "Limit the min P-state to control the power dissipation of the CPU, in AC mode.  Values are stated as a percentage of the available performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22510
+#: doc/guix.texi:22731
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22513
+#: doc/guix.texi:22734
 msgid "Limit the max P-state to control the power dissipation of the CPU, in AC mode.  Values are stated as a percentage of the available performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22518
+#: doc/guix.texi:22739
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22520
+#: doc/guix.texi:22741
 msgid "Same as @code{cpu-min-perf-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22525
+#: doc/guix.texi:22746
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22527
+#: doc/guix.texi:22748
 msgid "Same as @code{cpu-max-perf-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22532
+#: doc/guix.texi:22753
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22534
+#: doc/guix.texi:22755
 msgid "Enable CPU turbo boost feature on AC mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22539
+#: doc/guix.texi:22760
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22541
+#: doc/guix.texi:22762
 msgid "Same as @code{cpu-boost-on-ac?} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22546
+#: doc/guix.texi:22767
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22549
+#: doc/guix.texi:22770
 msgid "Allow Linux kernel to minimize the number of CPU cores/hyper-threads used under light load conditions."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22554
+#: doc/guix.texi:22775
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22556
+#: doc/guix.texi:22777
 msgid "Same as @code{sched-powersave-on-ac?} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22561
+#: doc/guix.texi:22782
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean nmi-watchdog?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22563
+#: doc/guix.texi:22784
 msgid "Enable Linux kernel NMI watchdog."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22568
+#: doc/guix.texi:22789
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string phc-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22571
+#: doc/guix.texi:22792
 msgid "For Linux kernels with PHC patch applied, change CPU voltages.  An example value would be @samp{\"F:V F:V F:V F:V\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22576
+#: doc/guix.texi:22797
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22579
+#: doc/guix.texi:22800
 msgid "Set CPU performance versus energy saving policy on AC.  Alternatives are performance, normal, powersave."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22581 doc/guix.texi:22679 doc/guix.texi:22709
+#: doc/guix.texi:22802 doc/guix.texi:22900 doc/guix.texi:22930
 msgid "Defaults to @samp{\"performance\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22584
+#: doc/guix.texi:22805
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22586
+#: doc/guix.texi:22807
 msgid "Same as @code{energy-perf-policy-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22588 doc/guix.texi:22686
+#: doc/guix.texi:22809 doc/guix.texi:22907
 msgid "Defaults to @samp{\"powersave\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22591
+#: doc/guix.texi:22812
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} space-separated-string-list disks-devices"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22593
+#: doc/guix.texi:22814
 msgid "Hard disk devices."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22596
+#: doc/guix.texi:22817
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22598
+#: doc/guix.texi:22819
 msgid "Hard disk advanced power management level."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22601
+#: doc/guix.texi:22822
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22603
+#: doc/guix.texi:22824
 msgid "Same as @code{disk-apm-bat} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22606
+#: doc/guix.texi:22827
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22609
+#: doc/guix.texi:22830
 msgid "Hard disk spin down timeout.  One value has to be specified for each declared hard disk."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22614
+#: doc/guix.texi:22835
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22616
+#: doc/guix.texi:22837
 msgid "Same as @code{disk-spindown-timeout-on-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22621
+#: doc/guix.texi:22842
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-iosched"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22625
+#: doc/guix.texi:22846
 msgid "Select IO scheduler for disk devices.  One value has to be specified for each declared hard disk.  Example alternatives are cfq, deadline and noop."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22630
+#: doc/guix.texi:22851
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22633
+#: doc/guix.texi:22854
 msgid "SATA aggressive link power management (ALPM) level.  Alternatives are min_power, medium_power, max_performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22635
+#: doc/guix.texi:22856
 msgid "Defaults to @samp{\"max_performance\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22638
+#: doc/guix.texi:22859
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22640
+#: doc/guix.texi:22861
 msgid "Same as @code{sata-linkpwr-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22642
+#: doc/guix.texi:22863
 msgid "Defaults to @samp{\"min_power\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22645
+#: doc/guix.texi:22866
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string sata-linkpwr-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22647
+#: doc/guix.texi:22868
 msgid "Exclude specified SATA host devices for link power management."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22652
+#: doc/guix.texi:22873
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22655
+#: doc/guix.texi:22876
 msgid "Enable Runtime Power Management for AHCI controller and disks on AC mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22660
+#: doc/guix.texi:22881
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22662
+#: doc/guix.texi:22883
 msgid "Same as @code{ahci-runtime-pm-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22667
+#: doc/guix.texi:22888
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer ahci-runtime-pm-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22669
+#: doc/guix.texi:22890
 msgid "Seconds of inactivity before disk is suspended."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22674
+#: doc/guix.texi:22895
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22677
+#: doc/guix.texi:22898
 msgid "PCI Express Active State Power Management level.  Alternatives are default, performance, powersave."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22682
+#: doc/guix.texi:22903
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22684
+#: doc/guix.texi:22905
 msgid "Same as @code{pcie-aspm-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22689
+#: doc/guix.texi:22910
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22692
+#: doc/guix.texi:22913
 msgid "Radeon graphics clock speed level.  Alternatives are low, mid, high, auto, default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22694
+#: doc/guix.texi:22915
 msgid "Defaults to @samp{\"high\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22697
+#: doc/guix.texi:22918
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22699
+#: doc/guix.texi:22920
 msgid "Same as @code{radeon-power-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22701
+#: doc/guix.texi:22922
 msgid "Defaults to @samp{\"low\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22704
+#: doc/guix.texi:22925
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22707
+#: doc/guix.texi:22928
 msgid "Radeon dynamic power management method (DPM).  Alternatives are battery, performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22712
+#: doc/guix.texi:22933
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22714
+#: doc/guix.texi:22935
 msgid "Same as @code{radeon-dpm-state-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22716
+#: doc/guix.texi:22937
 msgid "Defaults to @samp{\"battery\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22719
+#: doc/guix.texi:22940
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22721
+#: doc/guix.texi:22942
 msgid "Radeon DPM performance level.  Alternatives are auto, low, high."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22723 doc/guix.texi:22730 doc/guix.texi:22804
+#: doc/guix.texi:22944 doc/guix.texi:22951 doc/guix.texi:23025
 msgid "Defaults to @samp{\"auto\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22726
+#: doc/guix.texi:22947
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22728
+#: doc/guix.texi:22949
 msgid "Same as @code{radeon-dpm-perf-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22733
+#: doc/guix.texi:22954
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22735
+#: doc/guix.texi:22956
 msgid "Wifi power saving mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22740
+#: doc/guix.texi:22961
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22742
+#: doc/guix.texi:22963
 msgid "Same as @code{wifi-power-ac?} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22747
+#: doc/guix.texi:22968
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} y-n-boolean wol-disable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22749
+#: doc/guix.texi:22970
 msgid "Disable wake on LAN."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22754
+#: doc/guix.texi:22975
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22757
+#: doc/guix.texi:22978
 msgid "Timeout duration in seconds before activating audio power saving on Intel HDA and AC97 devices.  A value of 0 disables power saving."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22762
+#: doc/guix.texi:22983
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22764
+#: doc/guix.texi:22985
 msgid "Same as @code{sound-powersave-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22769
+#: doc/guix.texi:22990
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} y-n-boolean sound-power-save-controller?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22771
+#: doc/guix.texi:22992
 msgid "Disable controller in powersaving mode on Intel HDA devices."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22776
+#: doc/guix.texi:22997
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean bay-poweroff-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22780
+#: doc/guix.texi:23001
 msgid "Enable optical drive in UltraBay/MediaBay on BAT mode.  Drive can be powered on again by releasing (and reinserting) the eject lever or by pressing the disc eject button on newer models."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22785
+#: doc/guix.texi:23006
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string bay-device"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22787
+#: doc/guix.texi:23008
 msgid "Name of the optical drive device to power off."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22789
+#: doc/guix.texi:23010
 msgid "Defaults to @samp{\"sr0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22792
+#: doc/guix.texi:23013
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22795
+#: doc/guix.texi:23016
 msgid "Runtime Power Management for PCI(e) bus devices.  Alternatives are on and auto."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22797
+#: doc/guix.texi:23018
 msgid "Defaults to @samp{\"on\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22800
+#: doc/guix.texi:23021
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22802
+#: doc/guix.texi:23023
 msgid "Same as @code{runtime-pm-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22807
+#: doc/guix.texi:23028
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean runtime-pm-all?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22810
+#: doc/guix.texi:23031
 msgid "Runtime Power Management for all PCI(e) bus devices, except blacklisted ones."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22815
+#: doc/guix.texi:23036
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list runtime-pm-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22817
+#: doc/guix.texi:23038
 msgid "Exclude specified PCI(e) device addresses from Runtime Power Management."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22822
+#: doc/guix.texi:23043
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} space-separated-string-list runtime-pm-driver-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22825
+#: doc/guix.texi:23046
 msgid "Exclude PCI(e) devices assigned to the specified drivers from Runtime Power Management."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22828
+#: doc/guix.texi:23049
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean usb-autosuspend?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22830
+#: doc/guix.texi:23051
 msgid "Enable USB autosuspend feature."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22835
+#: doc/guix.texi:23056
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string usb-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22837
+#: doc/guix.texi:23058
 msgid "Exclude specified devices from USB autosuspend."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22842
+#: doc/guix.texi:23063
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean usb-blacklist-wwan?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22844
+#: doc/guix.texi:23065
 msgid "Exclude WWAN devices from USB autosuspend."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22849
+#: doc/guix.texi:23070
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string usb-whitelist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22852
+#: doc/guix.texi:23073
 msgid "Include specified devices into USB autosuspend, even if they are already excluded by the driver or via @code{usb-blacklist-wwan?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22857
+#: doc/guix.texi:23078
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-boolean usb-autosuspend-disable-on-shutdown?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22859
+#: doc/guix.texi:23080
 msgid "Enable USB autosuspend before shutdown."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22864
+#: doc/guix.texi:23085
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean restore-device-state-on-startup?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22867
+#: doc/guix.texi:23088
 msgid "Restore radio device state (bluetooth, wifi, wwan) from previous shutdown on system startup."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22872
+#: doc/guix.texi:23093
 #, no-wrap
 msgid "thermald"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22873
+#: doc/guix.texi:23094
 #, no-wrap
 msgid "CPU frequency scaling with thermald"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:22874
+#: doc/guix.texi:23095
 #, no-wrap
 msgid "Thermald daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22878
+#: doc/guix.texi:23099
 msgid "The @code{(gnu services pm)} module provides an interface to thermald, a CPU frequency scaling service which helps prevent overheating."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22879
+#: doc/guix.texi:23100
 #, no-wrap
 msgid "{Scheme Variable} thermald-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22884
+#: doc/guix.texi:23105
 msgid "This is the service type for @uref{https://01.org/linux-thermal-daemon/, thermald}, the Linux Thermal Daemon, which is responsible for controlling the thermal state of processors and preventing overheating."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22886
+#: doc/guix.texi:23107
 #, no-wrap
 msgid "{Data Type} thermald-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22888
+#: doc/guix.texi:23109
 msgid "Data type representing the configuration of @code{thermald-service-type}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22890
+#: doc/guix.texi:23111
 #, no-wrap
 msgid "@code{ignore-cpuid-check?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22892
+#: doc/guix.texi:23113
 msgid "Ignore cpuid check for supported CPU models."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22893
+#: doc/guix.texi:23114
 #, no-wrap
 msgid "@code{thermald} (default: @var{thermald})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22895
+#: doc/guix.texi:23116
 msgid "Package object of thermald."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22904
+#: doc/guix.texi:23125
 msgid "The @code{(gnu services audio)} module provides a service to start MPD (the Music Player Daemon)."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22905
+#: doc/guix.texi:23126
 #, no-wrap
 msgid "mpd"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:22906
+#: doc/guix.texi:23127
 #, no-wrap
 msgid "Music Player Daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22911
+#: doc/guix.texi:23132
 msgid "The Music Player Daemon (MPD) is a service that can play music while being controlled from the local machine or over the network by a variety of clients."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22914
+#: doc/guix.texi:23135
 msgid "The following example shows how one might run @code{mpd} as user @code{\"bob\"} on port @code{6666}.  It uses pulseaudio for output."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:22920
+#: doc/guix.texi:23141
 #, no-wrap
 msgid ""
 "(service mpd-service-type\n"
@@ -42162,228 +42773,228 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22922
+#: doc/guix.texi:23143
 #, no-wrap
 msgid "{Scheme Variable} mpd-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22924
+#: doc/guix.texi:23145
 msgid "The service type for @command{mpd}"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22926
+#: doc/guix.texi:23147
 #, no-wrap
 msgid "{Data Type} mpd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22928
+#: doc/guix.texi:23149
 msgid "Data type representing the configuration of @command{mpd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22930
+#: doc/guix.texi:23151
 #, no-wrap
 msgid "@code{user} (default: @code{\"mpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22932
+#: doc/guix.texi:23153
 msgid "The user to run mpd as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22933
+#: doc/guix.texi:23154
 #, no-wrap
 msgid "@code{music-dir} (default: @code{\"~/Music\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22935
+#: doc/guix.texi:23156
 msgid "The directory to scan for music files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22936
+#: doc/guix.texi:23157
 #, no-wrap
 msgid "@code{playlist-dir} (default: @code{\"~/.mpd/playlists\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22938
+#: doc/guix.texi:23159
 msgid "The directory to store playlists."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22939
+#: doc/guix.texi:23160
 #, no-wrap
 msgid "@code{db-file} (default: @code{\"~/.mpd/tag_cache\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22941
+#: doc/guix.texi:23162
 msgid "The location of the music database."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22942
+#: doc/guix.texi:23163
 #, no-wrap
 msgid "@code{state-file} (default: @code{\"~/.mpd/state\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22944
+#: doc/guix.texi:23165
 msgid "The location of the file that stores current MPD's state."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22945
+#: doc/guix.texi:23166
 #, no-wrap
 msgid "@code{sticker-file} (default: @code{\"~/.mpd/sticker.sql\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22947
+#: doc/guix.texi:23168
 msgid "The location of the sticker database."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22948
+#: doc/guix.texi:23169
 #, no-wrap
 msgid "@code{port} (default: @code{\"6600\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22950
+#: doc/guix.texi:23171
 msgid "The port to run mpd on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22951
+#: doc/guix.texi:23172
 #, no-wrap
 msgid "@code{address} (default: @code{\"any\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22954
+#: doc/guix.texi:23175
 msgid "The address that mpd will bind to.  To use a Unix domain socket, an absolute path can be specified here."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22955
+#: doc/guix.texi:23176
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{outputs} (default: @code{\"(list (mpd-output))\"})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:22957
+#: doc/guix.texi:23178
 msgid "The audio outputs that MPD can use.  By default this is a single output using pulseaudio."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22961
+#: doc/guix.texi:23182
 #, no-wrap
 msgid "{Data Type} mpd-output"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22963
+#: doc/guix.texi:23184
 msgid "Data type representing an @command{mpd} audio output."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22965
+#: doc/guix.texi:23186
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{name} (default: @code{\"MPD\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:22967
+#: doc/guix.texi:23188
 msgid "The name of the audio output."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22968
+#: doc/guix.texi:23189
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{type} (default: @code{\"pulse\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:22970
+#: doc/guix.texi:23191
 msgid "The type of audio output."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22971
+#: doc/guix.texi:23192
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{enabled?} (default: @code{#t})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:22976
+#: doc/guix.texi:23197
 msgid "Specifies whether this audio output is enabled when MPD is started.  By default, all audio outputs are enabled.  This is just the default setting when there is no state file; with a state file, the previous state is restored."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22977
+#: doc/guix.texi:23198
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{tags?} (default: @code{#t})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:22981
+#: doc/guix.texi:23202
 msgid "If set to @code{#f}, then MPD will not send tags to this output.  This is only useful for output plugins that can receive tags, for example the @code{httpd} output plugin."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22982
+#: doc/guix.texi:23203
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{always-on?} (default: @code{#f})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:22986
+#: doc/guix.texi:23207
 msgid "If set to @code{#t}, then MPD attempts to keep this audio output always open. This may be useful for streaming servers, when you don’t want to disconnect all listeners even when playback is accidentally stopped."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:22987
+#: doc/guix.texi:23208
 #, no-wrap
 msgid "mixer-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22993
+#: doc/guix.texi:23214
 msgid "This field accepts a symbol that specifies which mixer should be used for this audio output: the @code{hardware} mixer, the @code{software} mixer, the @code{null} mixer (allows setting the volume, but with no effect; this can be used as a trick to implement an external mixer External Mixer) or no mixer (@code{none})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22994
+#: doc/guix.texi:23215
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{extra-options} (default: @code{'()\"})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:22997
+#: doc/guix.texi:23218
 msgid "An association list of option symbols to string values to be appended to the audio output configuration."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23003
+#: doc/guix.texi:23224
 msgid "The following example shows a configuration of @code{mpd} that provides an HTTP audio streaming output."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:23015
+#: doc/guix.texi:23236
 #, no-wrap
 msgid ""
 "(service mpd-service-type\n"
@@ -42399,40 +43010,40 @@ msgid ""
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:23019
+#: doc/guix.texi:23240
 #, no-wrap
 msgid "Virtualization services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23024
+#: doc/guix.texi:23245
 msgid "The @code{(gnu services virtualization)} module provides services for the libvirt and virtlog daemons, as well as other virtualization-related services."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23025
+#: doc/guix.texi:23246
 #, no-wrap
 msgid "Libvirt daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23029
+#: doc/guix.texi:23250
 msgid "@code{libvirtd} is the server side daemon component of the libvirt virtualization management system. This daemon runs on host servers and performs required management tasks for virtualized guests."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23030
+#: doc/guix.texi:23251
 #, no-wrap
 msgid "{Scheme Variable} libvirt-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23033
+#: doc/guix.texi:23254
 msgid "This is the type of the @uref{https://libvirt.org, libvirt daemon}.  Its value must be a @code{libvirt-configuration}."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:23039
+#: doc/guix.texi:23260
 #, no-wrap
 msgid ""
 "(service libvirt-service-type\n"
@@ -42442,874 +43053,874 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23044
+#: doc/guix.texi:23265
 msgid "Available @code{libvirt-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23045
+#: doc/guix.texi:23266
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} package libvirt"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23047
+#: doc/guix.texi:23268
 msgid "Libvirt package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23050
+#: doc/guix.texi:23271
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean listen-tls?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23053
+#: doc/guix.texi:23274
 msgid "Flag listening for secure TLS connections on the public TCP/IP port.  must set @code{listen} for this to have any effect."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23056
+#: doc/guix.texi:23277
 msgid "It is necessary to setup a CA and issue server certificates before using this capability."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23061
+#: doc/guix.texi:23282
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean listen-tcp?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23064
+#: doc/guix.texi:23285
 msgid "Listen for unencrypted TCP connections on the public TCP/IP port.  must set @code{listen} for this to have any effect."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23068
+#: doc/guix.texi:23289
 msgid "Using the TCP socket requires SASL authentication by default.  Only SASL mechanisms which support data encryption are allowed.  This is DIGEST_MD5 and GSSAPI (Kerberos5)"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23073
+#: doc/guix.texi:23294
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tls-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23076
+#: doc/guix.texi:23297
 msgid "Port for accepting secure TLS connections This can be a port number, or service name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23078
+#: doc/guix.texi:23299
 msgid "Defaults to @samp{\"16514\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23081
+#: doc/guix.texi:23302
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tcp-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23084
+#: doc/guix.texi:23305
 msgid "Port for accepting insecure TCP connections This can be a port number, or service name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23086
+#: doc/guix.texi:23307
 msgid "Defaults to @samp{\"16509\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23089
+#: doc/guix.texi:23310
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string listen-addr"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23091
+#: doc/guix.texi:23312
 msgid "IP address or hostname used for client connections."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23093
+#: doc/guix.texi:23314
 msgid "Defaults to @samp{\"0.0.0.0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23096
+#: doc/guix.texi:23317
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean mdns-adv?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23098
+#: doc/guix.texi:23319
 msgid "Flag toggling mDNS advertisement of the libvirt service."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23101
+#: doc/guix.texi:23322
 msgid "Alternatively can disable for all services on a host by stopping the Avahi daemon."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23106
+#: doc/guix.texi:23327
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string mdns-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23109
+#: doc/guix.texi:23330
 msgid "Default mDNS advertisement name.  This must be unique on the immediate broadcast network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23111
+#: doc/guix.texi:23332
 msgid "Defaults to @samp{\"Virtualization Host \"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23114
+#: doc/guix.texi:23335
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23118
+#: doc/guix.texi:23339
 msgid "UNIX domain socket group ownership.  This can be used to allow a 'trusted' set of users access to management capabilities without becoming root."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23123
+#: doc/guix.texi:23344
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-ro-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23126
+#: doc/guix.texi:23347
 msgid "UNIX socket permissions for the R/O socket.  This is used for monitoring VM status only."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23128 doc/guix.texi:23146
+#: doc/guix.texi:23349 doc/guix.texi:23367
 msgid "Defaults to @samp{\"0777\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23131
+#: doc/guix.texi:23352
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-rw-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23135
+#: doc/guix.texi:23356
 msgid "UNIX socket permissions for the R/W socket.  Default allows only root.  If PolicyKit is enabled on the socket, the default will change to allow everyone (eg, 0777)"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23137
+#: doc/guix.texi:23358
 msgid "Defaults to @samp{\"0770\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23140
+#: doc/guix.texi:23361
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-admin-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23144
+#: doc/guix.texi:23365
 msgid "UNIX socket permissions for the admin socket.  Default allows only owner (root), do not change it unless you are sure to whom you are exposing the access to."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23149
+#: doc/guix.texi:23370
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23151
+#: doc/guix.texi:23372
 msgid "The directory in which sockets will be found/created."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23153
+#: doc/guix.texi:23374
 msgid "Defaults to @samp{\"/var/run/libvirt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23156
+#: doc/guix.texi:23377
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-unix-ro"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23159
+#: doc/guix.texi:23380
 msgid "Authentication scheme for UNIX read-only sockets.  By default socket permissions allow anyone to connect"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23161 doc/guix.texi:23170
+#: doc/guix.texi:23382 doc/guix.texi:23391
 msgid "Defaults to @samp{\"polkit\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23164
+#: doc/guix.texi:23385
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-unix-rw"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23168
+#: doc/guix.texi:23389
 msgid "Authentication scheme for UNIX read-write sockets.  By default socket permissions only allow root.  If PolicyKit support was compiled into libvirt, the default will be to use 'polkit' auth."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23173
+#: doc/guix.texi:23394
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-tcp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23177
+#: doc/guix.texi:23398
 msgid "Authentication scheme for TCP sockets.  If you don't enable SASL, then all TCP traffic is cleartext.  Don't do this outside of a dev/test scenario."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23179
+#: doc/guix.texi:23400
 msgid "Defaults to @samp{\"sasl\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23182
+#: doc/guix.texi:23403
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-tls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23186
+#: doc/guix.texi:23407
 msgid "Authentication scheme for TLS sockets.  TLS sockets already have encryption provided by the TLS layer, and limited authentication is done by certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23189
+#: doc/guix.texi:23410
 msgid "It is possible to make use of any SASL authentication mechanism as well, by using 'sasl' for this option"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23191
+#: doc/guix.texi:23412
 msgid "Defaults to @samp{\"none\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23194
+#: doc/guix.texi:23415
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-list access-drivers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23196
+#: doc/guix.texi:23417
 msgid "API access control scheme."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23199
+#: doc/guix.texi:23420
 msgid "By default an authenticated user is allowed access to all APIs.  Access drivers can place restrictions on this."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23204
+#: doc/guix.texi:23425
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string key-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23207
+#: doc/guix.texi:23428
 msgid "Server key file path.  If set to an empty string, then no private key is loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23212
+#: doc/guix.texi:23433
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string cert-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23215
+#: doc/guix.texi:23436
 msgid "Server key file path.  If set to an empty string, then no certificate is loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23220
+#: doc/guix.texi:23441
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string ca-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23223
+#: doc/guix.texi:23444
 msgid "Server key file path.  If set to an empty string, then no CA certificate is loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23228
+#: doc/guix.texi:23449
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string crl-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23231
+#: doc/guix.texi:23452
 msgid "Certificate revocation list path.  If set to an empty string, then no CRL is loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23236
+#: doc/guix.texi:23457
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean tls-no-sanity-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23238
+#: doc/guix.texi:23459
 msgid "Disable verification of our own server certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23241
+#: doc/guix.texi:23462
 msgid "When libvirtd starts it performs some sanity checks against its own certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23246
+#: doc/guix.texi:23467
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean tls-no-verify-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23248
+#: doc/guix.texi:23469
 msgid "Disable verification of client certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23252
+#: doc/guix.texi:23473
 msgid "Client certificate verification is the primary authentication mechanism.  Any client which does not present a certificate signed by the CA will be rejected."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23257
+#: doc/guix.texi:23478
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23259
+#: doc/guix.texi:23480
 msgid "Whitelist of allowed x509 Distinguished Name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23264
+#: doc/guix.texi:23485
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23267
+#: doc/guix.texi:23488
 msgid "Whitelist of allowed SASL usernames.  The format for username depends on the SASL authentication mechanism."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23272
+#: doc/guix.texi:23493
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tls-priority"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23276
+#: doc/guix.texi:23497
 msgid "Override the compile time default TLS priority string.  The default is usually \"NORMAL\" unless overridden at build time.  Only set this is it is desired for libvirt to deviate from the global default settings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23278
+#: doc/guix.texi:23499
 msgid "Defaults to @samp{\"NORMAL\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23281
+#: doc/guix.texi:23502
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23284 doc/guix.texi:23707
+#: doc/guix.texi:23505 doc/guix.texi:23928
 msgid "Maximum number of concurrent client connections to allow over all sockets combined."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23286
+#: doc/guix.texi:23507
 msgid "Defaults to @samp{5000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23289
+#: doc/guix.texi:23510
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-queued-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23293
+#: doc/guix.texi:23514
 msgid "Maximum length of queue of connections waiting to be accepted by the daemon.  Note, that some protocols supporting retransmission may obey this so that a later reattempt at connection succeeds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23298
+#: doc/guix.texi:23519
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-anonymous-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23301
+#: doc/guix.texi:23522
 msgid "Maximum length of queue of accepted but not yet authenticated clients.  Set this to zero to turn this feature off"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23303 doc/guix.texi:23321 doc/guix.texi:23337
+#: doc/guix.texi:23524 doc/guix.texi:23542 doc/guix.texi:23558
 msgid "Defaults to @samp{20}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23306
+#: doc/guix.texi:23527
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer min-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23308
+#: doc/guix.texi:23529
 msgid "Number of workers to start up initially."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23313
+#: doc/guix.texi:23534
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23315
+#: doc/guix.texi:23536
 msgid "Maximum number of worker threads."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23319
+#: doc/guix.texi:23540
 msgid "If the number of active clients exceeds @code{min-workers}, then more threads are spawned, up to max_workers limit.  Typically you'd want max_workers to equal maximum number of clients allowed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23324
+#: doc/guix.texi:23545
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer prio-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23328
+#: doc/guix.texi:23549
 msgid "Number of priority workers.  If all workers from above pool are stuck, some calls marked as high priority (notably domainDestroy) can be executed in this pool."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23333
+#: doc/guix.texi:23554
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23335
+#: doc/guix.texi:23556
 msgid "Total global limit on concurrent RPC calls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23340
+#: doc/guix.texi:23561
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-client-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23344
+#: doc/guix.texi:23565
 msgid "Limit on concurrent requests from a single client connection.  To avoid one client monopolizing the server this should be a small fraction of the global max_requests and max_workers parameter."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23349
+#: doc/guix.texi:23570
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-min-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23351
+#: doc/guix.texi:23572
 msgid "Same as @code{min-workers} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23356
+#: doc/guix.texi:23577
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23358
+#: doc/guix.texi:23579
 msgid "Same as @code{max-workers} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23363
+#: doc/guix.texi:23584
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23365
+#: doc/guix.texi:23586
 msgid "Same as @code{max-clients} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23370
+#: doc/guix.texi:23591
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-queued-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23372
+#: doc/guix.texi:23593
 msgid "Same as @code{max-queued-clients} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23377
+#: doc/guix.texi:23598
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-client-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23379
+#: doc/guix.texi:23600
 msgid "Same as @code{max-client-requests} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23384
+#: doc/guix.texi:23605
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23386 doc/guix.texi:23609
+#: doc/guix.texi:23607 doc/guix.texi:23830
 msgid "Logging level.  4 errors, 3 warnings, 2 information, 1 debug."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23391
+#: doc/guix.texi:23612
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string log-filters"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23393 doc/guix.texi:23616
+#: doc/guix.texi:23614 doc/guix.texi:23837
 msgid "Logging filters."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23396 doc/guix.texi:23619
+#: doc/guix.texi:23617 doc/guix.texi:23840
 msgid "A filter allows to select a different logging level for a given category of logs The format for a filter is one of:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23400 doc/guix.texi:23623
+#: doc/guix.texi:23621 doc/guix.texi:23844
 msgid "x:name"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23403 doc/guix.texi:23626
+#: doc/guix.texi:23624 doc/guix.texi:23847
 msgid "x:+name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23413 doc/guix.texi:23636
+#: doc/guix.texi:23634 doc/guix.texi:23857
 msgid "where @code{name} is a string which is matched against the category given in the @code{VIR_LOG_INIT()} at the top of each libvirt source file, e.g., \"remote\", \"qemu\", or \"util.json\" (the name in the filter can be a substring of the full category name, in order to match multiple similar categories), the optional \"+\" prefix tells libvirt to log stack trace for each message matching name, and @code{x} is the minimal level where matching messages should be logged:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23417 doc/guix.texi:23462 doc/guix.texi:23640
-#: doc/guix.texi:23685
+#: doc/guix.texi:23638 doc/guix.texi:23683 doc/guix.texi:23861
+#: doc/guix.texi:23906
 msgid "1: DEBUG"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23420 doc/guix.texi:23465 doc/guix.texi:23643
-#: doc/guix.texi:23688
+#: doc/guix.texi:23641 doc/guix.texi:23686 doc/guix.texi:23864
+#: doc/guix.texi:23909
 msgid "2: INFO"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23423 doc/guix.texi:23468 doc/guix.texi:23646
-#: doc/guix.texi:23691
+#: doc/guix.texi:23644 doc/guix.texi:23689 doc/guix.texi:23867
+#: doc/guix.texi:23912
 msgid "3: WARNING"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23426 doc/guix.texi:23471 doc/guix.texi:23649
-#: doc/guix.texi:23694
+#: doc/guix.texi:23647 doc/guix.texi:23692 doc/guix.texi:23870
+#: doc/guix.texi:23915
 msgid "4: ERROR"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23431 doc/guix.texi:23654
+#: doc/guix.texi:23652 doc/guix.texi:23875
 msgid "Multiple filters can be defined in a single filters statement, they just need to be separated by spaces."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23433 doc/guix.texi:23656
+#: doc/guix.texi:23654 doc/guix.texi:23877
 msgid "Defaults to @samp{\"3:remote 4:event\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23436
+#: doc/guix.texi:23657
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string log-outputs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23438 doc/guix.texi:23661
+#: doc/guix.texi:23659 doc/guix.texi:23882
 msgid "Logging outputs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23441
+#: doc/guix.texi:23662
 msgid "An output is one of the places to save logging information.  The format for an output can be:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23443 doc/guix.texi:23666
+#: doc/guix.texi:23664 doc/guix.texi:23887
 #, no-wrap
 msgid "x:stderr"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23445 doc/guix.texi:23668
+#: doc/guix.texi:23666 doc/guix.texi:23889
 msgid "output goes to stderr"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23446 doc/guix.texi:23669
+#: doc/guix.texi:23667 doc/guix.texi:23890
 #, no-wrap
 msgid "x:syslog:name"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23448 doc/guix.texi:23671
+#: doc/guix.texi:23669 doc/guix.texi:23892
 msgid "use syslog for the output and use the given name as the ident"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23449 doc/guix.texi:23672
+#: doc/guix.texi:23670 doc/guix.texi:23893
 #, no-wrap
 msgid "x:file:file_path"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23451 doc/guix.texi:23674
+#: doc/guix.texi:23672 doc/guix.texi:23895
 msgid "output to a file, with the given filepath"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23452 doc/guix.texi:23675
+#: doc/guix.texi:23673 doc/guix.texi:23896
 #, no-wrap
 msgid "x:journald"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23454 doc/guix.texi:23677
+#: doc/guix.texi:23675 doc/guix.texi:23898
 msgid "output to journald logging system"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23458 doc/guix.texi:23681
+#: doc/guix.texi:23679 doc/guix.texi:23902
 msgid "In all case the x prefix is the minimal level, acting as a filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23476 doc/guix.texi:23699
+#: doc/guix.texi:23697 doc/guix.texi:23920
 msgid "Multiple outputs can be defined, they just need to be separated by spaces."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23478 doc/guix.texi:23701
+#: doc/guix.texi:23699 doc/guix.texi:23922
 msgid "Defaults to @samp{\"3:stderr\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23481
+#: doc/guix.texi:23702
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer audit-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23483
+#: doc/guix.texi:23704
 msgid "Allows usage of the auditing subsystem to be altered"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23487
+#: doc/guix.texi:23708
 msgid "0: disable all auditing"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23490
+#: doc/guix.texi:23711
 msgid "1: enable auditing, only if enabled on host"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23493
+#: doc/guix.texi:23714
 msgid "2: enable auditing, and exit if disabled on host."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23500
+#: doc/guix.texi:23721
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean audit-logging"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23502
+#: doc/guix.texi:23723
 msgid "Send audit messages via libvirt logging infrastructure."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23507
+#: doc/guix.texi:23728
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-string host-uuid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23509
+#: doc/guix.texi:23730
 msgid "Host UUID.  UUID must not have all digits be the same."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23514
+#: doc/guix.texi:23735
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string host-uuid-source"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23516
+#: doc/guix.texi:23737
 msgid "Source to read host UUID."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23520
+#: doc/guix.texi:23741
 msgid "@code{smbios}: fetch the UUID from @code{dmidecode -s system-uuid}"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:23523
+#: doc/guix.texi:23744
 msgid "@code{machine-id}: fetch the UUID from @code{/etc/machine-id}"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23528
+#: doc/guix.texi:23749
 msgid "If @code{dmidecode} does not provide a valid UUID a temporary UUID will be generated."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23530
+#: doc/guix.texi:23751
 msgid "Defaults to @samp{\"smbios\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23533
+#: doc/guix.texi:23754
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer keepalive-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23538
+#: doc/guix.texi:23759
 msgid "A keepalive message is sent to a client after @code{keepalive_interval} seconds of inactivity to check if the client is still responding.  If set to -1, libvirtd will never send keepalive requests; however clients can still send them and the daemon will send responses."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23543
+#: doc/guix.texi:23764
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer keepalive-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23547
+#: doc/guix.texi:23768
 msgid "Maximum number of keepalive messages that are allowed to be sent to the client without getting any response before the connection is considered broken."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23554
+#: doc/guix.texi:23775
 msgid "In other words, the connection is automatically closed approximately after @code{keepalive_interval * (keepalive_count + 1)} seconds since the last message received from the client.  When @code{keepalive-count} is set to 0, connections will be automatically closed after @code{keepalive-interval} seconds of inactivity without sending any keepalive messages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23559
+#: doc/guix.texi:23780
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23561 doc/guix.texi:23568
+#: doc/guix.texi:23782 doc/guix.texi:23789
 msgid "Same as above but for admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23566
+#: doc/guix.texi:23787
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23573
+#: doc/guix.texi:23794
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer ovs-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23575
+#: doc/guix.texi:23796
 msgid "Timeout for Open vSwitch calls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23579
+#: doc/guix.texi:23800
 msgid "The @code{ovs-vsctl} utility is used for the configuration and its timeout option is set by default to 5 seconds to avoid potential infinite waits blocking libvirt."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23586
+#: doc/guix.texi:23807
 #, no-wrap
 msgid "Virtlog daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23589
+#: doc/guix.texi:23810
 msgid "The virtlogd service is a server side daemon component of libvirt that is used to manage logs from virtual machine consoles."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23595
+#: doc/guix.texi:23816
 msgid "This daemon is not used directly by libvirt client applications, rather it is called on their behalf by @code{libvirtd}. By maintaining the logs in a standalone daemon, the main @code{libvirtd} daemon can be restarted without risk of losing logs. The @code{virtlogd} daemon has the ability to re-exec()  itself upon receiving @code{SIGUSR1}, to allow live upgrades without downtime."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23596
+#: doc/guix.texi:23817
 #, no-wrap
 msgid "{Scheme Variable} virtlog-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23599
+#: doc/guix.texi:23820
 msgid "This is the type of the virtlog daemon.  Its value must be a @code{virtlog-configuration}."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:23604
+#: doc/guix.texi:23825
 #, no-wrap
 msgid ""
 "(service virtlog-service-type\n"
@@ -43318,107 +43929,107 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23607
+#: doc/guix.texi:23828
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23614
+#: doc/guix.texi:23835
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} string log-filters"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23659
+#: doc/guix.texi:23880
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} string log-outputs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23664
+#: doc/guix.texi:23885
 msgid "An output is one of the places to save logging information The format for an output can be:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23704
+#: doc/guix.texi:23925
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23709
+#: doc/guix.texi:23930
 msgid "Defaults to @samp{1024}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23712
+#: doc/guix.texi:23933
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23714
+#: doc/guix.texi:23935
 msgid "Maximum file size before rolling over."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23716
+#: doc/guix.texi:23937
 msgid "Defaults to @samp{2MB}"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23719
+#: doc/guix.texi:23940
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-backups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23721
+#: doc/guix.texi:23942
 msgid "Maximum number of backup files to keep."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23723
+#: doc/guix.texi:23944
 msgid "Defaults to @samp{3}"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23726
+#: doc/guix.texi:23947
 #, no-wrap
 msgid "Transparent Emulation with QEMU"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23728
+#: doc/guix.texi:23949
 #, no-wrap
 msgid "emulation"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:23729
+#: doc/guix.texi:23950
 #, no-wrap
 msgid "binfmt_misc"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23735
+#: doc/guix.texi:23956
 msgid "@code{qemu-binfmt-service-type} provides support for transparent emulation of program binaries built for different architectures---e.g., it allows you to transparently execute an ARMv7 program on an x86_64 machine.  It achieves this by combining the @uref{https://www.qemu.org, QEMU} emulator and the @code{binfmt_misc} feature of the kernel Linux."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23736
+#: doc/guix.texi:23957
 #, no-wrap
 msgid "{Scheme Variable} qemu-binfmt-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23741
+#: doc/guix.texi:23962
 msgid "This is the type of the QEMU/binfmt service for transparent emulation.  Its value must be a @code{qemu-binfmt-configuration} object, which specifies the QEMU package to use as well as the architecture we want to emulated:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:23746
+#: doc/guix.texi:23967
 #, no-wrap
 msgid ""
 "(service qemu-binfmt-service-type\n"
@@ -43427,50 +44038,50 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23752
+#: doc/guix.texi:23973
 msgid "In this example, we enable transparent emulation for the ARM and aarch64 platforms.  Running @code{herd stop qemu-binfmt} turns it off, and running @code{herd start qemu-binfmt} turns it back on (@pxref{Invoking herd, the @command{herd} command,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23754
+#: doc/guix.texi:23975
 #, no-wrap
 msgid "{Data Type} qemu-binfmt-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23756
+#: doc/guix.texi:23977
 msgid "This is the configuration for the @code{qemu-binfmt} service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23758
+#: doc/guix.texi:23979
 #, no-wrap
 msgid "@code{platforms} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23761
+#: doc/guix.texi:23982
 msgid "The list of emulated QEMU platforms.  Each item must be a @dfn{platform object} as returned by @code{lookup-qemu-platforms} (see below)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23762
+#: doc/guix.texi:23983
 #, no-wrap
 msgid "@code{guix-support?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23768
+#: doc/guix.texi:23989
 msgid "When it is true, QEMU and all its dependencies are added to the build environment of @command{guix-daemon} (@pxref{Invoking guix-daemon, @code{--chroot-directory} option}).  This allows the @code{binfmt_misc} handlers to be used within the build environment, which in turn means that you can transparently build programs for another architecture."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23771
+#: doc/guix.texi:23992
 msgid "For example, let's suppose you're on an x86_64 machine and you have this service:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:23777
+#: doc/guix.texi:23998
 #, no-wrap
 msgid ""
 "(service qemu-binfmt-service-type\n"
@@ -43480,262 +44091,262 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23780
+#: doc/guix.texi:24001
 msgid "You can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:23783
+#: doc/guix.texi:24004
 #, no-wrap
 msgid "guix build -s armhf-linux inkscape\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23790
+#: doc/guix.texi:24011
 msgid "and it will build Inkscape for ARMv7 @emph{as if it were a native build}, transparently using QEMU to emulate the ARMv7 CPU.  Pretty handy if you'd like to test a package build for an architecture you don't have access to!"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23791
+#: doc/guix.texi:24012
 #, no-wrap
 msgid "@code{qemu} (default: @code{qemu})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23793
+#: doc/guix.texi:24014
 msgid "The QEMU package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23796
+#: doc/guix.texi:24017
 #, no-wrap
 msgid "{Scheme Procedure} lookup-qemu-platforms @var{platforms}@dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23801
+#: doc/guix.texi:24022
 msgid "Return the list of QEMU platform objects corresponding to @var{platforms}@dots{}.  @var{platforms} must be a list of strings corresponding to platform names, such as @code{\"arm\"}, @code{\"sparc\"}, @code{\"mips64el\"}, and so on."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23803
+#: doc/guix.texi:24024
 #, no-wrap
 msgid "{Scheme Procedure} qemu-platform? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23805
+#: doc/guix.texi:24026
 msgid "Return true if @var{obj} is a platform object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23807
+#: doc/guix.texi:24028
 #, no-wrap
 msgid "{Scheme Procedure} qemu-platform-name @var{platform}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23809
+#: doc/guix.texi:24030
 msgid "Return the name of @var{platform}---a string such as @code{\"arm\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23821
+#: doc/guix.texi:24042
 msgid "The @code{(gnu services version-control)} module provides a service to allow remote access to local Git repositories.  There are three options: the @code{git-daemon-service}, which provides access to repositories via the @code{git://} unsecured TCP-based protocol, extending the @code{nginx} web server to proxy some requests to @code{git-http-backend}, or providing a web interface with @code{cgit-service-type}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23822
+#: doc/guix.texi:24043
 #, no-wrap
 msgid "{Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23826
+#: doc/guix.texi:24047
 msgid "Return a service that runs @command{git daemon}, a simple TCP server to expose repositories over the Git protocol for anonymous access."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23832
+#: doc/guix.texi:24053
 msgid "The optional @var{config} argument should be a @code{} object, by default it allows read-only access to exported@footnote{By creating the magic file \"git-daemon-export-ok\" in the repository directory.} repositories under @file{/srv/git}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23835
+#: doc/guix.texi:24056
 #, no-wrap
 msgid "{Data Type} git-daemon-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23837
+#: doc/guix.texi:24058
 msgid "Data type representing the configuration for @code{git-daemon-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23839 doc/guix.texi:23895
+#: doc/guix.texi:24060 doc/guix.texi:24116
 #, no-wrap
 msgid "@code{package} (default: @var{git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23841 doc/guix.texi:23897
+#: doc/guix.texi:24062 doc/guix.texi:24118
 msgid "Package object of the Git distributed version control system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23842 doc/guix.texi:23901
+#: doc/guix.texi:24063 doc/guix.texi:24122
 #, no-wrap
 msgid "@code{export-all?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23845
+#: doc/guix.texi:24066
 msgid "Whether to allow access for all Git repositories, even if they do not have the @file{git-daemon-export-ok} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23846
+#: doc/guix.texi:24067
 #, no-wrap
 msgid "@code{base-path} (default: @file{/srv/git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23851
+#: doc/guix.texi:24072
 msgid "Whether to remap all the path requests as relative to the given path.  If you run git daemon with @var{(base-path \"/srv/git\")} on example.com, then if you later try to pull @code{git://example.com/hello.git}, git daemon will interpret the path as @code{/srv/git/hello.git}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23852
+#: doc/guix.texi:24073
 #, no-wrap
 msgid "@code{user-path} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23859
+#: doc/guix.texi:24080
 msgid "Whether to allow @code{~user} notation to be used in requests.  When specified with empty string, requests to @code{git://host/~alice/foo} is taken as a request to access @code{foo} repository in the home directory of user @code{alice}.  If @var{(user-path \"path\")} is specified, the same request is taken as a request to access @code{path/foo} repository in the home directory of user @code{alice}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23860
+#: doc/guix.texi:24081
 #, no-wrap
 msgid "@code{listen} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23863
+#: doc/guix.texi:24084
 msgid "Whether to listen on specific IP addresses or hostnames, defaults to all."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23864
+#: doc/guix.texi:24085
 #, no-wrap
 msgid "@code{port} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23866
+#: doc/guix.texi:24087
 msgid "Whether to listen on an alternative port, which defaults to 9418."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23867
+#: doc/guix.texi:24088
 #, no-wrap
 msgid "@code{whitelist} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23869
+#: doc/guix.texi:24090
 msgid "If not empty, only allow access to this list of directories."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23870
+#: doc/guix.texi:24091 doc/guix.texi:25381
 #, no-wrap
 msgid "@code{extra-options} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23873
+#: doc/guix.texi:24094
 msgid "Extra options will be passed to @code{git daemon}, please run @command{man git-daemon} for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23887
+#: doc/guix.texi:24108
 msgid "The @code{git://} protocol lacks authentication.  When you pull from a repository fetched via @code{git://}, you don't know whether the data you receive was modified or is even coming from the specified host, and your connection is subject to eavesdropping.  It's better to use an authenticated and encrypted transport, such as @code{https}.  Although Git allows you to serve repositories using unsophisticated file-based web servers, there is a faster protocol implemented by the @code{git-http-backend} program.  This program is the back-end of a proper Git web service.  It is designed to sit behind a FastCGI proxy.  @xref{Web Services}, for more on running the necessary @code{fcgiwrap} daemon."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23890
+#: doc/guix.texi:24111
 msgid "Guix has a separate configuration data type for serving Git repositories over HTTP."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23891
+#: doc/guix.texi:24112
 #, no-wrap
 msgid "{Data Type} git-http-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23893
+#: doc/guix.texi:24114
 msgid "Data type representing the configuration for @code{git-http-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23898
+#: doc/guix.texi:24119
 #, no-wrap
 msgid "@code{git-root} (default: @file{/srv/git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23900
+#: doc/guix.texi:24121
 msgid "Directory containing the Git repositories to expose to the world."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23904
+#: doc/guix.texi:24125
 msgid "Whether to expose access for all Git repositories in @var{git-root}, even if they do not have the @file{git-daemon-export-ok} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23905
+#: doc/guix.texi:24126
 #, no-wrap
 msgid "@code{uri-path} (default: @file{/git/})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23910
+#: doc/guix.texi:24131
 msgid "Path prefix for Git access.  With the default @code{/git/} prefix, this will map @code{http://@var{server}/git/@var{repo}.git} to @code{/srv/git/@var{repo}.git}.  Requests whose URI paths do not begin with this prefix are not passed on to this Git instance."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23911
+#: doc/guix.texi:24132
 #, no-wrap
 msgid "@code{fcgiwrap-socket} (default: @code{127.0.0.1:9000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23914
+#: doc/guix.texi:24135
 msgid "The socket on which the @code{fcgiwrap} daemon is listening.  @xref{Web Services}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23921
+#: doc/guix.texi:24142
 msgid "There is no @code{git-http-service-type}, currently; instead you can create an @code{nginx-location-configuration} from a @code{git-http-configuration} and then add that location to a web server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23922
+#: doc/guix.texi:24143
 #, no-wrap
 msgid "{Scheme Procedure} git-http-nginx-location-configuration @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23927
+#: doc/guix.texi:24148
 msgid "[config=(git-http-configuration)] Compute an @code{nginx-location-configuration} that corresponds to the given Git http configuration.  An example nginx service definition to serve the default @file{/srv/git} over HTTPS might be:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:23944
+#: doc/guix.texi:24165
 #, no-wrap
 msgid ""
 "(service nginx-service-type\n"
@@ -43756,1420 +44367,1420 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23951
+#: doc/guix.texi:24172
 msgid "This example assumes that you are using Let's Encrypt to get your TLS certificate.  @xref{Certificate Services}.  The default @code{certbot} service will redirect all HTTP traffic on @code{git.my-host.org} to HTTPS.  You will also need to add an @code{fcgiwrap} proxy to your system services.  @xref{Web Services}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23953
+#: doc/guix.texi:24174
 #, no-wrap
 msgid "Cgit Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23955
+#: doc/guix.texi:24176
 #, no-wrap
 msgid "Cgit service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23956
+#: doc/guix.texi:24177
 #, no-wrap
 msgid "Git, web interface"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23959
+#: doc/guix.texi:24180
 msgid "@uref{https://git.zx2c4.com/cgit/, Cgit} is a web frontend for Git repositories written in C."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23962
+#: doc/guix.texi:24183
 msgid "The following example will configure the service with default values.  By default, Cgit can be accessed on port 80 (@code{http://localhost:80})."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:23965
+#: doc/guix.texi:24186
 #, no-wrap
 msgid "(service cgit-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23969
+#: doc/guix.texi:24190
 msgid "The @code{file-object} type designates either a file-like object (@pxref{G-Expressions, file-like objects}) or a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23973
+#: doc/guix.texi:24194
 msgid "Available @code{cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23974
+#: doc/guix.texi:24195
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} package package"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23976
+#: doc/guix.texi:24197
 msgid "The CGIT package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23979
+#: doc/guix.texi:24200
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} nginx-server-configuration-list nginx"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23984
+#: doc/guix.texi:24205
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object about-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23987
+#: doc/guix.texi:24208
 msgid "Specifies a command which will be invoked to format the content of about pages (both top-level and for each repository)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23992
+#: doc/guix.texi:24213
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string agefile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23995
+#: doc/guix.texi:24216
 msgid "Specifies a path, relative to each repository path, which can be used to specify the date and time of the youngest commit in the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24000
+#: doc/guix.texi:24221
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object auth-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24003
+#: doc/guix.texi:24224
 msgid "Specifies a command that will be invoked for authenticating repository access."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24008
+#: doc/guix.texi:24229
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string branch-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24011
+#: doc/guix.texi:24232
 msgid "Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set @samp{name} enables ordering by branch name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24013
+#: doc/guix.texi:24234
 msgid "Defaults to @samp{\"name\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24016
+#: doc/guix.texi:24237
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string cache-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24018
+#: doc/guix.texi:24239
 msgid "Path used to store the cgit cache entries."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24020
+#: doc/guix.texi:24241
 msgid "Defaults to @samp{\"/var/cache/cgit\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24023
+#: doc/guix.texi:24244
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-static-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24026
+#: doc/guix.texi:24247
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed with a fixed SHA1."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24028 doc/guix.texi:24471
+#: doc/guix.texi:24249 doc/guix.texi:24692
 msgid "Defaults to @samp{-1}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24031
+#: doc/guix.texi:24252
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-dynamic-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24034
+#: doc/guix.texi:24255
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed without a fixed SHA1."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24039
+#: doc/guix.texi:24260
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-repo-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24042
+#: doc/guix.texi:24263
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository summary page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24047
+#: doc/guix.texi:24268
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-root-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24050
+#: doc/guix.texi:24271
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24055
+#: doc/guix.texi:24276
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-scanrc-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24058
+#: doc/guix.texi:24279
 msgid "Number which specifies the time-to-live, in minutes, for the result of scanning a path for Git repositories."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24063
+#: doc/guix.texi:24284
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-about-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24066
+#: doc/guix.texi:24287
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository about page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24071
+#: doc/guix.texi:24292
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-snapshot-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24074
+#: doc/guix.texi:24295
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of snapshots."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24079
+#: doc/guix.texi:24300
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24082
+#: doc/guix.texi:24303
 msgid "The maximum number of entries in the cgit cache.  When set to @samp{0}, caching is disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24087
+#: doc/guix.texi:24308
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean case-sensitive-sort?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24089
+#: doc/guix.texi:24310
 msgid "Sort items in the repo list case sensitively."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24094
+#: doc/guix.texi:24315
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list clone-prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24097
+#: doc/guix.texi:24318
 msgid "List of common prefixes which, when combined with a repository URL, generates valid clone URLs for the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24102
+#: doc/guix.texi:24323
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list clone-url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24104
+#: doc/guix.texi:24325
 msgid "List of @code{clone-url} templates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24109
+#: doc/guix.texi:24330
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object commit-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24111
+#: doc/guix.texi:24332
 msgid "Command which will be invoked to format commit messages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24116
+#: doc/guix.texi:24337
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string commit-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24120 doc/guix.texi:24678
+#: doc/guix.texi:24341 doc/guix.texi:24899
 msgid "Flag which, when set to @samp{date}, enables strict date ordering in the commit log, and when set to @samp{topo} enables strict topological ordering."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24122
+#: doc/guix.texi:24343
 msgid "Defaults to @samp{\"git log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24125
+#: doc/guix.texi:24346
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object css"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24127
+#: doc/guix.texi:24348
 msgid "URL which specifies the css document to include in all cgit pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24129
+#: doc/guix.texi:24350
 msgid "Defaults to @samp{\"/share/cgit/cgit.css\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24132
+#: doc/guix.texi:24353
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object email-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24136
+#: doc/guix.texi:24357
 msgid "Specifies a command which will be invoked to format names and email address of committers, authors, and taggers, as represented in various places throughout the cgit interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24141
+#: doc/guix.texi:24362
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean embedded?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24144
+#: doc/guix.texi:24365
 msgid "Flag which, when set to @samp{#t}, will make cgit generate a HTML fragment suitable for embedding in other HTML pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24149
+#: doc/guix.texi:24370
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-commit-graph?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24153
+#: doc/guix.texi:24374
 msgid "Flag which, when set to @samp{#t}, will make cgit print an ASCII-art commit history graph to the left of the commit messages in the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24158
+#: doc/guix.texi:24379
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-filter-overrides?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24161
+#: doc/guix.texi:24382
 msgid "Flag which, when set to @samp{#t}, allows all filter settings to be overridden in repository-specific cgitrc files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24166
+#: doc/guix.texi:24387
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-follow-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24169
+#: doc/guix.texi:24390
 msgid "Flag which, when set to @samp{#t}, allows users to follow a file in the log view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24174
+#: doc/guix.texi:24395
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-http-clone?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24177
+#: doc/guix.texi:24398
 msgid "If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24182
+#: doc/guix.texi:24403
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-index-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24185
+#: doc/guix.texi:24406
 msgid "Flag which, when set to @samp{#t}, will make cgit generate extra links \"summary\", \"commit\", \"tree\" for each repo in the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24190
+#: doc/guix.texi:24411
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-index-owner?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24193
+#: doc/guix.texi:24414
 msgid "Flag which, when set to @samp{#t}, will make cgit display the owner of each repo in the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24198
+#: doc/guix.texi:24419
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-log-filecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24201
+#: doc/guix.texi:24422
 msgid "Flag which, when set to @samp{#t}, will make cgit print the number of modified files for each commit on the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24206
+#: doc/guix.texi:24427
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-log-linecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24209
+#: doc/guix.texi:24430
 msgid "Flag which, when set to @samp{#t}, will make cgit print the number of added and removed lines for each commit on the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24214
+#: doc/guix.texi:24435
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-remote-branches?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24217 doc/guix.texi:24741
+#: doc/guix.texi:24438 doc/guix.texi:24962
 msgid "Flag which, when set to @code{#t}, will make cgit display remote branches in the summary and refs views."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24222
+#: doc/guix.texi:24443
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-subject-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24226
+#: doc/guix.texi:24447
 msgid "Flag which, when set to @code{1}, will make cgit use the subject of the parent commit as link text when generating links to parent commits in commit view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24231
+#: doc/guix.texi:24452
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-html-serving?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24235
+#: doc/guix.texi:24456
 msgid "Flag which, when set to @samp{#t}, will make cgit use the subject of the parent commit as link text when generating links to parent commits in commit view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24240
+#: doc/guix.texi:24461
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-tree-linenumbers?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24243
+#: doc/guix.texi:24464
 msgid "Flag which, when set to @samp{#t}, will make cgit generate linenumber links for plaintext blobs printed in the tree view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24248
+#: doc/guix.texi:24469
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-git-config?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24251
+#: doc/guix.texi:24472
 msgid "Flag which, when set to @samp{#f}, will allow cgit to use Git config to set any repo specific settings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24256
+#: doc/guix.texi:24477
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object favicon"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24258
+#: doc/guix.texi:24479
 msgid "URL used as link to a shortcut icon for cgit."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24260
+#: doc/guix.texi:24481
 msgid "Defaults to @samp{\"/favicon.ico\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24263
+#: doc/guix.texi:24484
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string footer"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24267
+#: doc/guix.texi:24488
 msgid "The content of the file specified with this option will be included verbatim at the bottom of all pages (i.e.@: it replaces the standard \"generated by...\"@: message)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24272
+#: doc/guix.texi:24493
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string head-include"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24275
+#: doc/guix.texi:24496
 msgid "The content of the file specified with this option will be included verbatim in the HTML HEAD section on all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24280
+#: doc/guix.texi:24501
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24283
+#: doc/guix.texi:24504
 msgid "The content of the file specified with this option will be included verbatim at the top of all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24288
+#: doc/guix.texi:24509
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object include"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24291
+#: doc/guix.texi:24512
 msgid "Name of a configfile to include before the rest of the current config- file is parsed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24296
+#: doc/guix.texi:24517
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string index-header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24299
+#: doc/guix.texi:24520
 msgid "The content of the file specified with this option will be included verbatim above the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24304
+#: doc/guix.texi:24525
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string index-info"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24307
+#: doc/guix.texi:24528
 msgid "The content of the file specified with this option will be included verbatim below the heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24312
+#: doc/guix.texi:24533
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean local-time?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24315
+#: doc/guix.texi:24536
 msgid "Flag which, if set to @samp{#t}, makes cgit print commit and tag times in the servers timezone."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24320
+#: doc/guix.texi:24541
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object logo"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24323
+#: doc/guix.texi:24544
 msgid "URL which specifies the source of an image which will be used as a logo on all cgit pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24325
+#: doc/guix.texi:24546
 msgid "Defaults to @samp{\"/share/cgit/cgit.png\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24328
+#: doc/guix.texi:24549
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string logo-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24330 doc/guix.texi:24787
+#: doc/guix.texi:24551 doc/guix.texi:25008
 msgid "URL loaded when clicking on the cgit logo image."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24335
+#: doc/guix.texi:24556
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object owner-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24338
+#: doc/guix.texi:24559
 msgid "Command which will be invoked to format the Owner column of the main page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24343
+#: doc/guix.texi:24564
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-atom-items"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24345
+#: doc/guix.texi:24566
 msgid "Number of items to display in atom feeds view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24347 doc/guix.texi:24582 doc/guix.texi:24590
-#: doc/guix.texi:24598
+#: doc/guix.texi:24568 doc/guix.texi:24803 doc/guix.texi:24811
+#: doc/guix.texi:24819
 msgid "Defaults to @samp{10}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24350
+#: doc/guix.texi:24571
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-commit-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24352
+#: doc/guix.texi:24573
 msgid "Number of entries to list per page in \"log\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24354 doc/guix.texi:24369
+#: doc/guix.texi:24575 doc/guix.texi:24590
 msgid "Defaults to @samp{50}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24357
+#: doc/guix.texi:24578
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-message-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24359
+#: doc/guix.texi:24580
 msgid "Number of commit message characters to display in \"log\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24361 doc/guix.texi:24377
+#: doc/guix.texi:24582 doc/guix.texi:24598
 msgid "Defaults to @samp{80}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24364
+#: doc/guix.texi:24585
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-repo-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24367
+#: doc/guix.texi:24588
 msgid "Specifies the number of entries to list per page on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24372
+#: doc/guix.texi:24593
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-repodesc-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24375
+#: doc/guix.texi:24596
 msgid "Specifies the maximum number of repo description characters to display on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24380
+#: doc/guix.texi:24601
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-blob-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24382
+#: doc/guix.texi:24603
 msgid "Specifies the maximum size of a blob to display HTML for in KBytes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24387
+#: doc/guix.texi:24608
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string max-stats"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24390
+#: doc/guix.texi:24611
 msgid "Maximum statistics period.  Valid values are @samp{week},@samp{month}, @samp{quarter} and @samp{year}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24395
+#: doc/guix.texi:24616
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} mimetype-alist mimetype"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24397
+#: doc/guix.texi:24618
 msgid "Mimetype for the specified filename extension."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24401
+#: doc/guix.texi:24622
 msgid "Defaults to @samp{((gif \"image/gif\") (html \"text/html\") (jpg \"image/jpeg\") (jpeg \"image/jpeg\") (pdf \"application/pdf\") (png \"image/png\") (svg \"image/svg+xml\"))}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24404
+#: doc/guix.texi:24625
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object mimetype-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24406
+#: doc/guix.texi:24627
 msgid "Specifies the file to use for automatic mimetype lookup."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24411
+#: doc/guix.texi:24632
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string module-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24414
+#: doc/guix.texi:24635
 msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24419
+#: doc/guix.texi:24640
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean nocache?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24421
+#: doc/guix.texi:24642
 msgid "If set to the value @samp{#t} caching will be disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24426
+#: doc/guix.texi:24647
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean noplainemail?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24429
+#: doc/guix.texi:24650
 msgid "If set to @samp{#t} showing full author email addresses will be disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24434
+#: doc/guix.texi:24655
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean noheader?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24437
+#: doc/guix.texi:24658
 msgid "Flag which, when set to @samp{#t}, will make cgit omit the standard header on all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24442
+#: doc/guix.texi:24663
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} project-list project-list"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24446
+#: doc/guix.texi:24667
 msgid "A list of subdirectories inside of @code{repository-directory}, relative to it, that should loaded as Git repositories.  An empty list means that all subdirectories will be loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24451
+#: doc/guix.texi:24672
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object readme"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24453
+#: doc/guix.texi:24674
 msgid "Text which will be used as default value for @code{cgit-repo-readme}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24458
+#: doc/guix.texi:24679
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean remove-suffix?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24462
+#: doc/guix.texi:24683
 msgid "If set to @code{#t} and @code{repository-directory} is enabled, if any repositories are found with a suffix of @code{.git}, this suffix will be removed for the URL and name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24467
+#: doc/guix.texi:24688
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer renamelimit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24469
+#: doc/guix.texi:24690
 msgid "Maximum number of files to consider when detecting renames."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24474
+#: doc/guix.texi:24695
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string repository-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24476
+#: doc/guix.texi:24697
 msgid "The way in which repositories in each section are sorted."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24481
+#: doc/guix.texi:24702
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} robots-list robots"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24483
+#: doc/guix.texi:24704
 msgid "Text used as content for the @code{robots} meta-tag."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24485
+#: doc/guix.texi:24706
 msgid "Defaults to @samp{(\"noindex\" \"nofollow\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24488
+#: doc/guix.texi:24709
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string root-desc"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24490
+#: doc/guix.texi:24711
 msgid "Text printed below the heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24492
+#: doc/guix.texi:24713
 msgid "Defaults to @samp{\"a fast webinterface for the git dscm\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24495
+#: doc/guix.texi:24716
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string root-readme"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24498
-msgid "The content of the file specified with this option will be included verbatim below thef \"about\" link on the repository index page."
+#: doc/guix.texi:24719
+msgid "The content of the file specified with this option will be included verbatim below the \"about\" link on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24503
+#: doc/guix.texi:24724
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string root-title"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24505
+#: doc/guix.texi:24726
 msgid "Text printed as heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24510
+#: doc/guix.texi:24731
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean scan-hidden-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24516
+#: doc/guix.texi:24737
 msgid "If set to @samp{#t} and repository-directory is enabled, repository-directory will recurse into directories whose name starts with a period.  Otherwise, repository-directory will stay away from such directories, considered as \"hidden\".  Note that this does not apply to the \".git\" directory in non-bare repos."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24521
+#: doc/guix.texi:24742
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list snapshots"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24524
+#: doc/guix.texi:24745
 msgid "Text which specifies the default set of snapshot formats that cgit generates links for."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24529
+#: doc/guix.texi:24750
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} repository-directory repository-directory"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24532
+#: doc/guix.texi:24753
 msgid "Name of the directory to scan for repositories (represents @code{scan-path})."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24534
+#: doc/guix.texi:24755
 msgid "Defaults to @samp{\"/srv/git\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24537
+#: doc/guix.texi:24758
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string section"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24540 doc/guix.texi:24856
+#: doc/guix.texi:24761 doc/guix.texi:25077
 msgid "The name of the current repository section - all repositories defined after this option will inherit the current section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24545
+#: doc/guix.texi:24766
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string section-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24548
+#: doc/guix.texi:24769
 msgid "Flag which, when set to @samp{1}, will sort the sections on the repository listing by name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24553
+#: doc/guix.texi:24774
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer section-from-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24556
+#: doc/guix.texi:24777
 msgid "A number which, if defined prior to repository-directory, specifies how many path elements from each repo path to use as a default section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24561
+#: doc/guix.texi:24782
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean side-by-side-diffs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24564
+#: doc/guix.texi:24785
 msgid "If set to @samp{#t} shows side-by-side diffs instead of unidiffs per default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24569
+#: doc/guix.texi:24790
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object source-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24572
+#: doc/guix.texi:24793
 msgid "Specifies a command which will be invoked to format plaintext blobs in the tree view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24577
+#: doc/guix.texi:24798
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer summary-branches"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24580
+#: doc/guix.texi:24801
 msgid "Specifies the number of branches to display in the repository \"summary\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24585
+#: doc/guix.texi:24806
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer summary-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24588
+#: doc/guix.texi:24809
 msgid "Specifies the number of log entries to display in the repository \"summary\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24593
+#: doc/guix.texi:24814
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer summary-tags"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24596
+#: doc/guix.texi:24817
 msgid "Specifies the number of tags to display in the repository \"summary\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24601
+#: doc/guix.texi:24822
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string strict-export"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24604
+#: doc/guix.texi:24825
 msgid "Filename which, if specified, needs to be present within the repository for cgit to allow access to that repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24609
+#: doc/guix.texi:24830
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string virtual-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24611
+#: doc/guix.texi:24832
 msgid "URL which, if specified, will be used as root for all cgit links."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24613
+#: doc/guix.texi:24834
 msgid "Defaults to @samp{\"/\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24616
+#: doc/guix.texi:24837
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} repository-cgit-configuration-list repositories"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24618
+#: doc/guix.texi:24839
 msgid "A list of @dfn{cgit-repo} records to use with config."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24622
+#: doc/guix.texi:24843
 msgid "Available @code{repository-cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24623
+#: doc/guix.texi:24844
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list snapshots"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24626
+#: doc/guix.texi:24847
 msgid "A mask of snapshot formats for this repo that cgit generates links for, restricted by the global @code{snapshots} setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24631
+#: doc/guix.texi:24852
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object source-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24633
+#: doc/guix.texi:24854
 msgid "Override the default @code{source-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24638
+#: doc/guix.texi:24859
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24640
+#: doc/guix.texi:24861
 msgid "The relative URL used to access the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24645
+#: doc/guix.texi:24866
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object about-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24647
+#: doc/guix.texi:24868
 msgid "Override the default @code{about-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24652
+#: doc/guix.texi:24873
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string branch-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24655
+#: doc/guix.texi:24876
 msgid "Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set to @samp{name} enables ordering by branch name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24660
+#: doc/guix.texi:24881
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list clone-url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24662
+#: doc/guix.texi:24883
 msgid "A list of URLs which can be used to clone repo."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24667
+#: doc/guix.texi:24888
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object commit-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24669
+#: doc/guix.texi:24890
 msgid "Override the default @code{commit-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24674
+#: doc/guix.texi:24895
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string commit-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24683
+#: doc/guix.texi:24904
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string defbranch"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24688
+#: doc/guix.texi:24909
 msgid "The name of the default branch for this repository.  If no such branch exists in the repository, the first branch name (when sorted) is used as default instead.  By default branch pointed to by HEAD, or \"master\" if there is no suitable HEAD."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24693
+#: doc/guix.texi:24914
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string desc"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24695
+#: doc/guix.texi:24916
 msgid "The value to show as repository description."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24700
+#: doc/guix.texi:24921
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string homepage"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24702
+#: doc/guix.texi:24923
 msgid "The value to show as repository homepage."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24707
+#: doc/guix.texi:24928
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object email-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24709
+#: doc/guix.texi:24930
 msgid "Override the default @code{email-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24714
+#: doc/guix.texi:24935
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-commit-graph?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24717
+#: doc/guix.texi:24938
 msgid "A flag which can be used to disable the global setting @code{enable-commit-graph?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24722
+#: doc/guix.texi:24943
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-log-filecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24725
+#: doc/guix.texi:24946
 msgid "A flag which can be used to disable the global setting @code{enable-log-filecount?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24730
+#: doc/guix.texi:24951
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-log-linecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24733
+#: doc/guix.texi:24954
 msgid "A flag which can be used to disable the global setting @code{enable-log-linecount?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24738
+#: doc/guix.texi:24959
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-remote-branches?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24746
+#: doc/guix.texi:24967
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-subject-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24749
+#: doc/guix.texi:24970
 msgid "A flag which can be used to override the global setting @code{enable-subject-links?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24754
+#: doc/guix.texi:24975
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-html-serving?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24757
+#: doc/guix.texi:24978
 msgid "A flag which can be used to override the global setting @code{enable-html-serving?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24762
+#: doc/guix.texi:24983
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-boolean hide?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24765
+#: doc/guix.texi:24986
 msgid "Flag which, when set to @code{#t}, hides the repository from the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24770
+#: doc/guix.texi:24991
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-boolean ignore?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24772
+#: doc/guix.texi:24993
 msgid "Flag which, when set to @samp{#t}, ignores the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24777
+#: doc/guix.texi:24998
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object logo"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24780
+#: doc/guix.texi:25001
 msgid "URL which specifies the source of an image which will be used as a logo on this repo’s pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24785
+#: doc/guix.texi:25006
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string logo-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24792
+#: doc/guix.texi:25013
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object owner-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24794
+#: doc/guix.texi:25015
 msgid "Override the default @code{owner-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24799
+#: doc/guix.texi:25020
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string module-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24803
+#: doc/guix.texi:25024
 msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing.  The arguments for the formatstring are the path and SHA1 of the submodule commit."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24808
+#: doc/guix.texi:25029
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} module-link-path module-link-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24812
+#: doc/guix.texi:25033
 msgid "Text which will be used as the formatstring for a hyperlink when a submodule with the specified subdirectory path is printed in a directory listing."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24817
+#: doc/guix.texi:25038
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string max-stats"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24819
+#: doc/guix.texi:25040
 msgid "Override the default maximum statistics period."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24824
+#: doc/guix.texi:25045
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24826
+#: doc/guix.texi:25047
 msgid "The value to show as repository name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24831
+#: doc/guix.texi:25052
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string owner"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24833
+#: doc/guix.texi:25054
 msgid "A value used to identify the owner of the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24838
+#: doc/guix.texi:25059
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24840
+#: doc/guix.texi:25061
 msgid "An absolute path to the repository directory."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24845
+#: doc/guix.texi:25066
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string readme"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24848
+#: doc/guix.texi:25069
 msgid "A path (relative to repo) which specifies a file to include verbatim as the \"About\" page for this repo."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24853
+#: doc/guix.texi:25074
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string section"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24861
+#: doc/guix.texi:25082
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list extra-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24863 doc/guix.texi:24872
+#: doc/guix.texi:25084 doc/guix.texi:25093
 msgid "Extra options will be appended to cgitrc file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24870
+#: doc/guix.texi:25091
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list extra-options"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24884
+#: doc/guix.texi:25105
 msgid "However, it could be that you just want to get a @code{cgitrc} up and running.  In that case, you can pass an @code{opaque-cgit-configuration} as a record to @code{cgit-service-type}.  As its name indicates, an opaque configuration does not have easy reflective capabilities."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24886
+#: doc/guix.texi:25107
 msgid "Available @code{opaque-cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24887
+#: doc/guix.texi:25108
 #, no-wrap
 msgid "{@code{opaque-cgit-configuration} parameter} package cgit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24889
+#: doc/guix.texi:25110
 msgid "The cgit package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24891
+#: doc/guix.texi:25112
 #, no-wrap
 msgid "{@code{opaque-cgit-configuration} parameter} string string"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:24893
+#: doc/guix.texi:25114
 msgid "The contents of the @code{cgitrc}, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24897
+#: doc/guix.texi:25118
 msgid "For example, if your @code{cgitrc} is just the empty string, you could instantiate a cgit service like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:24902
+#: doc/guix.texi:25123
 #, no-wrap
 msgid ""
 "(service cgit-service-type\n"
@@ -45178,40 +45789,40 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:24904
+#: doc/guix.texi:25125
 #, no-wrap
 msgid "Gitolite Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24906
+#: doc/guix.texi:25127
 #, no-wrap
 msgid "Gitolite service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24907
+#: doc/guix.texi:25128
 #, no-wrap
 msgid "Git, hosting"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24910
+#: doc/guix.texi:25131
 msgid "@uref{https://gitolite.com/gitolite/, Gitolite} is a tool for hosting Git repositories on a central server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24913
+#: doc/guix.texi:25134
 msgid "Gitolite can handle multiple repositories and users, and supports flexible configuration of the permissions for the users on the repositories."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24916
+#: doc/guix.texi:25137
 msgid "The following example will configure Gitolite using the default @code{git} user, and the provided SSH public key."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:24923
+#: doc/guix.texi:25144
 #, no-wrap
 msgid ""
 "(service gitolite-service-type\n"
@@ -45222,290 +45833,290 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24928
+#: doc/guix.texi:25149
 msgid "Gitolite is configured through a special admin repository which you can clone, for example, if you setup Gitolite on @code{example.com}, you would run the following command to clone the admin repository."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24931
+#: doc/guix.texi:25152
 #, no-wrap
 msgid "git clone git@@example.com:gitolite-admin\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24937
+#: doc/guix.texi:25158
 msgid "When the Gitolite service is activated, the provided @code{admin-pubkey} will be inserted in to the @file{keydir} directory in the gitolite-admin repository.  If this results in a change in the repository, it will be committed using the message ``gitolite setup by GNU Guix''."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:24938
+#: doc/guix.texi:25159
 #, no-wrap
 msgid "{Data Type} gitolite-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:24940
+#: doc/guix.texi:25161
 msgid "Data type representing the configuration for @code{gitolite-service-type}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24942
+#: doc/guix.texi:25163
 #, no-wrap
 msgid "@code{package} (default: @var{gitolite})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24944
+#: doc/guix.texi:25165
 msgid "Gitolite package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24945
+#: doc/guix.texi:25166
 #, no-wrap
 msgid "@code{user} (default: @var{git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24948
+#: doc/guix.texi:25169
 msgid "User to use for Gitolite.  This will be user that you use when accessing Gitolite over SSH."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24949
+#: doc/guix.texi:25170
 #, no-wrap
 msgid "@code{group} (default: @var{git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24951
+#: doc/guix.texi:25172
 msgid "Group to use for Gitolite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24952
+#: doc/guix.texi:25173
 #, no-wrap
 msgid "@code{home-directory} (default: @var{\"/var/lib/gitolite\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24954
+#: doc/guix.texi:25175
 msgid "Directory in which to store the Gitolite configuration and repositories."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24955
+#: doc/guix.texi:25176
 #, no-wrap
 msgid "@code{rc-file} (default: @var{(gitolite-rc-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24958
+#: doc/guix.texi:25179
 msgid "A ``file-like'' object (@pxref{G-Expressions, file-like objects}), representing the configuration for Gitolite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24959
+#: doc/guix.texi:25180
 #, no-wrap
 msgid "@code{admin-pubkey} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24963
+#: doc/guix.texi:25184
 msgid "A ``file-like'' object (@pxref{G-Expressions, file-like objects}) used to setup Gitolite.  This will be inserted in to the @file{keydir} directory within the gitolite-admin repository."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24965
+#: doc/guix.texi:25186
 msgid "To specify the SSH key as a string, use the @code{plain-file} function."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:24968
+#: doc/guix.texi:25189
 #, no-wrap
 msgid "(plain-file \"yourname.pub\" \"ssh-rsa AAAA... guix@@example.com\")\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:24973
+#: doc/guix.texi:25194
 #, no-wrap
 msgid "{Data Type} gitolite-rc-file"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:24975
+#: doc/guix.texi:25196
 msgid "Data type representing the Gitolite RC file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24977
+#: doc/guix.texi:25198
 #, no-wrap
 msgid "@code{umask} (default: @code{#o0077})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24980
+#: doc/guix.texi:25201
 msgid "This controls the permissions Gitolite sets on the repositories and their contents."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24984
+#: doc/guix.texi:25205
 msgid "A value like @code{#o0027} will give read access to the group used by Gitolite (by default: @code{git}). This is necessary when using Gitolite with software like cgit or gitweb."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24985
+#: doc/guix.texi:25206
 #, no-wrap
 msgid "@code{git-config-keys} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24988
+#: doc/guix.texi:25209
 msgid "Gitolite allows you to set git config values using the \"config\" keyword. This setting allows control over the config keys to accept."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24989
+#: doc/guix.texi:25210
 #, no-wrap
 msgid "@code{roles} (default: @code{'((\"READERS\" . 1) (\"WRITERS\" . ))})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24991
+#: doc/guix.texi:25212
 msgid "Set the role names allowed to be used by users running the perms command."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24992
+#: doc/guix.texi:25213
 #, no-wrap
 msgid "@code{enable} (default: @code{'(\"help\" \"desc\" \"info\" \"perms\" \"writable\" \"ssh-authkeys\" \"git-config\" \"daemon\" \"gitweb\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24994
+#: doc/guix.texi:25215
 msgid "This setting controls the commands and features to enable within Gitolite."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25002
+#: doc/guix.texi:25223
 #, no-wrap
 msgid "The Battle for Wesnoth Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25003
+#: doc/guix.texi:25224
 #, no-wrap
 msgid "wesnothd"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25007
+#: doc/guix.texi:25228
 msgid "@uref{https://wesnoth.org, The Battle for Wesnoth} is a fantasy, turn based tactical strategy game, with several single player campaigns, and multiplayer games (both networked and local)."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:25008
+#: doc/guix.texi:25229
 #, no-wrap
 msgid "{Scheme Variable} wesnothd-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:25012
+#: doc/guix.texi:25233
 msgid "Service type for the wesnothd service.  Its value must be a @code{wesnothd-configuration} object.  To run wesnothd in the default configuration, instantiate it as:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25015
+#: doc/guix.texi:25236
 #, no-wrap
 msgid "(service wesnothd-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25018
+#: doc/guix.texi:25239
 #, no-wrap
 msgid "{Data Type} wesnothd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25020
+#: doc/guix.texi:25241
 msgid "Data type representing the configuration of @command{wesnothd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25022
+#: doc/guix.texi:25243
 #, no-wrap
 msgid "@code{package} (default: @code{wesnoth-server})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25024
+#: doc/guix.texi:25245
 msgid "The wesnoth server package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25025
+#: doc/guix.texi:25246
 #, no-wrap
 msgid "@code{port} (default: @code{15000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25027
+#: doc/guix.texi:25248
 msgid "The port to bind the server to."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25033
+#: doc/guix.texi:25254
 #, no-wrap
 msgid "pam-mount"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25038
+#: doc/guix.texi:25259
 msgid "The @code{(gnu services pam-mount)} module provides a service allowing users to mount volumes when they log in.  It should be able to mount any volume format supported by the system."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:25039
+#: doc/guix.texi:25260
 #, no-wrap
 msgid "{Scheme Variable} pam-mount-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:25041
+#: doc/guix.texi:25262
 msgid "Service type for PAM Mount support."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25043
+#: doc/guix.texi:25264
 #, no-wrap
 msgid "{Data Type} pam-mount-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25045
+#: doc/guix.texi:25266
 #, fuzzy
 #| msgid "Manage the operating system configuration."
 msgid "Data type representing the configuration of PAM Mount."
 msgstr "Управление конфигурацией операционной системы."
 
 #. type: code{#1}
-#: doc/guix.texi:25049
+#: doc/guix.texi:25270
 #, fuzzy, no-wrap
 #| msgid "Modules"
 msgid "rules"
 msgstr "Модули"
 
 #. type: table
-#: doc/guix.texi:25052
+#: doc/guix.texi:25273
 msgid "The configuration rules that will be used to generate @file{/etc/security/pam_mount.conf.xml}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25056
+#: doc/guix.texi:25277
 msgid "The configuration rules are SXML elements (@pxref{SXML,,, guile, GNU Guile Reference Manual}), and the the default ones don't mount anything for anyone at login:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25071
+#: doc/guix.texi:25292
 #, no-wrap
 msgid ""
 "`((debug (@@ (enable \"0\")))\n"
@@ -45524,12 +46135,12 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25077
+#: doc/guix.texi:25298
 msgid "Some @code{volume} elements must be added to automatically mount volumes at login.  Here's an example allowing the user @code{alice} to mount her encrypted @code{HOME} directory and allowing the user @code{bob} to mount the partition where he stores his data:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25102
+#: doc/guix.texi:25323
 #, no-wrap
 msgid ""
 "(define pam-mount-rules\n"
@@ -45559,7 +46170,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25106
+#: doc/guix.texi:25327
 #, no-wrap
 msgid ""
 "(service pam-mount-service-type\n"
@@ -45568,377 +46179,467 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25110
+#: doc/guix.texi:25331
 msgid "The complete list of possible options can be found in the man page for @uref{http://pam-mount.sourceforge.net/pam_mount.conf.5.html, pam_mount.conf}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25117
+#: doc/guix.texi:25338
 #, fuzzy, no-wrap
 #| msgid "Database Services"
 msgid "Guix Data Service"
 msgstr "Сервисы баз данных"
 
 #. type: Plain text
-#: doc/guix.texi:25121
+#: doc/guix.texi:25342
 msgid "The @uref{http://data.guix.gnu.org,Guix Data Service} processes, stores and provides data about GNU Guix.  This includes information about packages, derivations and lint warnings."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25124
+#: doc/guix.texi:25345
 msgid "The data is stored in a PostgreSQL database, and available through a web interface."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:25125
+#: doc/guix.texi:25346
 #, no-wrap
 msgid "{Scheme Variable} guix-data-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:25130
+#: doc/guix.texi:25351
 msgid "Service type for the Guix Data Service.  Its value must be a @code{guix-data-service-configuration} object.  The service optionally extends the getmail service, as the guix-commits mailing list is used to find out about changes in the Guix git repository."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25132
+#: doc/guix.texi:25353
 #, no-wrap
 msgid "{Data Type} guix-data-service-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25134
+#: doc/guix.texi:25355
 msgid "Data type representing the configuration of the Guix Data Service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25136
+#: doc/guix.texi:25357
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{package} (default: @code{guix-data-service})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:25138
+#: doc/guix.texi:25359
 msgid "The Guix Data Service package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25139
+#: doc/guix.texi:25360
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{user} (default: @code{\"guix-data-service\"})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:25141
+#: doc/guix.texi:25362
 #, fuzzy
 #| msgid "The mcron service."
 msgid "The system user to run the service as."
 msgstr "Сервис mcron."
 
 #. type: item
-#: doc/guix.texi:25142
+#: doc/guix.texi:25363
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{group} (default: @code{\"guix-data-service\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:25144
+#: doc/guix.texi:25365
 msgid "The system group to run the service as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25145
+#: doc/guix.texi:25366
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{port} (default: @code{8765})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:25147
+#: doc/guix.texi:25368
 #, fuzzy
 #| msgid "The rottlog service."
 msgid "The port to bind the web service to."
 msgstr "Сервис rottlog."
 
 #. type: item
-#: doc/guix.texi:25148
+#: doc/guix.texi:25369
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{host} (default: @code{\"127.0.0.1\"})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:25150
+#: doc/guix.texi:25371
 #, fuzzy
 #| msgid "The rottlog service."
 msgid "The host to bind the web service to."
 msgstr "Сервис rottlog."
 
 #. type: item
-#: doc/guix.texi:25151
+#: doc/guix.texi:25372
 #, fuzzy, no-wrap
 #| msgid "@code{parallel-builds} (default: @code{1})"
 msgid "@code{getmail-idle-mailboxes} (default: @code{#f})"
 msgstr "@code{parallel-builds} (default: @code{1})"
 
 #. type: table
-#: doc/guix.texi:25154
+#: doc/guix.texi:25375
 msgid "If set, this is the list of mailboxes that the getmail service will be configured to listen to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25155
+#: doc/guix.texi:25376
 #, fuzzy, no-wrap
 #| msgid "@code{compression-level} (default: @code{3})"
 msgid "@code{commits-getmail-retriever-configuration} (default: @code{#f})"
 msgstr "@code{compression-level} (default: @code{3})"
 
 #. type: table
-#: doc/guix.texi:25159
+#: doc/guix.texi:25380
 msgid "If set, this is the @code{getmail-retriever-configuration} object with which to configure getmail to fetch mail from the guix-commits mailing list."
 msgstr ""
 
+#. type: table
+#: doc/guix.texi:25383
+#, fuzzy
+#| msgid "@code{port} (default: @code{22})"
+msgid "Extra command line options for @code{guix-data-service}."
+msgstr "@code{port} (default: @code{22})"
+
+#. type: item
+#: doc/guix.texi:25384
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{extra-process-jobs-options} (default: @var{'()})"
+msgstr "@code{features} (default: @code{'()})"
+
+#. type: table
+#: doc/guix.texi:25386
+msgid "Extra command line options for @code{guix-data-service-process-jobs}."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:25166
+#: doc/guix.texi:25393
 #, no-wrap
 msgid "oom"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25167
+#: doc/guix.texi:25394
 #, no-wrap
 msgid "out of memory killer"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25168
+#: doc/guix.texi:25395
 #, no-wrap
 msgid "earlyoom"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25169
+#: doc/guix.texi:25396
 #, no-wrap
 msgid "early out of memory daemon"
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:25170
+#: doc/guix.texi:25397
 #, fuzzy, no-wrap
 #| msgid "Mail Services"
 msgid "Early OOM Service"
 msgstr "Почтовые сервисы"
 
 #. type: Plain text
-#: doc/guix.texi:25177
+#: doc/guix.texi:25404
 msgid "@uref{https://github.com/rfjakob/earlyoom,Early OOM}, also known as Earlyoom, is a minimalist out of memory (OOM) daemon that runs in user space and provides a more responsive and configurable alternative to the in-kernel OOM killer.  It is useful to prevent the system from becoming unresponsive when it runs out of memory."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25178
+#: doc/guix.texi:25405
 #, no-wrap
 msgid "{Scheme Variable} earlyoom-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25183
+#: doc/guix.texi:25410
 msgid "The service type for running @command{earlyoom}, the Early OOM daemon.  Its value must be a @code{earlyoom-configuration} object, described below.  The service can be instantiated in its default configuration with:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25186
+#: doc/guix.texi:25413
 #, no-wrap
 msgid "(service earlyoom-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25189
+#: doc/guix.texi:25416
 #, no-wrap
 msgid "{Data Type} earlyoom-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25191
+#: doc/guix.texi:25418
 msgid "This is the configuration record for the @code{earlyoom-service-type}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25193
+#: doc/guix.texi:25420
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{earlyoom} (default: @var{earlyoom})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:25195
+#: doc/guix.texi:25422
 #, fuzzy
 #| msgid "The package data type."
 msgid "The Earlyoom package to use."
 msgstr "Тип данных пакет"
 
 #. type: item
-#: doc/guix.texi:25196
+#: doc/guix.texi:25423
 #, fuzzy, no-wrap
 #| msgid "@code{parallel-builds} (default: @code{1})"
 msgid "@code{minimum-available-memory} (default: @code{10})"
 msgstr "@code{parallel-builds} (default: @code{1})"
 
 #. type: table
-#: doc/guix.texi:25198
+#: doc/guix.texi:25425
 msgid "The threshold for the minimum @emph{available} memory, in percentages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25199
+#: doc/guix.texi:25426
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{minimum-free-swap} (default: @code{10})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:25201
+#: doc/guix.texi:25428
 msgid "The threshold for the minimum free swap memory, in percentages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25202
+#: doc/guix.texi:25429
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{prefer-regexp} (default: @code{#f})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:25205
+#: doc/guix.texi:25432
 msgid "A regular expression (as a string) to match the names of the processes that should be preferably killed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25206
+#: doc/guix.texi:25433
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{avoid-regexp} (default: @code{#f})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:25209
+#: doc/guix.texi:25436
 msgid "A regular expression (as a string) to match the names of the processes that should @emph{not} be killed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25210
+#: doc/guix.texi:25437
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{memory-report-interval} (default: @code{0})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:25213
+#: doc/guix.texi:25440
 msgid "The interval in seconds at which a memory report is printed.  It is disabled by default."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25214
+#: doc/guix.texi:25441
 #, fuzzy, no-wrap
 #| msgid "@code{compression-level} (default: @code{3})"
 msgid "@code{ignore-positive-oom-score-adj?} (default: @code{#f})"
 msgstr "@code{compression-level} (default: @code{3})"
 
 #. type: table
-#: doc/guix.texi:25217
+#: doc/guix.texi:25444
 msgid "A boolean indicating whether the positive adjustments set in @file{/proc/*/oom_score_adj}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25218
+#: doc/guix.texi:25445
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{show-debug-messages?} (default: @code{#f})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:25221
+#: doc/guix.texi:25448
 msgid "A boolean indicating whether debug messages should be printed.  The logs are saved at @file{/var/log/earlyoom.log}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25222
+#: doc/guix.texi:25449
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{send-notification-command} (default: @code{#f})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:25225
+#: doc/guix.texi:25452
 msgid "This can be used to provide a custom command used for sending notifications."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25232
+#: doc/guix.texi:25455
+#, no-wrap
+msgid "modprobe"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:25456
+#, no-wrap
+msgid "kernel module loader"
+msgstr ""
+
+#. type: subsubsection
+#: doc/guix.texi:25457
+#, fuzzy, no-wrap
+#| msgid "Kerberos Services"
+msgid "Kernel Module Loader Service"
+msgstr "Сервисы Kerberos"
+
+#. type: Plain text
+#: doc/guix.texi:25463
+msgid "The kernel module loader service allows one to load loadable kernel modules at boot.  This is especially useful for modules that don't autoload and need to be manually loaded, as it's the case with @code{ddcci}."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:25464
+#, fuzzy, no-wrap
+#| msgid "{Scheme Procedure} sane-service-type"
+msgid "{Scheme Variable} kernel-module-loader-service-type"
+msgstr "{Процедура Scheme} sane-service-type"
+
+#. type: deffn
+#: doc/guix.texi:25470
+msgid "The service type for loading loadable kernel modules at boot with @command{modprobe}.  Its value must be a list of strings representing module names.  For example loading the drivers provided by @code{ddcci-driver-linux}, in debugging mode by passing some module parameters, can be done as follow:"
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:25475
+#, no-wrap
+msgid ""
+"(use-modules (gnu) (gnu services))\n"
+"(use-package-modules linux)\n"
+"(use-service-modules linux)\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:25479
+#, no-wrap
+msgid ""
+"(define ddcci-config\n"
+"  (plain-file \"ddcci.conf\"\n"
+"              \"options ddcci dyndbg delay=120\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:25489
+#, no-wrap
+msgid ""
+"(operating-system\n"
+"  ...\n"
+"  (services (cons* (service kernel-module-loader-service-type\n"
+"                            '(\"ddcci\" \"ddcci_backlight\"))\n"
+"                   (simple-service 'ddcci-config etc-service-type\n"
+"                                   (list `(\"modprobe.d/ddcci.conf\"\n"
+"                                           ,ddcci-config)))\n"
+"                   %base-services))\n"
+"  (kernel-loadable-modules (list ddcci-driver-linux)))\n"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:25495
 #, no-wrap
 msgid "fingerprint"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25233
+#: doc/guix.texi:25496
 #, no-wrap
 msgid "Fingerprint Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25237
+#: doc/guix.texi:25500
 msgid "The @code{(gnu services authentication)} module provides a DBus service to read and identify fingerprints via a fingerprint sensor."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25238
+#: doc/guix.texi:25501
 #, no-wrap
 msgid "{Scheme Variable} fprintd-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25241
+#: doc/guix.texi:25504
 msgid "The service type for @command{fprintd}, which provides the fingerprint reading capability."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25244
+#: doc/guix.texi:25507
 #, no-wrap
 msgid "(service fprintd-service-type)\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25247
+#: doc/guix.texi:25510
 #, no-wrap
 msgid "sysctl"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25248
+#: doc/guix.texi:25511
 #, no-wrap
 msgid "System Control Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25252
+#: doc/guix.texi:25515
 msgid "The @code{(gnu services sysctl)} provides a service to configure kernel parameters at boot."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25253
+#: doc/guix.texi:25516
 #, no-wrap
 msgid "{Scheme Variable} sysctl-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25257
+#: doc/guix.texi:25520
 msgid "The service type for @command{sysctl}, which modifies kernel parameters under @file{/proc/sys/}.  To enable IPv4 forwarding, it can be instantiated as:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25262
+#: doc/guix.texi:25525
 #, no-wrap
 msgid ""
 "(service sysctl-service-type\n"
@@ -45947,441 +46648,441 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25265
+#: doc/guix.texi:25528
 #, no-wrap
 msgid "{Data Type} sysctl-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25267
+#: doc/guix.texi:25530
 msgid "The data type representing the configuration of @command{sysctl}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25269
+#: doc/guix.texi:25532
 #, no-wrap
 msgid "@code{sysctl} (default: @code{(file-append procps \"/sbin/sysctl\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25271
+#: doc/guix.texi:25534
 msgid "The @command{sysctl} executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25272
+#: doc/guix.texi:25535
 #, no-wrap
 msgid "@code{settings} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25274
+#: doc/guix.texi:25537
 msgid "An association list specifies kernel parameters and their values."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25277
+#: doc/guix.texi:25540
 #, no-wrap
 msgid "pcscd"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25278
+#: doc/guix.texi:25541
 #, no-wrap
 msgid "PC/SC Smart Card Daemon Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25285
+#: doc/guix.texi:25548
 msgid "The @code{(gnu services security-token)} module provides the following service to run @command{pcscd}, the PC/SC Smart Card Daemon.  @command{pcscd} is the daemon program for pcsc-lite and the MuscleCard framework. It is a resource manager that coordinates communications with smart card readers, smart cards and cryptographic tokens that are connected to the system."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25286
+#: doc/guix.texi:25549
 #, no-wrap
 msgid "{Scheme Variable} pcscd-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25290
+#: doc/guix.texi:25553
 msgid "Service type for the @command{pcscd} service.  Its value must be a @code{pcscd-configuration} object.  To run pcscd in the default configuration, instantiate it as:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25293
+#: doc/guix.texi:25556
 #, no-wrap
 msgid "(service pcscd-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25296
+#: doc/guix.texi:25559
 #, no-wrap
 msgid "{Data Type} pcscd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25298
+#: doc/guix.texi:25561
 msgid "The data type representing the configuration of @command{pcscd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25300
+#: doc/guix.texi:25563
 #, no-wrap
 msgid "@code{pcsc-lite} (default: @code{pcsc-lite})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25302
+#: doc/guix.texi:25565
 msgid "The pcsc-lite package that provides pcscd."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25302
+#: doc/guix.texi:25565
 #, no-wrap
 msgid "@code{usb-drivers} (default: @code{(list ccid)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25305
+#: doc/guix.texi:25568
 msgid "List of packages that provide USB drivers to pcscd. Drivers are expected to be under @file{pcsc/drivers} in the store directory of the package."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25308
+#: doc/guix.texi:25571
 #, no-wrap
 msgid "lirc"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25309
+#: doc/guix.texi:25572
 #, no-wrap
 msgid "Lirc Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25312
+#: doc/guix.texi:25575
 msgid "The @code{(gnu services lirc)} module provides the following service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25313
+#: doc/guix.texi:25576
 #, no-wrap
 msgid "{Scheme Procedure} lirc-service [#:lirc lirc] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25318
+#: doc/guix.texi:25581
 msgid "[#:device #f] [#:driver #f] [#:config-file #f] @ [#:extra-options '()] Return a service that runs @url{http://www.lirc.org,LIRC}, a daemon that decodes infrared signals from remote controls."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25322
+#: doc/guix.texi:25585
 msgid "Optionally, @var{device}, @var{driver} and @var{config-file} (configuration file name) may be specified.  See @command{lircd} manual for details."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25325
+#: doc/guix.texi:25588
 msgid "Finally, @var{extra-options} is a list of additional command-line options passed to @command{lircd}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25327
+#: doc/guix.texi:25590
 #, no-wrap
 msgid "spice"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25328
+#: doc/guix.texi:25591
 #, no-wrap
 msgid "Spice Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25331
+#: doc/guix.texi:25594
 msgid "The @code{(gnu services spice)} module provides the following service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25332
+#: doc/guix.texi:25595
 #, no-wrap
 msgid "{Scheme Procedure} spice-vdagent-service [#:spice-vdagent]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25336
+#: doc/guix.texi:25599
 msgid "Returns a service that runs @url{https://www.spice-space.org,VDAGENT}, a daemon that enables sharing the clipboard with a vm and setting the guest display resolution when the graphical console window resizes."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25338
+#: doc/guix.texi:25601
 #, no-wrap
 msgid "inputattach"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25339
+#: doc/guix.texi:25602
 #, no-wrap
 msgid "inputattach Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25341
+#: doc/guix.texi:25604
 #, no-wrap
 msgid "tablet input, for Xorg"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25342
+#: doc/guix.texi:25605
 #, no-wrap
 msgid "touchscreen input, for Xorg"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25346
+#: doc/guix.texi:25609
 msgid "The @uref{https://linuxwacom.github.io/, inputattach} service allows you to use input devices such as Wacom tablets, touchscreens, or joysticks with the Xorg display server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25347
+#: doc/guix.texi:25610
 #, no-wrap
 msgid "{Scheme Variable} inputattach-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25350
+#: doc/guix.texi:25613
 msgid "Type of a service that runs @command{inputattach} on a device and dispatches events from it."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25352
+#: doc/guix.texi:25615
 #, no-wrap
 msgid "{Data Type} inputattach-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25354
+#: doc/guix.texi:25617
 #, no-wrap
 msgid "@code{device-type} (default: @code{\"wacom\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25357
+#: doc/guix.texi:25620
 msgid "The type of device to connect to.  Run @command{inputattach --help}, from the @code{inputattach} package, to see the list of supported device types."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25358
+#: doc/guix.texi:25621
 #, no-wrap
 msgid "@code{device} (default: @code{\"/dev/ttyS0\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25360
+#: doc/guix.texi:25623
 msgid "The device file to connect to the device."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25364
+#: doc/guix.texi:25627
 msgid "Baud rate to use for the serial connection.  Should be a number or @code{#f}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25365
+#: doc/guix.texi:25628
 #, no-wrap
 msgid "@code{log-file} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25367
+#: doc/guix.texi:25630
 msgid "If true, this must be the name of a file to log messages to."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:25370
+#: doc/guix.texi:25633
 #, no-wrap
 msgid "Dictionary Services"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25371
+#: doc/guix.texi:25634
 #, no-wrap
 msgid "dictionary"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25373
+#: doc/guix.texi:25636
 msgid "The @code{(gnu services dict)} module provides the following service:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25374
+#: doc/guix.texi:25637
 #, no-wrap
 msgid "{Scheme Procedure} dicod-service [#:config (dicod-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25377
+#: doc/guix.texi:25640
 msgid "Return a service that runs the @command{dicod} daemon, an implementation of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25381
-msgid "The optional @var{config} argument specifies the configuration for @command{dicod}, which should be a @code{} object, by default it serves the GNU Collaborative International Dictonary of English."
+#: doc/guix.texi:25644
+msgid "The optional @var{config} argument specifies the configuration for @command{dicod}, which should be a @code{} object, by default it serves the GNU Collaborative International Dictionary of English."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25385
+#: doc/guix.texi:25648
 msgid "You can add @command{open localhost} to your @file{~/.dico} file to make @code{localhost} the default server for @command{dico} client (@pxref{Initialization File,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25387
+#: doc/guix.texi:25650
 #, no-wrap
 msgid "{Data Type} dicod-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25389
+#: doc/guix.texi:25652
 msgid "Data type representing the configuration of dicod."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25391
+#: doc/guix.texi:25654
 #, no-wrap
 msgid "@code{dico} (default: @var{dico})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25393
+#: doc/guix.texi:25656
 msgid "Package object of the GNU Dico dictionary server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25394
+#: doc/guix.texi:25657
 #, no-wrap
 msgid "@code{interfaces} (default: @var{'(\"localhost\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25398
+#: doc/guix.texi:25661
 msgid "This is the list of IP addresses and ports and possibly socket file names to listen to (@pxref{Server Settings, @code{listen} directive,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25399
+#: doc/guix.texi:25662
 #, no-wrap
 msgid "@code{handlers} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25401
+#: doc/guix.texi:25664
 msgid "List of @code{} objects denoting handlers (module instances)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25402
+#: doc/guix.texi:25665
 #, no-wrap
 msgid "@code{databases} (default: @var{(list %dicod-database:gcide)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25404
+#: doc/guix.texi:25667
 msgid "List of @code{} objects denoting dictionaries to be served."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25407
+#: doc/guix.texi:25670
 #, no-wrap
 msgid "{Data Type} dicod-handler"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25409
+#: doc/guix.texi:25672
 msgid "Data type representing a dictionary handler (module instance)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25413
+#: doc/guix.texi:25676
 msgid "Name of the handler (module instance)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25414
+#: doc/guix.texi:25677
 #, no-wrap
 msgid "@code{module} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25418
+#: doc/guix.texi:25681
 msgid "Name of the dicod module of the handler (instance).  If it is @code{#f}, the module has the same name as the handler.  (@pxref{Modules,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25421
+#: doc/guix.texi:25684
 msgid "List of strings or gexps representing the arguments for the module handler"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25424
+#: doc/guix.texi:25687
 #, no-wrap
 msgid "{Data Type} dicod-database"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25426
+#: doc/guix.texi:25689
 msgid "Data type representing a dictionary database."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25430
+#: doc/guix.texi:25693
 msgid "Name of the database, will be used in DICT commands."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:25431
+#: doc/guix.texi:25694
 #, no-wrap
 msgid "handler"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25434
+#: doc/guix.texi:25697
 msgid "Name of the dicod handler (module instance) used by this database (@pxref{Handlers,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25435
+#: doc/guix.texi:25698
 #, no-wrap
 msgid "@code{complex?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25438
+#: doc/guix.texi:25701
 msgid "Whether the database configuration complex.  The complex configuration will need a corresponding @code{} object, otherwise not."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25442
+#: doc/guix.texi:25705
 msgid "List of strings or gexps representing the arguments for the database (@pxref{Databases,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25445
+#: doc/guix.texi:25708
 #, no-wrap
 msgid "{Scheme Variable} %dicod-database:gcide"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25448
+#: doc/guix.texi:25711
 msgid "A @code{} object serving the GNU Collaborative International Dictionary of English using the @code{gcide} package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25451
+#: doc/guix.texi:25714
 msgid "The following is an example @code{dicod-service} configuration."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25466
+#: doc/guix.texi:25729
 #, no-wrap
 msgid ""
 "(dicod-service #:config\n"
@@ -46400,222 +47101,222 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25468
+#: doc/guix.texi:25731
 #, no-wrap
 msgid "Docker"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25469
+#: doc/guix.texi:25732
 #, no-wrap
 msgid "Docker Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25472
+#: doc/guix.texi:25735
 #, fuzzy
 #| msgid "The @code{(guix inferior)} module provides the following procedures to open an inferior:"
 msgid "The @code{(gnu services docker)} module provides the following services."
 msgstr "Модуль @code{(guix inferior)} предоставляет следующие процедуры для работы с ранними версиями:"
 
 #. type: defvr
-#: doc/guix.texi:25473
+#: doc/guix.texi:25736
 #, no-wrap
 msgid "{Scheme Variable} docker-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25478
+#: doc/guix.texi:25741
 msgid "This is the type of the service that runs @url{https://www.docker.com,Docker}, a daemon that can execute application bundles (sometimes referred to as ``containers'') in isolated environments."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25481
+#: doc/guix.texi:25744
 #, no-wrap
 msgid "{Data Type} docker-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25483
+#: doc/guix.texi:25746
 msgid "This is the data type representing the configuration of Docker and Containerd."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25486
+#: doc/guix.texi:25749
 #, no-wrap
 msgid "@code{package} (default: @code{docker})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25488
+#: doc/guix.texi:25751
 msgid "The Docker package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25489
+#: doc/guix.texi:25752
 #, no-wrap
 msgid "@code{containerd} (default: @var{containerd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25491
+#: doc/guix.texi:25754
 msgid "The Containerd package to use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25495
+#: doc/guix.texi:25758
 #, no-wrap
 msgid "Audit"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25496
+#: doc/guix.texi:25759
 #, fuzzy, no-wrap
 #| msgid "Audio Services"
 msgid "Auditd Service"
 msgstr "Сервисы аудио"
 
 #. type: Plain text
-#: doc/guix.texi:25499
+#: doc/guix.texi:25762
 #, fuzzy
 #| msgid "The @code{(guix inferior)} module provides the following procedures to open an inferior:"
 msgid "The @code{(gnu services auditd)} module provides the following service."
 msgstr "Модуль @code{(guix inferior)} предоставляет следующие процедуры для работы с ранними версиями:"
 
 #. type: defvr
-#: doc/guix.texi:25500
+#: doc/guix.texi:25763
 #, no-wrap
 msgid "{Scheme Variable} auditd-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25505
+#: doc/guix.texi:25768
 msgid "This is the type of the service that runs @url{https://people.redhat.com/sgrubb/audit/,auditd}, a daemon that tracks security-relevant information on your system."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25507
+#: doc/guix.texi:25770
 msgid "Examples of things that can be tracked:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:25511
+#: doc/guix.texi:25774
 #, fuzzy
 #| msgid "File Systems"
 msgid "File accesses"
 msgstr "Файловые системы"
 
 #. type: enumerate
-#: doc/guix.texi:25513
+#: doc/guix.texi:25776
 #, fuzzy
 #| msgid "System Installation"
 msgid "System calls"
 msgstr "Установка системы"
 
 #. type: enumerate
-#: doc/guix.texi:25515
+#: doc/guix.texi:25778
 #, fuzzy
 #| msgid "Invoking @command{guix gc}"
 msgid "Invoked commands"
 msgstr "Вызов @command{guix gc}"
 
 #. type: enumerate
-#: doc/guix.texi:25517
+#: doc/guix.texi:25780
 msgid "Failed login attempts"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:25519
+#: doc/guix.texi:25782
 msgid "Firewall filtering"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:25521
+#: doc/guix.texi:25784
 #, fuzzy
 #| msgid "Networking Services"
 msgid "Network access"
 msgstr "Сервисы сети"
 
 #. type: defvr
-#: doc/guix.texi:25530
+#: doc/guix.texi:25793
 msgid "@command{auditctl} from the @code{audit} package can be used in order to add or remove events to be tracked (until the next reboot).  In order to permanently track events, put the command line arguments of auditctl into @file{/etc/audit/audit.rules}.  @command{aureport} from the @code{audit} package can be used in order to view a report of all recorded events.  The audit daemon usually logs into the directory @file{/var/log/audit}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25533
+#: doc/guix.texi:25796
 #, fuzzy, no-wrap
 #| msgid "{Data Type} build-machine"
 msgid "{Data Type} auditd-configuration"
 msgstr "{Тип данных} build-machine"
 
 #. type: deftp
-#: doc/guix.texi:25535
+#: doc/guix.texi:25798
 msgid "This is the data type representing the configuration of auditd."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25538
+#: doc/guix.texi:25801
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{audit} (default: @code{audit})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:25540
+#: doc/guix.texi:25803
 #, fuzzy
 #| msgid "The package data type."
 msgid "The audit package to use."
 msgstr "Тип данных пакет"
 
 #. type: defvr
-#: doc/guix.texi:25544
+#: doc/guix.texi:25807
 #, no-wrap
 msgid "{Scheme Variable} singularity-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25549
+#: doc/guix.texi:25812
 msgid "This is the type of the service that allows you to run @url{https://www.sylabs.io/singularity/, Singularity}, a Docker-style tool to create and run application bundles (aka. ``containers'').  The value for this service is the Singularity package to use."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25553
+#: doc/guix.texi:25816
 msgid "The service does not install a daemon; instead, it installs helper programs as setuid-root (@pxref{Setuid Programs}) such that unprivileged users can invoke @command{singularity run} and similar commands."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25555
+#: doc/guix.texi:25818
 #, no-wrap
 msgid "Nix"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:25556
+#: doc/guix.texi:25819
 #, fuzzy, no-wrap
 #| msgid "DNS Services"
 msgid "Nix service"
 msgstr "Сервисы DNS"
 
 #. type: Plain text
-#: doc/guix.texi:25559
+#: doc/guix.texi:25822
 #, fuzzy
 #| msgid "The @code{(guix inferior)} module provides the following procedures to open an inferior:"
 msgid "The @code{(gnu services nix)} module provides the following service."
 msgstr "Модуль @code{(guix inferior)} предоставляет следующие процедуры для работы с ранними версиями:"
 
 #. type: defvr
-#: doc/guix.texi:25560
+#: doc/guix.texi:25823
 #, no-wrap
 msgid "{Scheme Variable} nix-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25565
+#: doc/guix.texi:25828
 msgid "This is the type of the service that runs build daemon of the @url{https://nixos.org/nix/, Nix} package manager.  Here is an example showing how to use it:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25570
+#: doc/guix.texi:25833
 #, no-wrap
 msgid ""
 "(use-modules (gnu))\n"
@@ -46625,7 +47326,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25575
+#: doc/guix.texi:25838
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -46636,7 +47337,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25578
+#: doc/guix.texi:25841
 #, no-wrap
 msgid ""
 "  (services (append (list (service nix-service-type))\n"
@@ -46644,29 +47345,29 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25581
+#: doc/guix.texi:25844
 msgid "After @command{guix system reconfigure} configure Nix for your user:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25583
+#: doc/guix.texi:25846
 #, no-wrap
 msgid "Add a Nix channel and update it.  See"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:25585
+#: doc/guix.texi:25848
 msgid "@url{https://nixos.org/nix/manual/, Nix Package Manager Guide}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25586
+#: doc/guix.texi:25849
 #, no-wrap
 msgid "Create a symlink to your profile and activate Nix profile:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25592
+#: doc/guix.texi:25855
 #, no-wrap
 msgid ""
 "$ ln -s \"/nix/var/nix/profiles/per-user/$USER/profile\" ~/.nix-profile\n"
@@ -46674,108 +47375,108 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25599
+#: doc/guix.texi:25862
 #, no-wrap
 msgid "setuid programs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25609
+#: doc/guix.texi:25872
 msgid "Some programs need to run with ``root'' privileges, even when they are launched by unprivileged users.  A notorious example is the @command{passwd} program, which users can run to change their password, and which needs to access the @file{/etc/passwd} and @file{/etc/shadow} files---something normally restricted to root, for obvious security reasons.  To address that, these executables are @dfn{setuid-root}, meaning that they always run with root privileges (@pxref{How Change Persona,,, libc, The GNU C Library Reference Manual}, for more info about the setuid mechanism.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25616
+#: doc/guix.texi:25879
 msgid "The store itself @emph{cannot} contain setuid programs: that would be a security issue since any user on the system can write derivations that populate the store (@pxref{The Store}).  Thus, a different mechanism is used: instead of changing the setuid bit directly on files that are in the store, we let the system administrator @emph{declare} which programs should be setuid root."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25622
+#: doc/guix.texi:25885
 msgid "The @code{setuid-programs} field of an @code{operating-system} declaration contains a list of G-expressions denoting the names of programs to be setuid-root (@pxref{Using the Configuration System}).  For instance, the @command{passwd} program, which is part of the Shadow package, can be designated by this G-expression (@pxref{G-Expressions}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25625
+#: doc/guix.texi:25888
 #, no-wrap
 msgid "#~(string-append #$shadow \"/bin/passwd\")\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25629
+#: doc/guix.texi:25892
 msgid "A default set of setuid programs is defined by the @code{%setuid-programs} variable of the @code{(gnu system)} module."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25630
+#: doc/guix.texi:25893
 #, no-wrap
 msgid "{Scheme Variable} %setuid-programs"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25632
+#: doc/guix.texi:25895
 msgid "A list of G-expressions denoting common programs that are setuid-root."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25635
+#: doc/guix.texi:25898
 msgid "The list includes commands such as @command{passwd}, @command{ping}, @command{su}, and @command{sudo}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25641
+#: doc/guix.texi:25904
 msgid "Under the hood, the actual setuid programs are created in the @file{/run/setuid-programs} directory at system activation time.  The files in this directory refer to the ``real'' binaries, which are in the store."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25645
+#: doc/guix.texi:25908
 #, no-wrap
 msgid "HTTPS, certificates"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25646
+#: doc/guix.texi:25909
 #, no-wrap
 msgid "X.509 certificates"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25647
+#: doc/guix.texi:25910
 #, no-wrap
 msgid "TLS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25654
+#: doc/guix.texi:25917
 msgid "Web servers available over HTTPS (that is, HTTP over the transport-layer security mechanism, TLS) send client programs an @dfn{X.509 certificate} that the client can then use to @emph{authenticate} the server.  To do that, clients verify that the server's certificate is signed by a so-called @dfn{certificate authority} (CA).  But to verify the CA's signature, clients must have first acquired the CA's certificate."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25658
+#: doc/guix.texi:25921
 msgid "Web browsers such as GNU@tie{}IceCat include their own set of CA certificates, such that they are able to verify CA signatures out-of-the-box."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25662
+#: doc/guix.texi:25925
 msgid "However, most other programs that can talk HTTPS---@command{wget}, @command{git}, @command{w3m}, etc.---need to be told where CA certificates can be found."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25669
+#: doc/guix.texi:25932
 msgid "In Guix, this is done by adding a package that provides certificates to the @code{packages} field of the @code{operating-system} declaration (@pxref{operating-system Reference}).  Guix includes one such package, @code{nss-certs}, which is a set of CA certificates provided as part of Mozilla's Network Security Services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25674
+#: doc/guix.texi:25937
 msgid "Note that it is @emph{not} part of @code{%base-packages}, so you need to explicitly add it.  The @file{/etc/ssl/certs} directory, which is where most applications and libraries look for certificates by default, points to the certificates installed globally."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25684
+#: doc/guix.texi:25947
 msgid "Unprivileged users, including users of Guix on a foreign distro, can also install their own certificate package in their profile.  A number of environment variables need to be defined so that applications and libraries know where to find them.  Namely, the OpenSSL library honors the @code{SSL_CERT_DIR} and @code{SSL_CERT_FILE} variables.  Some applications add their own environment variables; for instance, the Git version control system honors the certificate bundle pointed to by the @code{GIT_SSL_CAINFO} environment variable.  Thus, you would typically run something like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25690
+#: doc/guix.texi:25953
 #, no-wrap
 msgid ""
 "$ guix install nss-certs\n"
@@ -46785,12 +47486,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25695
+#: doc/guix.texi:25958
 msgid "As another example, R requires the @code{CURL_CA_BUNDLE} environment variable to point to a certificate bundle, so you would have to run something like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25699
+#: doc/guix.texi:25962
 #, no-wrap
 msgid ""
 "$ guix install nss-certs\n"
@@ -46798,51 +47499,51 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25703
+#: doc/guix.texi:25966
 msgid "For other applications you may want to look up the required environment variable in the relevant documentation."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25708
+#: doc/guix.texi:25971
 #, no-wrap
 msgid "name service switch"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25709
+#: doc/guix.texi:25972
 #, no-wrap
 msgid "NSS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25718
+#: doc/guix.texi:25981
 msgid "The @code{(gnu system nss)} module provides bindings to the configuration file of the libc @dfn{name service switch} or @dfn{NSS} (@pxref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}).  In a nutshell, the NSS is a mechanism that allows libc to be extended with new ``name'' lookup methods for system databases, which includes host names, service names, user accounts, and more (@pxref{Name Service Switch, System Databases and Name Service Switch,, libc, The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25725
+#: doc/guix.texi:25988
 msgid "The NSS configuration specifies, for each system database, which lookup method is to be used, and how the various methods are chained together---for instance, under which circumstances NSS should try the next method in the list.  The NSS configuration is given in the @code{name-service-switch} field of @code{operating-system} declarations (@pxref{operating-system Reference, @code{name-service-switch}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25726
+#: doc/guix.texi:25989
 #, no-wrap
 msgid "nss-mdns"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25727
+#: doc/guix.texi:25990
 #, no-wrap
 msgid ".local, host name lookup"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25732
-msgid "As an example, the declaration below configures the NSS to use the @uref{http://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns} back-end}, which supports host name lookups over multicast DNS (mDNS)  for host names ending in @code{.local}:"
+#: doc/guix.texi:25995
+msgid "As an example, the declaration below configures the NSS to use the @uref{https://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns} back-end}, which supports host name lookups over multicast DNS (mDNS)  for host names ending in @code{.local}:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25736
+#: doc/guix.texi:25999
 #, no-wrap
 msgid ""
 "(name-service-switch\n"
@@ -46851,7 +47552,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25741
+#: doc/guix.texi:26004
 #, no-wrap
 msgid ""
 "                ;; If the above did not succeed, try\n"
@@ -46862,7 +47563,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25747
+#: doc/guix.texi:26010
 #, no-wrap
 msgid ""
 "                  ;; 'mdns_minimal' is authoritative for\n"
@@ -46874,7 +47575,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25751
+#: doc/guix.texi:26014
 #, no-wrap
 msgid ""
 "                ;; Then fall back to DNS.\n"
@@ -46884,7 +47585,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25755
+#: doc/guix.texi:26018
 #, no-wrap
 msgid ""
 "                ;; Finally, try with the \"full\" 'mdns'.\n"
@@ -46893,157 +47594,157 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25760
+#: doc/guix.texi:26023
 msgid "Do not worry: the @code{%mdns-host-lookup-nss} variable (see below)  contains this configuration, so you will not have to type it if all you want is to have @code{.local} host lookup working."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25768
+#: doc/guix.texi:26031
 msgid "Note that, in this case, in addition to setting the @code{name-service-switch} of the @code{operating-system} declaration, you also need to use @code{avahi-service-type} (@pxref{Networking Services, @code{avahi-service-type}}), or @code{%desktop-services}, which includes it (@pxref{Desktop Services}).  Doing this makes @code{nss-mdns} accessible to the name service cache daemon (@pxref{Base Services, @code{nscd-service}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25771
+#: doc/guix.texi:26034
 msgid "For convenience, the following variables provide typical NSS configurations."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25772
+#: doc/guix.texi:26035
 #, no-wrap
 msgid "{Scheme Variable} %default-nss"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25775
+#: doc/guix.texi:26038
 msgid "This is the default name service switch configuration, a @code{name-service-switch} object."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25777
+#: doc/guix.texi:26040
 #, no-wrap
 msgid "{Scheme Variable} %mdns-host-lookup-nss"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25780
+#: doc/guix.texi:26043
 msgid "This is the name service switch configuration with support for host name lookup over multicast DNS (mDNS) for host names ending in @code{.local}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25790
+#: doc/guix.texi:26053
 msgid "The reference for name service switch configuration is given below.  It is a direct mapping of the configuration file format of the C library , so please refer to the C library manual for more information (@pxref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}).  Compared to the configuration file format of libc NSS, it has the advantage not only of adding this warm parenthetic feel that we like, but also static checks: you will know about syntax errors and typos as soon as you run @command{guix system}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25791
+#: doc/guix.texi:26054
 #, no-wrap
 msgid "{Data Type} name-service-switch"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25796
+#: doc/guix.texi:26059
 msgid "This is the data type representation the configuration of libc's name service switch (NSS).  Each field below represents one of the supported system databases."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25798
+#: doc/guix.texi:26061
 #, no-wrap
 msgid "aliases"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:25799
+#: doc/guix.texi:26062
 #, no-wrap
 msgid "ethers"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:25801
+#: doc/guix.texi:26064
 #, no-wrap
 msgid "gshadow"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:25802
+#: doc/guix.texi:26065
 #, no-wrap
 msgid "hosts"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:25803
+#: doc/guix.texi:26066
 #, no-wrap
 msgid "initgroups"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:25804
+#: doc/guix.texi:26067
 #, no-wrap
 msgid "netgroup"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:25805
+#: doc/guix.texi:26068
 #, no-wrap
 msgid "networks"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:25807
+#: doc/guix.texi:26070
 #, no-wrap
 msgid "public-key"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:25808
+#: doc/guix.texi:26071
 #, no-wrap
 msgid "rpc"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:25810
+#: doc/guix.texi:26073
 #, no-wrap
 msgid "shadow"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25813
+#: doc/guix.texi:26076
 msgid "The system databases handled by the NSS.  Each of these fields must be a list of @code{} objects (see below)."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25816
+#: doc/guix.texi:26079
 #, no-wrap
 msgid "{Data Type} name-service"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25820
+#: doc/guix.texi:26083
 msgid "This is the data type representing an actual name service and the associated lookup action."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25825
+#: doc/guix.texi:26088
 msgid "A string denoting the name service (@pxref{Services in the NSS configuration,,, libc, The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25830
+#: doc/guix.texi:26093
 msgid "Note that name services listed here must be visible to nscd.  This is achieved by passing the @code{#:name-services} argument to @code{nscd-service} the list of packages providing the needed name services (@pxref{Base Services, @code{nscd-service}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25831
+#: doc/guix.texi:26094
 #, no-wrap
 msgid "reaction"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25835
+#: doc/guix.texi:26098
 msgid "An action specified using the @code{lookup-specification} macro (@pxref{Actions in the NSS configuration,,, libc, The GNU C Library Reference Manual}).  For example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25839
+#: doc/guix.texi:26102
 #, no-wrap
 msgid ""
 "(lookup-specification (unavailable => continue)\n"
@@ -47051,17 +47752,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25853
+#: doc/guix.texi:26116
 msgid "For bootstrapping purposes, the Linux-Libre kernel is passed an @dfn{initial RAM disk}, or @dfn{initrd}.  An initrd contains a temporary root file system as well as an initialization script.  The latter is responsible for mounting the real root file system, and for loading any kernel modules that may be needed to achieve that."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25862
+#: doc/guix.texi:26125
 msgid "The @code{initrd-modules} field of an @code{operating-system} declaration allows you to specify Linux-libre kernel modules that must be available in the initrd.  In particular, this is where you would list modules needed to actually drive the hard disk where your root partition is---although the default value of @code{initrd-modules} should cover most use cases.  For example, assuming you need the @code{megaraid_sas} module in addition to the default modules to be able to access your root file system, you would write:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25867
+#: doc/guix.texi:26130
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -47070,28 +47771,28 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25869
+#: doc/guix.texi:26132
 #, no-wrap
 msgid "{Scheme Variable} %base-initrd-modules"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25871
+#: doc/guix.texi:26134
 msgid "This is the list of kernel modules included in the initrd by default."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25879
+#: doc/guix.texi:26142
 msgid "Furthermore, if you need lower-level customization, the @code{initrd} field of an @code{operating-system} declaration allows you to specify which initrd you would like to use.  The @code{(gnu system linux-initrd)} module provides three ways to build an initrd: the high-level @code{base-initrd} procedure and the low-level @code{raw-initrd} and @code{expression->initrd} procedures."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25884
+#: doc/guix.texi:26147
 msgid "The @code{base-initrd} procedure is intended to cover most common uses.  For example, if you want to add a bunch of kernel modules to be loaded at boot time, you can define the @code{initrd} field of the operating system declaration like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:25892
+#: doc/guix.texi:26155
 #, no-wrap
 msgid ""
 "(initrd (lambda (file-systems . rest)\n"
@@ -47103,370 +47804,370 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25897
+#: doc/guix.texi:26160
 msgid "The @code{base-initrd} procedure also handles common use cases that involves using the system as a QEMU guest, or as a ``live'' system with volatile root file system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25904
+#: doc/guix.texi:26167
 msgid "The @code{base-initrd} procedure is built from @code{raw-initrd} procedure.  Unlike @code{base-initrd}, @code{raw-initrd} doesn't do anything high-level, such as trying to guess which kernel modules and packages should be included to the initrd. An example use of @code{raw-initrd} is when a user has a custom Linux kernel configuration and default kernel modules included by @code{base-initrd} are not available."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25909
+#: doc/guix.texi:26172
 msgid "The initial RAM disk produced by @code{base-initrd} or @code{raw-initrd} honors several options passed on the Linux kernel command line (that is, arguments passed @i{via} the @code{linux} command of GRUB, or the @code{-append} option of QEMU), notably:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25911
+#: doc/guix.texi:26174
 #, no-wrap
 msgid "--load=@var{boot}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25914
+#: doc/guix.texi:26177
 msgid "Tell the initial RAM disk to load @var{boot}, a file containing a Scheme program, once it has mounted the root file system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25918
+#: doc/guix.texi:26181
 msgid "Guix uses this option to yield control to a boot program that runs the service activation programs and then spawns the GNU@tie{}Shepherd, the initialization system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25919
+#: doc/guix.texi:26182
 #, no-wrap
 msgid "--root=@var{root}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25923
+#: doc/guix.texi:26186
 msgid "Mount @var{root} as the root file system.  @var{root} can be a device name like @code{/dev/sda1}, a file system label, or a file system UUID."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25927
+#: doc/guix.texi:26190
 msgid "Have @file{/run/booted-system} and @file{/run/current-system} point to @var{system}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25928
+#: doc/guix.texi:26191
 #, no-wrap
 msgid "modprobe.blacklist=@var{modules}@dots{}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25929
+#: doc/guix.texi:26192
 #, no-wrap
 msgid "module, black-listing"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25930
+#: doc/guix.texi:26193
 #, no-wrap
 msgid "black list, of kernel modules"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25935
+#: doc/guix.texi:26198
 msgid "Instruct the initial RAM disk as well as the @command{modprobe} command (from the kmod package) to refuse to load @var{modules}.  @var{modules} must be a comma-separated list of module names---e.g., @code{usbkbd,9pnet}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25936
+#: doc/guix.texi:26199
 #, no-wrap
 msgid "--repl"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25942
+#: doc/guix.texi:26205
 msgid "Start a read-eval-print loop (REPL) from the initial RAM disk before it tries to load kernel modules and to mount the root file system.  Our marketing team calls it @dfn{boot-to-Guile}.  The Schemer in you will love it.  @xref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}, for more information on Guile's REPL."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25948
+#: doc/guix.texi:26211
 msgid "Now that you know all the features that initial RAM disks produced by @code{base-initrd} and @code{raw-initrd} provide, here is how to use it and customize it further."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25951
+#: doc/guix.texi:26214
 #, no-wrap
 msgid "{Scheme Procedure} raw-initrd @var{file-systems} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25964
+#: doc/guix.texi:26227
 msgid "[#:linux-modules '()] [#:mapped-devices '()] @ [#:keyboard-layout #f] @ [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] Return a derivation that builds a raw initrd.  @var{file-systems} is a list of file systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @code{--root}.  @var{linux-modules} is a list of kernel modules to be loaded at boot time.  @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted (@pxref{Mapped Devices}).  @var{helper-packages} is a list of packages to be copied in the initrd. It may include @code{e2fsck/static} or other packages needed by the initrd to check the root file system."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25970 doc/guix.texi:25994
+#: doc/guix.texi:26233 doc/guix.texi:26257
 msgid "When true, @var{keyboard-layout} is a @code{} record denoting the desired console keyboard layout.  This is done before @var{mapped-devices} are set up and before @var{file-systems} are mounted such that, should the user need to enter a passphrase or use the REPL, this happens using the intended keyboard layout."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25974
+#: doc/guix.texi:26237
 msgid "When @var{qemu-networking?} is true, set up networking with the standard QEMU parameters.  When @var{virtio?} is true, load additional modules so that the initrd can be used as a QEMU guest with para-virtualized I/O drivers."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25977
+#: doc/guix.texi:26240
 msgid "When @var{volatile-root?} is true, the root file system is writable but any changes to it are lost."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25979
+#: doc/guix.texi:26242
 #, no-wrap
 msgid "{Scheme Procedure} base-initrd @var{file-systems} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25988
+#: doc/guix.texi:26251
 msgid "[#:mapped-devices '()] [#:keyboard-layout #f] @ [#:qemu-networking? #f] [#:volatile-root? #f] @ [#:linux-modules '()] Return as a file-like object a generic initrd, with kernel modules taken from @var{linux}.  @var{file-systems} is a list of file-systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @code{--root}.  @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25996
+#: doc/guix.texi:26259
 msgid "@var{qemu-networking?} and @var{volatile-root?} behaves as in @code{raw-initrd}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:26001
+#: doc/guix.texi:26264
 msgid "The initrd is automatically populated with all the kernel modules necessary for @var{file-systems} and for the given options.  Additional kernel modules can be listed in @var{linux-modules}.  They will be added to the initrd, and loaded at boot time in the order in which they appear."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26008
+#: doc/guix.texi:26271
 msgid "Needless to say, the initrds we produce and use embed a statically-linked Guile, and the initialization program is a Guile program.  That gives a lot of flexibility.  The @code{expression->initrd} procedure builds such an initrd, given the program to run in that initrd."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:26009
+#: doc/guix.texi:26272
 #, no-wrap
 msgid "{Scheme Procedure} expression->initrd @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:26015
+#: doc/guix.texi:26278
 msgid "[#:guile %guile-static-stripped] [#:name \"guile-initrd\"] Return as a file-like object a Linux initrd (a gzipped cpio archive)  containing @var{guile} and that evaluates @var{exp}, a G-expression, upon booting.  All the derivations referenced by @var{exp} are automatically copied to the initrd."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26021
+#: doc/guix.texi:26284
 #, no-wrap
 msgid "boot loader"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26028
+#: doc/guix.texi:26291
 msgid "The operating system supports multiple bootloaders.  The bootloader is configured using @code{bootloader-configuration} declaration.  All the fields of this structure are bootloader agnostic except for one field, @code{bootloader} that indicates the bootloader to be configured and installed."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26033
+#: doc/guix.texi:26296
 msgid "Some of the bootloaders do not honor every field of @code{bootloader-configuration}.  For instance, the extlinux bootloader does not support themes and thus ignores the @code{theme} field."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:26034
+#: doc/guix.texi:26297
 #, no-wrap
 msgid "{Data Type} bootloader-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:26036
+#: doc/guix.texi:26299
 msgid "The type of a bootloader configuration declaration."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26040
+#: doc/guix.texi:26303
 #, no-wrap
 msgid "EFI, bootloader"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26041
+#: doc/guix.texi:26304
 #, no-wrap
 msgid "UEFI, bootloader"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26042
+#: doc/guix.texi:26305
 #, no-wrap
 msgid "BIOS, bootloader"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26046
+#: doc/guix.texi:26309
 msgid "The bootloader to use, as a @code{bootloader} object. For now @code{grub-bootloader}, @code{grub-efi-bootloader}, @code{extlinux-bootloader} and @code{u-boot-bootloader} are supported."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26052
+#: doc/guix.texi:26315
 msgid "@code{grub-efi-bootloader} allows to boot on modern systems using the @dfn{Unified Extensible Firmware Interface} (UEFI).  This is what you should use if the installation image contains a @file{/sys/firmware/efi} directory when you boot it on your system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26056
+#: doc/guix.texi:26319
 msgid "@code{grub-bootloader} allows you to boot in particular Intel-based machines in ``legacy'' BIOS mode."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26057
+#: doc/guix.texi:26320
 #, no-wrap
 msgid "ARM, bootloaders"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26058
+#: doc/guix.texi:26321
 #, no-wrap
 msgid "AArch64, bootloaders"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26063
+#: doc/guix.texi:26326
 msgid "Available bootloaders are described in @code{(gnu bootloader @dots{})} modules.  In particular, @code{(gnu bootloader u-boot)} contains definitions of bootloaders for a wide range of ARM and AArch64 systems, using the @uref{https://www.denx.de/wiki/U-Boot/, U-Boot bootloader}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26067
+#: doc/guix.texi:26330
 msgid "This is a string denoting the target onto which to install the bootloader."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26074
+#: doc/guix.texi:26337
 msgid "The interpretation depends on the bootloader in question.  For @code{grub-bootloader}, for example, it should be a device name understood by the bootloader @command{installer} command, such as @code{/dev/sda} or @code{(hd0)} (@pxref{Invoking grub-install,,, grub, GNU GRUB Manual}).  For @code{grub-efi-bootloader}, it should be the mount point of the EFI file system, usually @file{/boot/efi}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26075
+#: doc/guix.texi:26338
 #, no-wrap
 msgid "@code{menu-entries} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26079
+#: doc/guix.texi:26342
 msgid "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."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26080
+#: doc/guix.texi:26343
 #, no-wrap
 msgid "@code{default-entry} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26083
+#: doc/guix.texi:26346
 msgid "The index of the default boot menu entry.  Index 0 is for the entry of the current system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26084
+#: doc/guix.texi:26347
 #, no-wrap
 msgid "@code{timeout} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26087
+#: doc/guix.texi:26350
 msgid "The number of seconds to wait for keyboard input before booting.  Set to 0 to boot immediately, and to -1 to wait indefinitely."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26088
+#: doc/guix.texi:26351
 #, no-wrap
 msgid "keyboard layout, for the bootloader"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26092
+#: doc/guix.texi:26355
 msgid "If this is @code{#f}, the bootloader's menu (if any) uses the default keyboard layout, usually US@tie{}English (``qwerty'')."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26095
+#: doc/guix.texi:26358
 msgid "Otherwise, this must be a @code{keyboard-layout} object (@pxref{Keyboard Layout})."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:26099
+#: doc/guix.texi:26362
 msgid "This option is currently ignored by bootloaders other than @code{grub} and @code{grub-efi}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26101
+#: doc/guix.texi:26364
 #, no-wrap
 msgid "@code{theme} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26105
+#: doc/guix.texi:26368
 msgid "The bootloader theme object describing the theme to use.  If no theme is provided, some bootloaders might use a default theme, that's true for GRUB."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26106
+#: doc/guix.texi:26369
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{terminal-outputs} (default: @code{'(gfxterm)})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:26113
+#: doc/guix.texi:26376
 msgid "The output terminals used for the bootloader boot menu, as a list of symbols.  GRUB accepts the values: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{gfxterm}, @code{vga_text}, @code{mda_text}, @code{morse}, and @code{pkmodem}.  This field corresponds to the GRUB variable @code{GRUB_TERMINAL_OUTPUT} (@pxref{Simple configuration,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26114
+#: doc/guix.texi:26377
 #, no-wrap
 msgid "@code{terminal-inputs} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26122
+#: doc/guix.texi:26385
 msgid "The input terminals used for the bootloader boot menu, as a list of symbols.  For GRUB, the default is the native platform terminal as determined at run-time.  GRUB accepts the values: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{at_keyboard}, and @code{usb_keyboard}.  This field corresponds to the GRUB variable @code{GRUB_TERMINAL_INPUT} (@pxref{Simple configuration,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26123
+#: doc/guix.texi:26386
 #, no-wrap
 msgid "@code{serial-unit} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26127
+#: doc/guix.texi:26390
 msgid "The serial unit used by the bootloader, as an integer from 0 to 3.  For GRUB, it is chosen at run-time; currently GRUB chooses 0, which corresponds to COM1 (@pxref{Serial terminal,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26128
+#: doc/guix.texi:26391
 #, no-wrap
 msgid "@code{serial-speed} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26132
+#: doc/guix.texi:26395
 msgid "The speed of the serial interface, as an integer.  For GRUB, the default value is chosen at run-time; currently GRUB chooses 9600@tie{}bps (@pxref{Serial terminal,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26136
+#: doc/guix.texi:26399
 #, no-wrap
 msgid "dual boot"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26137
+#: doc/guix.texi:26400
 #, no-wrap
 msgid "boot menu"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26143
+#: doc/guix.texi:26406
 msgid "Should you want to list additional boot menu entries @i{via} the @code{menu-entries} field above, you will need to create them with the @code{menu-entry} form.  For example, imagine you want to be able to boot another distro (hard to imagine!), you can define a menu entry along these lines:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:26150
+#: doc/guix.texi:26413
 #, no-wrap
 msgid ""
 "(menu-entry\n"
@@ -47477,156 +48178,156 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26153
+#: doc/guix.texi:26416
 msgid "Details below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:26154
+#: doc/guix.texi:26417
 #, no-wrap
 msgid "{Data Type} menu-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:26156
+#: doc/guix.texi:26419
 msgid "The type of an entry in the bootloader menu."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26161
+#: doc/guix.texi:26424
 msgid "The label to show in the menu---e.g., @code{\"GNU\"}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:26162
+#: doc/guix.texi:26425
 #, no-wrap
 msgid "linux"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26164
+#: doc/guix.texi:26427
 msgid "The Linux kernel image to boot, for example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:26167
+#: doc/guix.texi:26430
 #, no-wrap
 msgid "(file-append linux-libre \"/bzImage\")\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26172
+#: doc/guix.texi:26435
 msgid "For GRUB, it is also possible to specify a device explicitly in the file path using GRUB's device naming convention (@pxref{Naming convention,,, grub, GNU GRUB manual}), for example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26175
+#: doc/guix.texi:26438
 #, no-wrap
 msgid "\"(hd0,msdos1)/boot/vmlinuz\"\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26179
+#: doc/guix.texi:26442
 msgid "If the device is specified explicitly as above, then the @code{device} field is ignored entirely."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26180
+#: doc/guix.texi:26443
 #, no-wrap
 msgid "@code{linux-arguments} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26183
+#: doc/guix.texi:26446
 msgid "The list of extra Linux kernel command-line arguments---e.g., @code{(\"console=ttyS0\")}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26187
+#: doc/guix.texi:26450
 msgid "A G-Expression or string denoting the file name of the initial RAM disk to use (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26187
+#: doc/guix.texi:26450
 #, no-wrap
 msgid "@code{device} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26190
+#: doc/guix.texi:26453
 msgid "The device where the kernel and initrd are to be found---i.e., for GRUB, @dfn{root} for this menu entry (@pxref{root,,, grub, GNU GRUB manual})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26196
+#: doc/guix.texi:26459
 msgid "This may be a file system label (a string), a file system UUID (a bytevector, @pxref{File Systems}), or @code{#f}, in which case the bootloader will search the device containing the file specified by the @code{linux} field (@pxref{search,,, grub, GNU GRUB manual}).  It must @emph{not} be an OS device name such as @file{/dev/sda1}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26200 doc/guix.texi:26259
+#: doc/guix.texi:26463 doc/guix.texi:26522
 #, no-wrap
 msgid "HDPI"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26201 doc/guix.texi:26260
+#: doc/guix.texi:26464 doc/guix.texi:26523
 #, no-wrap
 msgid "HiDPI"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26202 doc/guix.texi:26261
+#: doc/guix.texi:26465 doc/guix.texi:26524
 #, fuzzy, no-wrap
 #| msgid "isolation"
 msgid "resolution"
 msgstr "изоляция"
 
 #. type: Plain text
-#: doc/guix.texi:26206
+#: doc/guix.texi:26469
 msgid "For now only GRUB has theme support.  GRUB themes are created using the @code{grub-theme} form, which is not fully documented yet."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:26207
+#: doc/guix.texi:26470
 #, fuzzy, no-wrap
 #| msgid "{Data Type} build-machine"
 msgid "{Data Type} grub-theme"
 msgstr "{Тип данных} build-machine"
 
 #. type: deftp
-#: doc/guix.texi:26209
+#: doc/guix.texi:26472
 msgid "Data type representing the configuration of the GRUB theme."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26211
+#: doc/guix.texi:26474
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{gfxmode} (default: @code{'(\"auto\")})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:26214
+#: doc/guix.texi:26477
 msgid "The GRUB @code{gfxmode} to set (a list of screen resolution strings, see @pxref{gfxmode,,, grub, GNU GRUB manual})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:26221
+#: doc/guix.texi:26484
 msgid "This is the default GRUB theme used by the operating system if no @code{theme} field is specified in @code{bootloader-configuration} record."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:26224
+#: doc/guix.texi:26487
 msgid "It comes with a fancy background image displaying the GNU and Guix logos."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26228
+#: doc/guix.texi:26491
 msgid "For example, to override the default resolution, you may use something like"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:26236
+#: doc/guix.texi:26499
 #, no-wrap
 msgid ""
 "(bootloader\n"
@@ -47638,40 +48339,40 @@ msgid ""
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:26239
+#: doc/guix.texi:26502
 #, no-wrap
 msgid "Invoking @code{guix system}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26244
+#: doc/guix.texi:26507
 msgid "Once you have written an operating system declaration as seen in the previous section, it can be @dfn{instantiated} using the @command{guix system} command.  The synopsis is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26247
+#: doc/guix.texi:26510
 #, no-wrap
 msgid "guix system @var{options}@dots{} @var{action} @var{file}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26253
+#: doc/guix.texi:26516
 msgid "@var{file} must be the name of a file containing an @code{operating-system} declaration.  @var{action} specifies how the operating system is instantiated.  Currently the following values are supported:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26255
+#: doc/guix.texi:26518
 #, no-wrap
 msgid "search"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26258
+#: doc/guix.texi:26521
 msgid "Display available service type definitions that match the given regular expressions, sorted by relevance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26280
+#: doc/guix.texi:26543
 #, no-wrap
 msgid ""
 "$ guix system search console\n"
@@ -47695,7 +48396,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26286
+#: doc/guix.texi:26549
 #, no-wrap
 msgid ""
 "name: mingetty\n"
@@ -47707,7 +48408,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26293
+#: doc/guix.texi:26556
 #, no-wrap
 msgid ""
 "name: login\n"
@@ -47720,66 +48421,66 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26295
+#: doc/guix.texi:26558
 #, no-wrap
 msgid "@dots{}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26300
+#: doc/guix.texi:26563
 msgid "As for @command{guix package --search}, the result is written in @code{recutils} format, which makes it easy to filter the output (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26301
+#: doc/guix.texi:26564
 #, no-wrap
 msgid "reconfigure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26306
+#: doc/guix.texi:26569
 msgid "Build the operating system described in @var{file}, activate it, and switch to it@footnote{This action (and the related actions @code{switch-generation} and @code{roll-back}) are usable only on systems already running Guix System.}."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:26314
+#: doc/guix.texi:26577
 msgid "It is highly recommended to run @command{guix pull} once before you run @command{guix system reconfigure} for the first time (@pxref{Invoking guix pull}).  Failing to do that you would see an older version of Guix once @command{reconfigure} has completed."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26322
+#: doc/guix.texi:26585
 msgid "This effects all the configuration specified in @var{file}: user accounts, system services, global package list, setuid programs, etc.  The command starts system services specified in @var{file} that are not currently running; if a service is currently running this command will arrange for it to be upgraded the next time it is stopped (e.g.@: by @code{herd stop X} or @code{herd restart X})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26328
+#: doc/guix.texi:26591
 msgid "This command creates a new generation whose number is one greater than the current generation (as reported by @command{guix system list-generations}).  If that generation already exists, it will be overwritten.  This behavior mirrors that of @command{guix package} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26333
+#: doc/guix.texi:26596
 msgid "It also adds a bootloader menu entry for the new OS configuration, ---unless @option{--no-bootloader} is passed.  For GRUB, it moves entries for older configurations to a submenu, allowing you to choose an older system generation at boot time should you need it."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26334 doc/guix.texi:26616 doc/guix.texi:27493
+#: doc/guix.texi:26597 doc/guix.texi:26879 doc/guix.texi:27776
 #, fuzzy, no-wrap
 #| msgid "provenance tracking, of software artifacts"
 msgid "provenance tracking, of the operating system"
 msgstr "трекинг источника, артефакты программного обеспечения"
 
 #. type: table
-#: doc/guix.texi:26340
+#: doc/guix.texi:26603
 msgid "Upon completion, the new system is deployed under @file{/run/current-system}.  This directory contains @dfn{provenance meta-data}: the list of channels in use (@pxref{Channels}) and @var{file} itself, when available.  This information is useful should you later want to inspect how this particular generation was built."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26343
+#: doc/guix.texi:26606
 msgid "In fact, assuming @var{file} is self-contained, you can later rebuild generation @var{n} of your operating system with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26349
+#: doc/guix.texi:26612
 #, no-wrap
 msgid ""
 "guix time-machine \\\n"
@@ -47789,217 +48490,217 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26355
+#: doc/guix.texi:26618
 msgid "You can think of it as some sort of built-in version control! Your system is not just a binary artifact: @emph{it carries its own source}.  @xref{Service Reference, @code{provenance-service-type}}, for more information on provenance tracking."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26356
+#: doc/guix.texi:26619
 #, no-wrap
 msgid "switch-generation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26365
-msgid "Switch to an existing system generation.  This action atomically switches the system profile to the specified system generation.  It also rearranges the system's existing bootloader menu entries.  It makes the menu entry for the specified system generation the default, and it moves the entries for the other generatiors to a submenu, if supported by the bootloader being used.  The next time the system boots, it will use the specified system generation."
+#: doc/guix.texi:26628
+msgid "Switch to an existing system generation.  This action atomically switches the system profile to the specified system generation.  It also rearranges the system's existing bootloader menu entries.  It makes the menu entry for the specified system generation the default, and it moves the entries for the other generations to a submenu, if supported by the bootloader being used.  The next time the system boots, it will use the specified system generation."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26369
+#: doc/guix.texi:26632
 msgid "The bootloader itself is not being reinstalled when using this command.  Thus, the installed bootloader is used with an updated configuration file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26373
+#: doc/guix.texi:26636
 msgid "The target generation can be specified explicitly by its generation number.  For example, the following invocation would switch to system generation 7:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26376
+#: doc/guix.texi:26639
 #, no-wrap
 msgid "guix system switch-generation 7\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26384
+#: doc/guix.texi:26647
 msgid "The target generation can also be specified relative to the current generation with the form @code{+N} or @code{-N}, where @code{+3} means ``3 generations ahead of the current generation,'' and @code{-1} means ``1 generation prior to the current generation.'' When specifying a negative value such as @code{-1}, you must precede it with @code{--} to prevent it from being parsed as an option.  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26387
+#: doc/guix.texi:26650
 #, no-wrap
 msgid "guix system switch-generation -- -1\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26395
+#: doc/guix.texi:26658
 msgid "Currently, the effect of invoking this action is @emph{only} to switch the system profile to an existing generation and rearrange the bootloader menu entries.  To actually start using the target system generation, you must reboot after running this action.  In the future, it will be updated to do the same things as @command{reconfigure}, like activating and deactivating services."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26397
+#: doc/guix.texi:26660
 msgid "This action will fail if the specified generation does not exist."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26398
+#: doc/guix.texi:26661
 #, no-wrap
 msgid "roll-back"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26404
+#: doc/guix.texi:26667
 msgid "Switch to the preceding system generation.  The next time the system boots, it will use the preceding system generation.  This is the inverse of @command{reconfigure}, and it is exactly the same as invoking @command{switch-generation} with an argument of @code{-1}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26408
+#: doc/guix.texi:26671
 msgid "Currently, as with @command{switch-generation}, you must reboot after running this action to actually start using the preceding system generation."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26409
+#: doc/guix.texi:26672
 #, no-wrap
 msgid "delete-generations"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26410
+#: doc/guix.texi:26673
 #, no-wrap
 msgid "deleting system generations"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26411
+#: doc/guix.texi:26674
 #, no-wrap
 msgid "saving space"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26415
+#: doc/guix.texi:26678
 msgid "Delete system generations, making them candidates for garbage collection (@pxref{Invoking guix gc}, for information on how to run the ``garbage collector'')."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26419
+#: doc/guix.texi:26682
 msgid "This works in the same way as @command{guix package --delete-generations} (@pxref{Invoking guix package, @code{--delete-generations}}).  With no arguments, all system generations but the current one are deleted:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26422
+#: doc/guix.texi:26685
 #, no-wrap
 msgid "guix system delete-generations\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26426
+#: doc/guix.texi:26689
 msgid "You can also select the generations you want to delete.  The example below deletes all the system generations that are more than two month old:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26429
+#: doc/guix.texi:26692
 #, no-wrap
 msgid "guix system delete-generations 2m\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26434
+#: doc/guix.texi:26697
 msgid "Running this command automatically reinstalls the bootloader with an updated list of menu entries---e.g., the ``old generations'' sub-menu in GRUB no longer lists the generations that have been deleted."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26439
+#: doc/guix.texi:26702
 msgid "Build the derivation of the operating system, which includes all the configuration files and programs needed to boot and run the system.  This action does not actually install anything."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26440
+#: doc/guix.texi:26703
 #, no-wrap
 msgid "init"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26444
+#: doc/guix.texi:26707
 msgid "Populate the given directory with all the files necessary to run the operating system specified in @var{file}.  This is useful for first-time installations of Guix System.  For instance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26447
+#: doc/guix.texi:26710
 #, no-wrap
 msgid "guix system init my-os-config.scm /mnt\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26454
+#: doc/guix.texi:26717
 msgid "copies to @file{/mnt} all the store items required by the configuration specified in @file{my-os-config.scm}.  This includes configuration files, packages, and so on.  It also creates other essential files needed for the system to operate correctly---e.g., the @file{/etc}, @file{/var}, and @file{/run} directories, and the @file{/bin/sh} file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26458
+#: doc/guix.texi:26721
 msgid "This command also installs bootloader on the target specified in @file{my-os-config}, unless the @option{--no-bootloader} option was passed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26459
+#: doc/guix.texi:26722
 #, no-wrap
 msgid "vm"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26460 doc/guix.texi:26937
+#: doc/guix.texi:26723 doc/guix.texi:27220
 #, no-wrap
 msgid "virtual machine"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26461
+#: doc/guix.texi:26724
 #, no-wrap
 msgid "VM"
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:26465
+#: doc/guix.texi:26728
 msgid "guix system vm"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26465
+#: doc/guix.texi:26728
 msgid "Build a virtual machine that contains the operating system declared in @var{file}, and return a script to run that virtual machine (VM)."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:26473
+#: doc/guix.texi:26736
 msgid "The @code{vm} action and others below can use KVM support in the Linux-libre kernel.  Specifically, if the machine has hardware virtualization support, the corresponding KVM kernel module should be loaded, and the @file{/dev/kvm} device node must exist and be readable and writable by the user and by the build users of the daemon (@pxref{Build Environment Setup})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26478
+#: doc/guix.texi:26741
 msgid "Arguments given to the script are passed to QEMU as in the example below, which enables networking and requests 1@tie{}GiB of RAM for the emulated machine:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26481
+#: doc/guix.texi:26744
 #, no-wrap
 msgid "$ /gnu/store/@dots{}-run-vm.sh -m 1024 -smp 2 -net user,model=virtio-net-pci\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26484
+#: doc/guix.texi:26747
 msgid "The VM shares its store with the host system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26489
+#: doc/guix.texi:26752
 msgid "Additional file systems can be shared between the host and the VM using the @code{--share} and @code{--expose} command-line options: the former specifies a directory to be shared with write access, while the latter provides read-only access to the shared directory."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26493
+#: doc/guix.texi:26756
 msgid "The example below creates a VM in which the user's home directory is accessible read-only, and where the @file{/exchange} directory is a read-write mapping of @file{$HOME/tmp} on the host:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26497
+#: doc/guix.texi:26760
 #, no-wrap
 msgid ""
 "guix system vm my-config.scm \\\n"
@@ -48007,78 +48708,78 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26502
+#: doc/guix.texi:26765
 msgid "On GNU/Linux, the default is to boot directly to the kernel; this has the advantage of requiring only a very tiny root disk image since the store of the host can then be mounted."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26508
+#: doc/guix.texi:26771
 msgid "The @code{--full-boot} option forces a complete boot sequence, starting with the bootloader.  This requires more disk space since a root image containing at least the kernel, initrd, and bootloader data files must be created.  The @code{--image-size} option can be used to specify the size of the image."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26509
+#: doc/guix.texi:26772
 #, no-wrap
 msgid "System images, creation in various formats"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26510
+#: doc/guix.texi:26773
 #, no-wrap
 msgid "Creating system images in various formats"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26511
+#: doc/guix.texi:26774
 #, no-wrap
 msgid "vm-image"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:26512
+#: doc/guix.texi:26775
 #, no-wrap
 msgid "disk-image"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:26513
+#: doc/guix.texi:26776
 #, no-wrap
 msgid "docker-image"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26521
+#: doc/guix.texi:26784
 msgid "Return a virtual machine, disk image, or Docker image of the operating system declared in @var{file} that stands alone.  By default, @command{guix system} estimates the size of the image needed to store the system, but you can use the @option{--image-size} option to specify a value.  Docker images are built to contain exactly what they need, so the @option{--image-size} option is ignored in the case of @code{docker-image}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26524
+#: doc/guix.texi:26787
 msgid "You can specify the root file system type by using the @option{--file-system-type} option.  It defaults to @code{ext4}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26528
+#: doc/guix.texi:26791
 msgid "When using @code{vm-image}, the returned image is in qcow2 format, which the QEMU emulator can efficiently use. @xref{Running Guix in a VM}, for more information on how to run the image in a virtual machine."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26533
+#: doc/guix.texi:26796
 msgid "When using @code{disk-image}, a raw disk image is produced; it can be copied as is to a USB stick, for instance.  Assuming @code{/dev/sdc} is the device corresponding to a USB stick, one can copy the image to it using the following command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26536
+#: doc/guix.texi:26799
 #, no-wrap
 msgid "# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26543
+#: doc/guix.texi:26806
 msgid "When using @code{docker-image}, a Docker image is produced.  Guix builds the image from scratch, not from a pre-existing Docker base image.  As a result, it contains @emph{exactly} what you define in the operating system configuration file.  You can then load the image and launch a Docker container using commands like the following:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26548
+#: doc/guix.texi:26811
 #, no-wrap
 msgid ""
 "image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n"
@@ -48087,38 +48788,38 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26555
+#: doc/guix.texi:26818
 msgid "This command starts a new Docker container from the specified image.  It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration.  You can get an interactive shell running in the container using @command{docker exec}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26558
+#: doc/guix.texi:26821
 #, no-wrap
 msgid "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26565
+#: doc/guix.texi:26828
 msgid "Depending on what you run in the Docker container, it may be necessary to give the container additional permissions.  For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker create}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26573
+#: doc/guix.texi:26836
 msgid "Return a script to run the operating system declared in @var{file} within a container.  Containers are a set of lightweight isolation mechanisms provided by the kernel Linux-libre.  Containers are substantially less resource-demanding than full virtual machines since the kernel, shared objects, and other resources can be shared with the host system; this also means they provide thinner isolation."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26577
+#: doc/guix.texi:26840
 msgid "Currently, the script must be run as root in order to support more than a single user and group.  The container shares its store with the host system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26581
+#: doc/guix.texi:26844
 msgid "As with the @code{vm} action (@pxref{guix system vm}), additional file systems to be shared between the host and container can be specified using the @option{--share} and @option{--expose} options:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26585
+#: doc/guix.texi:26848
 #, no-wrap
 msgid ""
 "guix system container my-config.scm \\\n"
@@ -48126,306 +48827,306 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:26589
+#: doc/guix.texi:26852
 msgid "This option requires Linux-libre 3.19 or newer."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26596
+#: doc/guix.texi:26859
 msgid "@var{options} can contain any of the common build options (@pxref{Common Build Options}).  In addition, @var{options} can contain one of the following:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26605
+#: doc/guix.texi:26868
 msgid "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 Guix system installer @pxref{Building the Installation Image})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26610
+#: doc/guix.texi:26873
 msgid "Attempt to build for @var{system} instead of the host system type.  This works as per @command{guix build} (@pxref{Invoking guix build})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26615
+#: doc/guix.texi:26878
 msgid "Return the derivation file name of the given operating system without building anything."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26624
+#: doc/guix.texi:26887
 msgid "As discussed above, @command{guix system init} and @command{guix system reconfigure} always save provenance information @i{via} a dedicated service (@pxref{Service Reference, @code{provenance-service-type}}).  However, other commands don't do that by default.  If you wish to, say, create a virtual machine image that contains provenance information, you can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26627
+#: doc/guix.texi:26890
 #, no-wrap
 msgid "guix system vm-image --save-provenance config.scm\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26634
+#: doc/guix.texi:26897
 msgid "That way, the resulting image will effectively ``embed its own source'' in the form of meta-data in @file{/run/current-system}.  With that information, one can rebuild the image to make sure it really contains what it pretends to contain; or they could use that to derive a variant of the image."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26635
+#: doc/guix.texi:26898
 #, no-wrap
 msgid "--file-system-type=@var{type}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26639
+#: doc/guix.texi:26902
 msgid "For the @code{disk-image} action, create a file system of the given @var{type} on the image."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26641
+#: doc/guix.texi:26904
 msgid "When this option is omitted, @command{guix system} uses @code{ext4}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26642
+#: doc/guix.texi:26905
 #, no-wrap
 msgid "ISO-9660 format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26643
+#: doc/guix.texi:26906
 #, no-wrap
 msgid "CD image format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26644
+#: doc/guix.texi:26907
 #, no-wrap
 msgid "DVD image format"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26647
+#: doc/guix.texi:26910
 msgid "@code{--file-system-type=iso9660} produces an ISO-9660 image, suitable for burning on CDs and DVDs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26648
+#: doc/guix.texi:26911
 #, no-wrap
 msgid "--image-size=@var{size}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26653
+#: doc/guix.texi:26916
 msgid "For the @code{vm-image} and @code{disk-image} actions, create an image of the given @var{size}.  @var{size} may be a number of bytes, or it may include a unit as a suffix (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26657
+#: doc/guix.texi:26920
 msgid "When this option is omitted, @command{guix system} computes an estimate of the image size as a function of the size of the system declared in @var{file}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26662
+#: doc/guix.texi:26925
 msgid "For the @code{container} action, allow containers to access the host network, that is, do not create a network namespace."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26668
+#: doc/guix.texi:26931
 #, no-wrap
 msgid "--skip-checks"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26670
+#: doc/guix.texi:26933
 msgid "Skip pre-installation safety checks."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26677
+#: doc/guix.texi:26940
 msgid "By default, @command{guix system init} and @command{guix system reconfigure} perform safety checks: they make sure the file systems that appear in the @code{operating-system} declaration actually exist (@pxref{File Systems}), and that any Linux kernel modules that may be needed at boot time are listed in @code{initrd-modules} (@pxref{Initial RAM Disk}).  Passing this option skips these tests altogether."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26678
+#: doc/guix.texi:26941
 #, no-wrap
 msgid "on-error"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26679
+#: doc/guix.texi:26942
 #, no-wrap
 msgid "on-error strategy"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26680
+#: doc/guix.texi:26943
 #, no-wrap
 msgid "error strategy"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26681
+#: doc/guix.texi:26944
 #, no-wrap
 msgid "--on-error=@var{strategy}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26684
+#: doc/guix.texi:26947
 msgid "Apply @var{strategy} when an error occurs when reading @var{file}.  @var{strategy} may be one of the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26686
+#: doc/guix.texi:26949
 #, no-wrap
 msgid "nothing-special"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26688
+#: doc/guix.texi:26951
 msgid "Report the error concisely and exit.  This is the default strategy."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26689
+#: doc/guix.texi:26952
 #, no-wrap
 msgid "backtrace"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26691
+#: doc/guix.texi:26954
 msgid "Likewise, but also display a backtrace."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26692
+#: doc/guix.texi:26955
 #, no-wrap
 msgid "debug"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26698
+#: doc/guix.texi:26961
 msgid "Report the error and enter Guile's debugger.  From there, you can run commands such as @code{,bt} to get a backtrace, @code{,locals} to display local variable values, and more generally inspect the state of the program.  @xref{Debug Commands,,, guile, GNU Guile Reference Manual}, for a list of available debugging commands."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26705
+#: doc/guix.texi:26968
 msgid "Once you have built, configured, re-configured, and re-re-configured your Guix installation, you may find it useful to list the operating system generations available on disk---and that you can choose from the bootloader boot menu:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26708
+#: doc/guix.texi:26971
 #, no-wrap
 msgid "describe"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26711
+#: doc/guix.texi:26974
 msgid "Describe the current system generation: its file name, the kernel and bootloader used, etc., as well as provenance information when available."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26712
+#: doc/guix.texi:26975
 #, no-wrap
 msgid "list-generations"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26717
+#: doc/guix.texi:26980
 msgid "List a summary of each generation of the operating system available on disk, in a human-readable way.  This is similar to the @option{--list-generations} option of @command{guix package} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26722
+#: doc/guix.texi:26985
 msgid "Optionally, one can specify a pattern, with the same syntax that is used in @command{guix package --list-generations}, to restrict the list of generations displayed.  For instance, the following command displays generations that are up to 10 days old:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26725
+#: doc/guix.texi:26988
 #, no-wrap
 msgid "$ guix system list-generations 10d\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26732
+#: doc/guix.texi:26995
 msgid "The @command{guix system} command has even more to offer! The following sub-commands allow you to visualize how your system services relate to each other:"
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:26734
+#: doc/guix.texi:26997
 msgid "system-extension-graph"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26736
+#: doc/guix.texi:26999
 #, no-wrap
 msgid "extension-graph"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26741
+#: doc/guix.texi:27004
 msgid "Emit in Dot/Graphviz format to standard output the @dfn{service extension graph} of the operating system defined in @var{file} (@pxref{Service Composition}, for more information on service extensions.)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26743
+#: doc/guix.texi:27006
 msgid "The command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26746
+#: doc/guix.texi:27009
 #, no-wrap
 msgid "$ guix system extension-graph @var{file} | dot -Tpdf > services.pdf\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26749
+#: doc/guix.texi:27012
 msgid "produces a PDF file showing the extension relations among services."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:26751
+#: doc/guix.texi:27014
 msgid "system-shepherd-graph"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26751
+#: doc/guix.texi:27014
 #, no-wrap
 msgid "shepherd-graph"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26756
+#: doc/guix.texi:27019
 msgid "Emit in Dot/Graphviz format to standard output the @dfn{dependency graph} of shepherd services of the operating system defined in @var{file}.  @xref{Shepherd Services}, for more information and for an example graph."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:26760
+#: doc/guix.texi:27023
 #, fuzzy, no-wrap
 #| msgid "Invoking @command{guix pull}"
 msgid "Invoking @code{guix deploy}"
 msgstr "Вызов @command{guix pull}"
 
 #. type: Plain text
-#: doc/guix.texi:26768
+#: doc/guix.texi:27031
 msgid "We've already seen @code{operating-system} declarations used to manage a machine's configuration locally.  Suppose you need to configure multiple machines, though---perhaps you're managing a service on the web that's comprised of several servers.  @command{guix deploy} enables you to use those same @code{operating-system} declarations to manage multiple remote hosts at once as a logical ``deployment''."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:26773
+#: doc/guix.texi:27036
 msgid "The functionality described in this section is still under development and is subject to change.  Get in touch with us on @email{guix-devel@@gnu.org}!"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26777
+#: doc/guix.texi:27040
 #, fuzzy, no-wrap
 #| msgid "-l @var{file}"
 msgid "guix deploy @var{file}\n"
 msgstr "-l @var{file}"
 
 #. type: Plain text
-#: doc/guix.texi:26781
+#: doc/guix.texi:27044
 msgid "Such an invocation will deploy the machines that the code within @var{file} evaluates to.  As an example, @var{file} might contain a definition like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:26788
+#: doc/guix.texi:27051
 #, no-wrap
 msgid ""
 ";; This is a Guix deployment of a \"bare bones\" setup, with\n"
@@ -48437,7 +49138,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:26791
+#: doc/guix.texi:27054
 #, no-wrap
 msgid ""
 "(use-service-modules networking ssh)\n"
@@ -48446,7 +49147,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:26812
+#: doc/guix.texi:27075
 #, no-wrap
 msgid ""
 "(define %system\n"
@@ -48473,7 +49174,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:26822
+#: doc/guix.texi:27085
 #, no-wrap
 msgid ""
 "(list (machine\n"
@@ -48488,260 +49189,296 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26835
+#: doc/guix.texi:27098
 msgid "The file should evaluate to a list of @var{machine} objects.  This example, upon being deployed, will create a new generation on the remote system realizing the @code{operating-system} declaration @var{%system}.  @var{environment} and @var{configuration} specify how the machine should be provisioned---that is, how the computing resources should be created and managed.  The above example does not create any resources, as a @code{'managed-host} is a machine that is already running the Guix system and available over the network.  This is a particularly simple case; a more complex deployment may involve, for example, starting virtual machines through a Virtual Private Server (VPS) provider.  In such a case, a different @var{environment} type would be used."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26839
+#: doc/guix.texi:27102
 #, fuzzy
 #| msgid "There is one last thing to do once @file{machines.scm} is in place.  As explained above, when offloading, files are transferred back and forth between the machine stores.  For this to work, you first need to generate a key pair on each machine to allow the daemon to export signed archives of files from the store (@pxref{Invoking guix archive}):"
 msgid "Do note that you first need to generate a key pair on the coordinator machine to allow the daemon to export signed archives of files from the store (@pxref{Invoking guix archive})."
 msgstr "Есть ещё одна вещь, которую нужно выполнить после размещения @file{machines.scm}. Выше описано, что при разгрузке файлы передаются вперёд и назад между складами на машинах. Для этого необходимо сгенерировать ключ-пару на кадой машине, чтобы позволить демону экспортировать подписанные архивы файлов из склада (@pxref{Invoking guix archive}):"
 
 #. type: Plain text
-#: doc/guix.texi:26847
+#: doc/guix.texi:27110
 #, fuzzy
 #| msgid "Each build machine must authorize the key of the master machine so that it accepts store items it receives from the master:"
 msgid "Each target machine must authorize the key of the master machine so that it accepts store items it receives from the coordinator:"
 msgstr "Каждая машина для сорки должна авторизовать ключ машины-инициатора, чтобы принимать элементы из склада, которые присылает инициатор:"
 
 #. type: example
-#: doc/guix.texi:26850
+#: doc/guix.texi:27113
 #, fuzzy, no-wrap
 #| msgid "# guix archive --authorize < master-public-key.txt\n"
 msgid "# guix archive --authorize < coordinator-public-key.txt\n"
 msgstr "# guix archive --authorize < master-public-key.txt\n"
 
 #. type: Plain text
-#: doc/guix.texi:26860
-msgid "@code{user}, in this example, specifies the name of the user account to log in as to perform the deployment.  Its default value is @code{root}, but root login over SSH may be forbidden in some cases.  To work around this, @command{guix deploy} can log in as an unprivileged user and employ @code{sudo} to escalate privileges.  This will only work if @code{sudo} is currently installed on the remote and can be invoked non-interactively as @code{user}.  That is: the line in @code{sudoers} granting @code{user} the ability to use @code{sudo} must contain the @code{NOPASSWD} tag."
+#: doc/guix.texi:27124
+msgid "@code{user}, in this example, specifies the name of the user account to log in as to perform the deployment.  Its default value is @code{root}, but root login over SSH may be forbidden in some cases.  To work around this, @command{guix deploy} can log in as an unprivileged user and employ @code{sudo} to escalate privileges.  This will only work if @code{sudo} is currently installed on the remote and can be invoked non-interactively as @code{user}.  That is, the line in @code{sudoers} granting @code{user} the ability to use @code{sudo} must contain the @code{NOPASSWD} tag.  This can be accomplished with the following operating system configuration snippet:"
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:27128
+#, no-wrap
+msgid ""
+"(use-modules ...\n"
+"             (gnu system))               ;for %sudoers-specification\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:27130
+#, no-wrap
+msgid ""
+"(define %user \"username\")\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: doc/guix.texi:27138
+#, no-wrap
+msgid ""
+"(operating-system\n"
+"  ...\n"
+"  (sudoers-file\n"
+"     (plain-file \"sudoers\"\n"
+"                 (string-append (plain-file-content %sudoers-specification)\n"
+"                                (format #f \"~a ALL = NOPASSWD: ALL~%\"\n"
+"                                        %user)))))\n"
+"\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:27143
+msgid "For more information regarding the format of the @file{sudoers} file, consult @command{man sudoers}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:26861
+#: doc/guix.texi:27144
 #, fuzzy, no-wrap
 #| msgid "{Data Type} build-machine"
 msgid "{Data Type} machine"
 msgstr "{Тип данных} build-machine"
 
 #. type: deftp
-#: doc/guix.texi:26864
+#: doc/guix.texi:27147
 msgid "This is the data type representing a single machine in a heterogeneous Guix deployment."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26868
+#: doc/guix.texi:27151
 #, fuzzy
 #| msgid "Manage the operating system configuration."
 msgid "The object of the operating system configuration to deploy."
 msgstr "Управление конфигурацией операционной системы."
 
 #. type: code{#1}
-#: doc/guix.texi:26869
+#: doc/guix.texi:27152
 #, fuzzy, no-wrap
 #| msgid "guix environment"
 msgid "environment"
 msgstr "guix environment"
 
 #. type: table
-#: doc/guix.texi:26871
+#: doc/guix.texi:27154
 msgid "An @code{environment-type} describing how the machine should be provisioned."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26872
+#: doc/guix.texi:27155
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{configuration} (default: @code{#f})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:26877
+#: doc/guix.texi:27160
 msgid "An object describing the configuration for the machine's @code{environment}.  If the @code{environment} has a default configuration, @code{#f} may be used.  If @code{#f} is used for an environment with no default configuration, however, an error will be thrown."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:26880
+#: doc/guix.texi:27163
 #, fuzzy, no-wrap
 #| msgid "{Data Type} build-machine"
 msgid "{Data Type} machine-ssh-configuration"
 msgstr "{Тип данных} build-machine"
 
 #. type: deftp
-#: doc/guix.texi:26883
+#: doc/guix.texi:27166
 msgid "This is the data type representing the SSH client parameters for a machine with an @code{environment} of @code{managed-host-environment-type}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26886
+#: doc/guix.texi:27169
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{build-locally?} (default: @code{#t})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:26888
+#: doc/guix.texi:27171
 msgid "If false, system derivations will be built on the machine being deployed to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26891
+#: doc/guix.texi:27174
 #, fuzzy
 #| msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}."
 msgid "The system type describing the architecture of the machine being deployed to---e.g., @code{\"x86_64-linux\"}."
 msgstr "Тип системы удалённой машины, то есть @code{x86_64-linux}."
 
 #. type: item
-#: doc/guix.texi:26891
+#: doc/guix.texi:27174
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{authorize?} (default: @code{#t})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:26894
+#: doc/guix.texi:27177
 msgid "If true, the coordinator's signing key will be added to the remote's ACL keyring."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26895
+#: doc/guix.texi:27178
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{user} (default: @code{\"root\"})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: item
-#: doc/guix.texi:26896
+#: doc/guix.texi:27179
 #, fuzzy, no-wrap
 #| msgid "@code{speed} (default: @code{1.0})"
 msgid "@code{identity} (default: @code{#f})"
 msgstr "@code{speed} (default: @code{1.0})"
 
 #. type: table
-#: doc/guix.texi:26899
+#: doc/guix.texi:27182
 msgid "If specified, the path to the SSH private key to use to authenticate with the remote host."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26900
+#: doc/guix.texi:27183
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{host-key} (default: @code{#f})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:26902
+#: doc/guix.texi:27185
 msgid "This should be the SSH host key of the machine, which looks like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26905
+#: doc/guix.texi:27188
 #, fuzzy, no-wrap
 #| msgid "ssh-ed25519 AAAAC3NzaC@dots{}mde+UhL hint@@example.org\n"
 msgid "ssh-ed25519 AAAAC3Nz@dots{} root@@example.org\n"
 msgstr "ssh-ed25519 AAAAC3NzaC@dots{}mde+UhL hint@@example.org\n"
 
 #. type: table
-#: doc/guix.texi:26910
+#: doc/guix.texi:27193
 msgid "When @code{host-key} is @code{#f}, the server is authenticated against the @file{~/.ssh/known_hosts} file, just like the OpenSSH @command{ssh} client does."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:26914
+#: doc/guix.texi:27197
 #, no-wrap
 msgid "{Data Type} digital-ocean-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:26917
+#: doc/guix.texi:27200
 msgid "This is the data type describing the Droplet that should be created for a machine with an @code{environment} of @code{digital-ocean-environment-type}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:26919
+#: doc/guix.texi:27202
 #, fuzzy, no-wrap
 #| msgid "host-key"
 msgid "ssh-key"
 msgstr "host-key"
 
 #. type: table
-#: doc/guix.texi:26922
+#: doc/guix.texi:27205
 msgid "The path to the SSH private key to use to authenticate with the remote host. In the future, this field may not exist."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:26922
+#: doc/guix.texi:27205
 #, no-wrap
 msgid "tags"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26925
+#: doc/guix.texi:27208
 msgid "A list of string ``tags'' that uniquely identify the machine. Must be given such that no two machines in the deployment have the same set of tags."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:26925
+#: doc/guix.texi:27208
 #, no-wrap
 msgid "region"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26927
+#: doc/guix.texi:27210
 msgid "A Digital Ocean region slug, such as @code{\"nyc3\"}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26929
+#: doc/guix.texi:27212
 msgid "A Digital Ocean size slug, such as @code{\"s-1vcpu-1gb\"}"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:26929
+#: doc/guix.texi:27212
 #, no-wrap
 msgid "enable-ipv6?"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26931
+#: doc/guix.texi:27214
 msgid "Whether or not the droplet should be created with IPv6 networking."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:26935
+#: doc/guix.texi:27218
 #, no-wrap
 msgid "Running Guix in a Virtual Machine"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26944
+#: doc/guix.texi:27227
 msgid "To run Guix in a virtual machine (VM), one can use the pre-built Guix VM image distributed at @url{@value{BASE-URL}/guix-system-vm-image-@value{VERSION}.x86_64-linux.xz}.  This image is a compressed image in QCOW format.  You will first need to decompress with @command{xz -d}, and then you can pass it to an emulator such as QEMU (see below for details)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26950
+#: doc/guix.texi:27233
 msgid "This image boots the Xfce graphical environment and it contains some commonly-used tools.  You can install more software in the image by running @command{guix package} in a terminal (@pxref{Invoking guix package}).  You can also reconfigure the system based on its initial configuration file available as @file{/etc/config.scm} (@pxref{Using the Configuration System})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26955
+#: doc/guix.texi:27238
 msgid "Instead of using this pre-built image, one can also build their own virtual machine image using @command{guix system vm-image} (@pxref{Invoking guix system}).  The returned image is in qcow2 format, which the @uref{https://qemu.org/, QEMU emulator} can efficiently use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:26956
+#: doc/guix.texi:27239
 #, no-wrap
 msgid "QEMU"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26963
+#: doc/guix.texi:27246
 msgid "If you built your own image, you must copy it out of the store (@pxref{The Store}) and give yourself permission to write to the copy before you can use it.  When invoking QEMU, you must choose a system emulator that is suitable for your hardware platform.  Here is a minimal QEMU invocation that will boot the result of @command{guix system vm-image} on x86_64 hardware:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:26970
+#: doc/guix.texi:27253
 #, no-wrap
 msgid ""
 "$ qemu-system-x86_64 \\\n"
@@ -48752,132 +49489,132 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:26973
+#: doc/guix.texi:27256
 msgid "Here is what each of these options means:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26975
+#: doc/guix.texi:27258
 #, no-wrap
 msgid "qemu-system-x86_64"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26978
+#: doc/guix.texi:27261
 msgid "This specifies the hardware platform to emulate.  This should match the host."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26979
+#: doc/guix.texi:27262
 #, no-wrap
 msgid "-nic user,model=virtio-net-pci"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26987
+#: doc/guix.texi:27270
 msgid "Enable the unprivileged user-mode network stack.  The guest OS can access the host but not vice versa.  This is the simplest way to get the guest OS online.  @code{model} specifies which network device to emulate: @code{virtio-net-pci} is a special device made for virtualized operating systems and recommended for most uses.  Assuming your hardware platform is x86_64, you can get a list of available NIC models by running @command{qemu-system-x86_64 -nic model=help}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26988
+#: doc/guix.texi:27271
 #, no-wrap
 msgid "-enable-kvm"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26992
+#: doc/guix.texi:27275
 msgid "If your system has hardware virtualization extensions, enabling the virtual machine support (KVM) of the Linux kernel will make things run faster."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26994
+#: doc/guix.texi:27277
 #, no-wrap
 msgid "-m 1024"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:26997
+#: doc/guix.texi:27280
 msgid "RAM available to the guest OS, in mebibytes.  Defaults to 128@tie{}MiB, which may be insufficient for some operations."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:26998
+#: doc/guix.texi:27281
 #, no-wrap
 msgid "-device virtio-blk,drive=myhd"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27003
+#: doc/guix.texi:27286
 msgid "Create a @code{virtio-blk} drive called ``myhd''.  @code{virtio-blk} is a ``paravirtualization'' mechanism for block devices that allows QEMU to achieve better performance than if it were emulating a complete disk drive.  See the QEMU and KVM documentation for more info."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27004
+#: doc/guix.texi:27287
 #, no-wrap
 msgid "-drive if=none,file=/tmp/qemu-image,id=myhd"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27007
+#: doc/guix.texi:27290
 msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store the the ``myhd'' drive."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27017
+#: doc/guix.texi:27300
 msgid "The default @command{run-vm.sh} script that is returned by an invocation of @command{guix system vm} does not add a @command{-nic user} flag by default.  To get network access from within the vm add the @code{(dhcp-client-service)} to your system definition and start the VM using @command{`guix system vm config.scm` -nic user}.  An important caveat of using @command{-nic user} for networking is that @command{ping} will not work, because it uses the ICMP protocol.  You'll have to use a different command to check for network connectivity, for example @command{guix download}."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:27018
+#: doc/guix.texi:27301
 #, no-wrap
 msgid "Connecting Through SSH"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27026
+#: doc/guix.texi:27309
 msgid "To enable SSH inside a VM you need to add an SSH server like @code{openssh-service-type} to your VM (@pxref{Networking Services, @code{openssh-service-type}}).  In addition you need to forward the SSH port, 22 by default, to the host.  You can do this with"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27029
+#: doc/guix.texi:27312
 #, no-wrap
 msgid "`guix system vm config.scm` -nic user,model=virtio-net-pci,hostfwd=tcp::10022-:22\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27032
+#: doc/guix.texi:27315
 msgid "To connect to the VM you can run"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27035
+#: doc/guix.texi:27318
 #, no-wrap
 msgid "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27042
+#: doc/guix.texi:27325
 msgid "The @command{-p} tells @command{ssh} the port you want to connect to.  @command{-o UserKnownHostsFile=/dev/null} prevents @command{ssh} from complaining every time you modify your @command{config.scm} file and the @command{-o StrictHostKeyChecking=no} prevents you from having to allow a connection to an unknown host every time you connect."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:27043
+#: doc/guix.texi:27326
 #, no-wrap
 msgid "Using @command{virt-viewer} with Spice"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27049
+#: doc/guix.texi:27332
 msgid "As an alternative to the default @command{qemu} graphical client you can use the @command{remote-viewer} from the @command{virt-viewer} package.  To connect pass the @command{-spice port=5930,disable-ticketing} flag to @command{qemu}.  See previous section for further information on how to do this."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27052
+#: doc/guix.texi:27335
 msgid "Spice also allows you to do some nice stuff like share your clipboard with your VM.  To enable that you'll also have to pass the following flags to @command{qemu}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27058
+#: doc/guix.texi:27341
 #, no-wrap
 msgid ""
 "-device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5\n"
@@ -48887,81 +49624,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27061
+#: doc/guix.texi:27344
 msgid "You'll also need to add the @pxref{Miscellaneous Services, Spice service}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27068
+#: doc/guix.texi:27351
 msgid "The previous sections show the available services and how one can combine them in an @code{operating-system} declaration.  But how do we define them in the first place? And what is a service anyway?"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27080
+#: doc/guix.texi:27363
 #, no-wrap
 msgid "daemons"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27093
+#: doc/guix.texi:27376
 msgid "Here we define a @dfn{service} as, broadly, something that extends the functionality of the operating system.  Often a service is a process---a @dfn{daemon}---started when the system boots: a secure shell server, a Web server, the Guix build daemon, etc.  Sometimes a service is a daemon whose execution can be triggered by another daemon---e.g., an FTP server started by @command{inetd} or a D-Bus service activated by @command{dbus-daemon}.  Occasionally, a service does not map to a daemon.  For instance, the ``account'' service collects user accounts and makes sure they exist when the system runs; the ``udev'' service collects device management rules and makes them available to the eudev daemon; the @file{/etc} service populates the @file{/etc} directory of the system."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27094
+#: doc/guix.texi:27377
 #, no-wrap
 msgid "service extensions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27106
+#: doc/guix.texi:27389
 msgid "Guix system services are connected by @dfn{extensions}.  For instance, the secure shell service @emph{extends} the Shepherd---the initialization system, running as PID@tie{}1---by giving it the command lines to start and stop the secure shell daemon (@pxref{Networking Services, @code{openssh-service-type}}); the UPower service extends the D-Bus service by passing it its @file{.service} specification, and extends the udev service by passing it device management rules (@pxref{Desktop Services, @code{upower-service}}); the Guix daemon service extends the Shepherd by passing it the command lines to start and stop the daemon, and extends the account service by passing it a list of required build user accounts (@pxref{Base Services})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27110
+#: doc/guix.texi:27393
 msgid "All in all, services and their ``extends'' relations form a directed acyclic graph (DAG).  If we represent services as boxes and extensions as arrows, a typical system might provide something like this:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27112
+#: doc/guix.texi:27395
 msgid "@image{images/service-graph,,5in,Typical service extension graph.}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27113
+#: doc/guix.texi:27396
 #, no-wrap
 msgid "system service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27121
+#: doc/guix.texi:27404
 msgid "At the bottom, we see the @dfn{system service}, which produces the directory containing everything to run and boot the system, as returned by the @command{guix system build} command.  @xref{Service Reference}, to learn about the other service types shown here.  @xref{system-extension-graph, the @command{guix system extension-graph} command}, for information on how to generate this representation for a particular operating system definition."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27122
+#: doc/guix.texi:27405
 #, no-wrap
 msgid "service types"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27128
+#: doc/guix.texi:27411
 msgid "Technically, developers can define @dfn{service types} to express these relations.  There can be any number of services of a given type on the system---for instance, a system running two instances of the GNU secure shell server (lsh) has two instances of @code{lsh-service-type}, with different parameters."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27131
+#: doc/guix.texi:27414
 msgid "The following section describes the programming interface for service types and services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27138
+#: doc/guix.texi:27421
 msgid "A @dfn{service type} is a node in the DAG described above.  Let us start with a simple example, the service type for the Guix build daemon (@pxref{Invoking guix-daemon}):"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27148
+#: doc/guix.texi:27431
 #, no-wrap
 msgid ""
 "(define guix-service-type\n"
@@ -48975,75 +49712,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27152
+#: doc/guix.texi:27435
 msgid "It defines three things:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:27156
+#: doc/guix.texi:27439
 msgid "A name, whose sole purpose is to make inspection and debugging easier."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:27161
+#: doc/guix.texi:27444
 msgid "A list of @dfn{service extensions}, where each extension designates the target service type and a procedure that, given the parameters of the service, returns a list of objects to extend the service of that type."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:27164
+#: doc/guix.texi:27447
 msgid "Every service type has at least one service extension.  The only exception is the @dfn{boot service type}, which is the ultimate service."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:27167
+#: doc/guix.texi:27450
 msgid "Optionally, a default value for instances of this type."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27170
+#: doc/guix.texi:27453
 msgid "In this example, @code{guix-service-type} extends three services:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27172
+#: doc/guix.texi:27455
 #, no-wrap
 msgid "shepherd-root-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27177
+#: doc/guix.texi:27460
 msgid "The @code{guix-shepherd-service} procedure defines how the Shepherd service is extended.  Namely, it returns a @code{} object that defines how @command{guix-daemon} is started and stopped (@pxref{Shepherd Services})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27178
+#: doc/guix.texi:27461
 #, no-wrap
 msgid "account-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27183
+#: doc/guix.texi:27466
 msgid "This extension for this service is computed by @code{guix-accounts}, which returns a list of @code{user-group} and @code{user-account} objects representing the build user accounts (@pxref{Invoking guix-daemon})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27184
+#: doc/guix.texi:27467
 #, no-wrap
 msgid "activation-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27188
+#: doc/guix.texi:27471
 msgid "Here @code{guix-activation} is a procedure that returns a gexp, which is a code snippet to run at ``activation time''---e.g., when the service is booted."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27191
+#: doc/guix.texi:27474
 msgid "A service of this type is instantiated like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27197
+#: doc/guix.texi:27480
 #, no-wrap
 msgid ""
 "(service guix-service-type\n"
@@ -49053,28 +49790,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27205
+#: doc/guix.texi:27488
 msgid "The second argument to the @code{service} form is a value representing the parameters of this specific service instance.  @xref{guix-configuration-type, @code{guix-configuration}}, for information about the @code{guix-configuration} data type.  When the value is omitted, the default value specified by @code{guix-service-type} is used:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27208
+#: doc/guix.texi:27491
 #, no-wrap
 msgid "(service guix-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27212
+#: doc/guix.texi:27495
 msgid "@code{guix-service-type} is quite simple because it extends other services but is not extensible itself."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27216
+#: doc/guix.texi:27499
 msgid "The service type for an @emph{extensible} service looks like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27223
+#: doc/guix.texi:27506
 #, no-wrap
 msgid ""
 "(define udev-service-type\n"
@@ -49086,7 +49823,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27231
+#: doc/guix.texi:27514
 #, no-wrap
 msgid ""
 "                (compose concatenate)       ;concatenate the list of rules\n"
@@ -49099,96 +49836,96 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27237
+#: doc/guix.texi:27520
 msgid "This is the service type for the @uref{https://wiki.gentoo.org/wiki/Project:Eudev, eudev device management daemon}.  Compared to the previous example, in addition to an extension of @code{shepherd-root-service-type}, we see two new fields:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27239
+#: doc/guix.texi:27522
 #, no-wrap
 msgid "compose"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27242
+#: doc/guix.texi:27525
 msgid "This is the procedure to @dfn{compose} the list of extensions to services of this type."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27245
+#: doc/guix.texi:27528
 msgid "Services can extend the udev service by passing it lists of rules; we compose those extensions simply by concatenating them."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27246
+#: doc/guix.texi:27529
 #, no-wrap
 msgid "extend"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27249
+#: doc/guix.texi:27532
 msgid "This procedure defines how the value of the service is @dfn{extended} with the composition of the extensions."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27254
+#: doc/guix.texi:27537
 msgid "Udev extensions are composed into a list of rules, but the udev service value is itself a @code{} record.  So here, we extend that record by appending the list of rules it contains to the list of contributed rules."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27260
+#: doc/guix.texi:27543
 msgid "This is a string giving an overview of the service type.  The string can contain Texinfo markup (@pxref{Overview,,, texinfo, GNU Texinfo}).  The @command{guix system search} command searches these strings and displays them (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27265
+#: doc/guix.texi:27548
 msgid "There can be only one instance of an extensible service type such as @code{udev-service-type}.  If there were more, the @code{service-extension} specifications would be ambiguous."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27268
+#: doc/guix.texi:27551
 msgid "Still here? The next section provides a reference of the programming interface for services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27276
+#: doc/guix.texi:27559
 msgid "We have seen an overview of service types (@pxref{Service Types and Services}).  This section provides a reference on how to manipulate services and service types.  This interface is provided by the @code{(gnu services)} module."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27277
+#: doc/guix.texi:27560
 #, no-wrap
 msgid "{Scheme Procedure} service @var{type} [@var{value}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27281
+#: doc/guix.texi:27564
 msgid "Return a new service of @var{type}, a @code{} object (see below.)  @var{value} can be any object; it represents the parameters of this particular service instance."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27285
+#: doc/guix.texi:27568
 msgid "When @var{value} is omitted, the default value specified by @var{type} is used; if @var{type} does not specify a default value, an error is raised."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27287
+#: doc/guix.texi:27570
 msgid "For instance, this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27290
+#: doc/guix.texi:27573
 #, no-wrap
 msgid "(service openssh-service-type)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27294
+#: doc/guix.texi:27577
 msgid "is equivalent to this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27298
+#: doc/guix.texi:27581
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -49196,50 +49933,50 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27302
+#: doc/guix.texi:27585
 msgid "In both cases the result is an instance of @code{openssh-service-type} with the default configuration."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27304
+#: doc/guix.texi:27587
 #, no-wrap
 msgid "{Scheme Procedure} service? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27306
+#: doc/guix.texi:27589
 msgid "Return true if @var{obj} is a service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27308
+#: doc/guix.texi:27591
 #, no-wrap
 msgid "{Scheme Procedure} service-kind @var{service}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27310
+#: doc/guix.texi:27593
 msgid "Return the type of @var{service}---i.e., a @code{} object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27312
+#: doc/guix.texi:27595
 #, no-wrap
 msgid "{Scheme Procedure} service-value @var{service}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27315
+#: doc/guix.texi:27598
 msgid "Return the value associated with @var{service}.  It represents its parameters."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27318
+#: doc/guix.texi:27601
 msgid "Here is an example of how a service is created and manipulated:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27327
+#: doc/guix.texi:27610
 #, no-wrap
 msgid ""
 "(define s\n"
@@ -49253,7 +49990,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27330
+#: doc/guix.texi:27613
 #, no-wrap
 msgid ""
 "(service? s)\n"
@@ -49262,7 +49999,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27333
+#: doc/guix.texi:27616
 #, no-wrap
 msgid ""
 "(eq? (service-kind s) nginx-service-type)\n"
@@ -49270,167 +50007,167 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27343
+#: doc/guix.texi:27626
 msgid "The @code{modify-services} form provides a handy way to change the parameters of some of the services of a list such as @code{%base-services} (@pxref{Base Services, @code{%base-services}}).  It evaluates to a list of services.  Of course, you could always use standard list combinators such as @code{map} and @code{fold} to do that (@pxref{SRFI-1, List Library,, guile, GNU Guile Reference Manual}); @code{modify-services} simply provides a more concise form for this common pattern."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27344
+#: doc/guix.texi:27627
 #, no-wrap
 msgid "{Scheme Syntax} modify-services @var{services} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27346
+#: doc/guix.texi:27629
 msgid "(@var{type} @var{variable} => @var{body}) @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27349
+#: doc/guix.texi:27632
 msgid "Modify the services listed in @var{services} according to the given clauses.  Each clause has the form:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27352
+#: doc/guix.texi:27635
 #, no-wrap
 msgid "(@var{type} @var{variable} => @var{body})\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27359
+#: doc/guix.texi:27642
 msgid "where @var{type} is a service type---e.g., @code{guix-service-type}---and @var{variable} is an identifier that is bound within the @var{body} to the service parameters---e.g., a @code{guix-configuration} instance---of the original service of that @var{type}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27366
+#: doc/guix.texi:27649
 msgid "The @var{body} should evaluate to the new service parameters, which will be used to configure the new service.  This new service will replace the original in the resulting list.  Because a service's service parameters are created using @code{define-record-type*}, you can write a succinct @var{body} that evaluates to the new service parameters by using the @code{inherit} feature that @code{define-record-type*} provides."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27368
+#: doc/guix.texi:27651
 msgid "@xref{Using the Configuration System}, for example usage."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27375
+#: doc/guix.texi:27658
 msgid "Next comes the programming interface for service types.  This is something you want to know when writing new service definitions, but not necessarily when simply looking for ways to customize your @code{operating-system} declaration."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:27376
+#: doc/guix.texi:27659
 #, no-wrap
 msgid "{Data Type} service-type"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27377
+#: doc/guix.texi:27660
 #, no-wrap
 msgid "service type"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:27380
+#: doc/guix.texi:27663
 msgid "This is the representation of a @dfn{service type} (@pxref{Service Types and Services})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27384
+#: doc/guix.texi:27667
 msgid "This is a symbol, used only to simplify inspection and debugging."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:27385
+#: doc/guix.texi:27668
 #, no-wrap
 msgid "extensions"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27387
+#: doc/guix.texi:27670
 msgid "A non-empty list of @code{} objects (see below)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27388
+#: doc/guix.texi:27671
 #, no-wrap
 msgid "@code{compose} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27392
+#: doc/guix.texi:27675
 msgid "If this is @code{#f}, then the service type denotes services that cannot be extended---i.e., services that do not receive ``values'' from other services."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27396
+#: doc/guix.texi:27679
 msgid "Otherwise, it must be a one-argument procedure.  The procedure is called by @code{fold-services} and is passed a list of values collected from extensions.  It may return any single value."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27397
+#: doc/guix.texi:27680
 #, no-wrap
 msgid "@code{extend} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27399
+#: doc/guix.texi:27682
 msgid "If this is @code{#f}, services of this type cannot be extended."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27405
+#: doc/guix.texi:27688
 msgid "Otherwise, it must be a two-argument procedure: @code{fold-services} calls it, passing it the initial value of the service as the first argument and the result of applying @code{compose} to the extension values as the second argument.  It must return a value that is a valid parameter value for the service instance."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:27408
+#: doc/guix.texi:27691
 msgid "@xref{Service Types and Services}, for examples."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27410
+#: doc/guix.texi:27693
 #, no-wrap
 msgid "{Scheme Procedure} service-extension @var{target-type} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27416
+#: doc/guix.texi:27699
 msgid "@var{compute} Return a new extension for services of type @var{target-type}.  @var{compute} must be a one-argument procedure: @code{fold-services} calls it, passing it the value associated with the service that provides the extension; it must return a valid value for the target service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27418
+#: doc/guix.texi:27701
 #, no-wrap
 msgid "{Scheme Procedure} service-extension? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27420
+#: doc/guix.texi:27703
 msgid "Return true if @var{obj} is a service extension."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27426
+#: doc/guix.texi:27709
 msgid "Occasionally, you might want to simply extend an existing service.  This involves creating a new service type and specifying the extension of interest, which can be verbose; the @code{simple-service} procedure provides a shorthand for this."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27427
+#: doc/guix.texi:27710
 #, no-wrap
 msgid "{Scheme Procedure} simple-service @var{name} @var{target} @var{value}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27431
+#: doc/guix.texi:27714
 msgid "Return a service that extends @var{target} with @var{value}.  This works by creating a singleton service type @var{name}, of which the returned service is an instance."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27434
+#: doc/guix.texi:27717
 msgid "For example, this extends mcron (@pxref{Scheduled Job Execution}) with an additional job:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27438
+#: doc/guix.texi:27721
 #, no-wrap
 msgid ""
 "(simple-service 'my-mcron-job mcron-service-type\n"
@@ -49438,392 +50175,392 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27448
+#: doc/guix.texi:27731
 msgid "At the core of the service abstraction lies the @code{fold-services} procedure, which is responsible for ``compiling'' a list of services down to a single directory that contains everything needed to boot and run the system---the directory shown by the @command{guix system build} command (@pxref{Invoking guix system}).  In essence, it propagates service extensions down the service graph, updating each node parameters on the way, until it reaches the root node."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27449
+#: doc/guix.texi:27732
 #, no-wrap
 msgid "{Scheme Procedure} fold-services @var{services} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:27453
+#: doc/guix.texi:27736
 msgid "[#:target-type @var{system-service-type}] Fold @var{services} by propagating their extensions down to the root of type @var{target-type}; return the root service adjusted accordingly."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27457
+#: doc/guix.texi:27740
 msgid "Lastly, the @code{(gnu services)} module also defines several essential service types, some of which are listed below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27458
+#: doc/guix.texi:27741
 #, no-wrap
 msgid "{Scheme Variable} system-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27461
+#: doc/guix.texi:27744
 msgid "This is the root of the service graph.  It produces the system directory as returned by the @command{guix system build} command."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27463
+#: doc/guix.texi:27746
 #, no-wrap
 msgid "{Scheme Variable} boot-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27466
+#: doc/guix.texi:27749
 msgid "The type of the ``boot service'', which produces the @dfn{boot script}.  The boot script is what the initial RAM disk runs when booting."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27468
+#: doc/guix.texi:27751
 #, no-wrap
 msgid "{Scheme Variable} etc-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27472
+#: doc/guix.texi:27755
 msgid "The type of the @file{/etc} service.  This service is used to create files under @file{/etc} and can be extended by passing it name/file tuples such as:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27475
+#: doc/guix.texi:27758
 #, no-wrap
 msgid "(list `(\"issue\" ,(plain-file \"issue\" \"Welcome!\\n\")))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27479
+#: doc/guix.texi:27762
 msgid "In this example, the effect would be to add an @file{/etc/issue} file pointing to the given file."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27481
+#: doc/guix.texi:27764
 #, no-wrap
 msgid "{Scheme Variable} setuid-program-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27485
+#: doc/guix.texi:27768
 msgid "Type for the ``setuid-program service''.  This service collects lists of executable file names, passed as gexps, and adds them to the set of setuid-root programs on the system (@pxref{Setuid Programs})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27487
+#: doc/guix.texi:27770
 #, no-wrap
 msgid "{Scheme Variable} profile-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27491
+#: doc/guix.texi:27774
 msgid "Type of the service that populates the @dfn{system profile}---i.e., the programs under @file{/run/current-system/profile}.  Other services can extend it by passing it lists of packages to add to the system profile."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27494
+#: doc/guix.texi:27777
 #, no-wrap
 msgid "{Scheme Variable} provenance-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27498
+#: doc/guix.texi:27781
 msgid "This is the type of the service that records @dfn{provenance meta-data} in the system itself.  It creates several files under @file{/run/current-system}:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27500
+#: doc/guix.texi:27783
 #, fuzzy, no-wrap
 #| msgid "channels"
 msgid "channels.scm"
 msgstr "каналы"
 
 #. type: table
-#: doc/guix.texi:27505
+#: doc/guix.texi:27788
 msgid "This is a ``channel file'' that can be passed to @command{guix pull -C} or @command{guix time-machine -C}, and which describes the channels used to build the system, if that information was available (@pxref{Channels})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27506
+#: doc/guix.texi:27789
 #, fuzzy, no-wrap
 #| msgid "System Configuration"
 msgid "configuration.scm"
 msgstr "Конфигурирование системы"
 
 #. type: table
-#: doc/guix.texi:27511
+#: doc/guix.texi:27794
 msgid "This is the file that was passed as the value for this @code{provenance-service-type} service.  By default, @command{guix system reconfigure} automatically passes the OS configuration file it received on the command line."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27512
+#: doc/guix.texi:27795
 #, no-wrap
 msgid "provenance"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27515
+#: doc/guix.texi:27798
 msgid "This contains the same information as the two other files but in a format that is more readily processable."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27519
+#: doc/guix.texi:27802
 msgid "In general, these two pieces of information (channels and configuration file) are enough to reproduce the operating system ``from source''."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:27520
+#: doc/guix.texi:27803
 #, no-wrap
 msgid "Caveats"
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:27527
+#: doc/guix.texi:27810
 msgid "This information is necessary to rebuild your operating system, but it is not always sufficient.  In particular, @file{configuration.scm} itself is insufficient if it is not self-contained---if it refers to external Guile modules or to extra files.  If you want @file{configuration.scm} to be self-contained, we recommend that modules or files it refers to be part of a channel."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:27535
+#: doc/guix.texi:27818
 msgid "Besides, provenance meta-data is ``silent'' in the sense that it does not change the bits contained in your system, @emph{except for the meta-data bits themselves}.  Two different OS configurations or sets of channels can lead to the same system, bit-for-bit; when @code{provenance-service-type} is used, these two systems will have different meta-data and thus different store file names, which makes comparison less trivial."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27540
+#: doc/guix.texi:27823
 msgid "This service is automatically added to your operating system configuration when you use @command{guix system reconfigure}, @command{guix system init}, or @command{guix deploy}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27545
+#: doc/guix.texi:27828
 #, no-wrap
 msgid "shepherd services"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27546
+#: doc/guix.texi:27829
 #, no-wrap
 msgid "PID 1"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27547
+#: doc/guix.texi:27830
 #, no-wrap
 msgid "init system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27553
+#: doc/guix.texi:27836
 msgid "The @code{(gnu services shepherd)} module provides a way to define services managed by the GNU@tie{}Shepherd, which is the initialization system---the first process that is started when the system boots, also known as PID@tie{}1 (@pxref{Introduction,,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27559
+#: doc/guix.texi:27842
 msgid "Services in the Shepherd can depend on each other.  For instance, the SSH daemon may need to be started after the syslog daemon has been started, which in turn can only happen once all the file systems have been mounted.  The simple operating system defined earlier (@pxref{Using the Configuration System}) results in a service graph like this:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27561
+#: doc/guix.texi:27844
 msgid "@image{images/shepherd-graph,,5in,Typical shepherd service graph.}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27565
+#: doc/guix.texi:27848
 msgid "You can actually generate such a graph for any operating system definition using the @command{guix system shepherd-graph} command (@pxref{system-shepherd-graph, @command{guix system shepherd-graph}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27569
+#: doc/guix.texi:27852
 msgid "The @code{%shepherd-root-service} is a service object representing PID@tie{}1, of type @code{shepherd-root-service-type}; it can be extended by passing it lists of @code{} objects."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:27570
+#: doc/guix.texi:27853
 #, no-wrap
 msgid "{Data Type} shepherd-service"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:27572
+#: doc/guix.texi:27855
 msgid "The data type representing a service managed by the Shepherd."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:27574
+#: doc/guix.texi:27857
 #, no-wrap
 msgid "provision"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27576
+#: doc/guix.texi:27859
 msgid "This is a list of symbols denoting what the service provides."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27581
+#: doc/guix.texi:27864
 msgid "These are the names that may be passed to @command{herd start}, @command{herd status}, and similar commands (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual}).  @xref{Slots of services, the @code{provides} slot,, shepherd, The GNU Shepherd Manual}, for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27582
+#: doc/guix.texi:27865
 #, fuzzy, no-wrap
 #| msgid "@code{features} (default: @code{'()})"
 msgid "@code{requirement} (default: @code{'()})"
 msgstr "@code{features} (default: @code{'()})"
 
 #. type: table
-#: doc/guix.texi:27584
+#: doc/guix.texi:27867
 msgid "List of symbols denoting the Shepherd services this one depends on."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27585
+#: doc/guix.texi:27868
 #, no-wrap
 msgid "one-shot services, for the Shepherd"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27590
+#: doc/guix.texi:27873
 msgid "Whether this service is @dfn{one-shot}.  One-shot services stop immediately after their @code{start} action has completed.  @xref{Slots of services,,, shepherd, The GNU Shepherd Manual}, for more info."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27591
+#: doc/guix.texi:27874
 #, no-wrap
 msgid "@code{respawn?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27594
+#: doc/guix.texi:27877
 msgid "Whether to restart the service when it stops, for instance when the underlying process dies."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:27595
+#: doc/guix.texi:27878
 #, no-wrap
 msgid "start"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:27596
+#: doc/guix.texi:27879
 #, no-wrap
 msgid "@code{stop} (default: @code{#~(const #f)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27602
+#: doc/guix.texi:27885
 msgid "The @code{start} and @code{stop} fields refer to the Shepherd's facilities to start and stop processes (@pxref{Service De- and Constructors,,, shepherd, The GNU Shepherd Manual}).  They are given as G-expressions that get expanded in the Shepherd configuration file (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27603
+#: doc/guix.texi:27886
 #, no-wrap
 msgid "@code{actions} (default: @code{'()})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27604
+#: doc/guix.texi:27887
 #, no-wrap
 msgid "actions, of Shepherd services"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27609
+#: doc/guix.texi:27892
 msgid "This is a list of @code{shepherd-action} objects (see below) defining @dfn{actions} supported by the service, in addition to the standard @code{start} and @code{stop} actions.  Actions listed here become available as @command{herd} sub-commands:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27612
+#: doc/guix.texi:27895
 #, no-wrap
 msgid "herd @var{action} @var{service} [@var{arguments}@dots{}]\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27614
+#: doc/guix.texi:27897
 #, fuzzy, no-wrap
 #| msgid "@code{port} (default: @code{22})"
 msgid "@code{auto-start?} (default: @code{#t})"
 msgstr "@code{port} (default: @code{22})"
 
 #. type: table
-#: doc/guix.texi:27617
+#: doc/guix.texi:27900
 msgid "Whether this service should be started automatically by the Shepherd.  If it is @code{#f} the service has to be started manually with @code{herd start}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27620
+#: doc/guix.texi:27903
 msgid "A documentation string, as shown when running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27623
+#: doc/guix.texi:27906
 #, no-wrap
 msgid "herd doc @var{service-name}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27627
+#: doc/guix.texi:27910
 msgid "where @var{service-name} is one of the symbols in @code{provision} (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27628
+#: doc/guix.texi:27911
 #, no-wrap
 msgid "@code{modules} (default: @code{%default-modules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27631
+#: doc/guix.texi:27914
 msgid "This is the list of modules that must be in scope when @code{start} and @code{stop} are evaluated."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:27635
+#: doc/guix.texi:27918
 #, no-wrap
 msgid "{Data Type} shepherd-action"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:27638
+#: doc/guix.texi:27921
 msgid "This is the data type that defines additional actions implemented by a Shepherd service (see above)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27642
+#: doc/guix.texi:27925
 msgid "Symbol naming the action."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27645
+#: doc/guix.texi:27928
 msgid "This is a documentation string for the action.  It can be viewed by running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27648
+#: doc/guix.texi:27931
 #, no-wrap
 msgid "herd doc @var{service} action @var{action}\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:27650
+#: doc/guix.texi:27933
 #, no-wrap
 msgid "procedure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:27654
+#: doc/guix.texi:27937
 msgid "This should be a gexp that evaluates to a procedure of at least one argument, which is the ``running value'' of the service (@pxref{Slots of services,,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:27658
+#: doc/guix.texi:27941
 msgid "The following example defines an action called @code{say-hello} that kindly greets the user:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27667
+#: doc/guix.texi:27950
 #, no-wrap
 msgid ""
 "(shepherd-action\n"
@@ -49836,12 +50573,12 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:27670
+#: doc/guix.texi:27953
 msgid "Assuming this action is added to the @code{example} service, then you can do:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27676
+#: doc/guix.texi:27959
 #, no-wrap
 msgid ""
 "# herd say-hello example\n"
@@ -49851,79 +50588,79 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:27681
+#: doc/guix.texi:27964
 msgid "This, as you can see, is a fairly sophisticated way to say hello.  @xref{Service Convenience,,, shepherd, The GNU Shepherd Manual}, for more info on actions."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27683
+#: doc/guix.texi:27966
 #, no-wrap
 msgid "{Scheme Variable} shepherd-root-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27685
+#: doc/guix.texi:27968
 msgid "The service type for the Shepherd ``root service''---i.e., PID@tie{}1."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27689
+#: doc/guix.texi:27972
 msgid "This is the service type that extensions target when they want to create shepherd services (@pxref{Service Types and Services}, for an example).  Each extension must pass a list of @code{}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27691
+#: doc/guix.texi:27974
 #, no-wrap
 msgid "{Scheme Variable} %shepherd-root-service"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:27693
+#: doc/guix.texi:27976
 msgid "This service represents PID@tie{}1."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27699
+#: doc/guix.texi:27982
 #, no-wrap
 msgid "documentation, searching for"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27700
+#: doc/guix.texi:27983
 #, no-wrap
 msgid "searching for documentation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27701
+#: doc/guix.texi:27984
 #, no-wrap
 msgid "Info, documentation format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27702
+#: doc/guix.texi:27985
 #, no-wrap
 msgid "man pages"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27703
+#: doc/guix.texi:27986
 #, no-wrap
 msgid "manual pages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27710
+#: doc/guix.texi:27993
 msgid "In most cases packages installed with Guix come with documentation.  There are two main documentation formats: ``Info'', a browseable hypertext format used for GNU software, and ``manual pages'' (or ``man pages''), the linear documentation format traditionally found on Unix.  Info manuals are accessed with the @command{info} command or with Emacs, and man pages are accessed using @command{man}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27714
+#: doc/guix.texi:27997
 msgid "You can look for documentation of software installed on your system by keyword.  For example, the following command searches for information about ``TLS'' in Info manuals:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27722
+#: doc/guix.texi:28005
 #, no-wrap
 msgid ""
 "$ info -k TLS\n"
@@ -49935,12 +50672,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27726
+#: doc/guix.texi:28009
 msgid "The command below searches for the same keyword in man pages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27732
+#: doc/guix.texi:28015
 #, no-wrap
 msgid ""
 "$ man -k TLS\n"
@@ -49954,108 +50691,108 @@ msgstr ""
 "@dots {}\n"
 
 #. type: Plain text
-#: doc/guix.texi:27738
+#: doc/guix.texi:28021
 msgid "These searches are purely local to your computer so you have the guarantee that documentation you find corresponds to what you have actually installed, you can access it off-line, and your privacy is respected."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27741
+#: doc/guix.texi:28024
 msgid "Once you have these results, you can view the relevant documentation by running, say:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27744
+#: doc/guix.texi:28027
 #, no-wrap
 msgid "$ info \"(gnutls)Core TLS API\"\n"
 msgstr "$ info \"(gnutls)Core TLS API\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:27748
+#: doc/guix.texi:28031
 msgid "or:"
 msgstr "или:"
 
 #. type: example
-#: doc/guix.texi:27751
+#: doc/guix.texi:28034
 #, no-wrap
 msgid "$ man certtool\n"
 msgstr "$ man certtool\n"
 
 #. type: Plain text
-#: doc/guix.texi:27759
+#: doc/guix.texi:28042
 msgid "Info manuals contain sections and indices as well as hyperlinks like those found in Web pages.  The @command{info} reader (@pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}) and its Emacs counterpart (@pxref{Misc Help,,, emacs, The GNU Emacs Manual}) provide intuitive key bindings to navigate manuals.  @xref{Getting Started,,, info, Info: An Introduction}, for an introduction to Info navigation."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27763
+#: doc/guix.texi:28046
 #, no-wrap
 msgid "debugging files"
 msgstr "отладка файлов"
 
 #. type: Plain text
-#: doc/guix.texi:27769
+#: doc/guix.texi:28052
 msgid "Program binaries, as produced by the GCC compilers for instance, are typically written in the ELF format, with a section containing @dfn{debugging information}.  Debugging information is what allows the debugger, GDB, to map binary code to source code; it is required to debug a compiled program in good conditions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27777
+#: doc/guix.texi:28060
 msgid "The problem with debugging information is that is takes up a fair amount of disk space.  For example, debugging information for the GNU C Library weighs in at more than 60 MiB.  Thus, as a user, keeping all the debugging info of all the installed programs is usually not an option.  Yet, space savings should not come at the cost of an impediment to debugging---especially in the GNU system, which should make it easier for users to exert their computing freedom (@pxref{GNU Distribution})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27784
+#: doc/guix.texi:28067
 msgid "Thankfully, the GNU Binary Utilities (Binutils) and GDB provide a mechanism that allows users to get the best of both worlds: debugging information can be stripped from the binaries and stored in separate files.  GDB is then able to load debugging information from those files, when they are available (@pxref{Separate Debug Files,,, gdb, Debugging with GDB})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27792
+#: doc/guix.texi:28075
 msgid "The GNU distribution takes advantage of this by storing debugging information in the @code{lib/debug} sub-directory of a separate package output unimaginatively called @code{debug} (@pxref{Packages with Multiple Outputs}).  Users can choose to install the @code{debug} output of a package when they need it.  For instance, the following command installs the debugging information for the GNU C Library and for GNU Guile:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27795
+#: doc/guix.texi:28078
 #, no-wrap
 msgid "guix install glibc:debug guile:debug\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27801
+#: doc/guix.texi:28084
 msgid "GDB must then be told to look for debug files in the user's profile, by setting the @code{debug-file-directory} variable (consider setting it from the @file{~/.gdbinit} file, @pxref{Startup,,, gdb, Debugging with GDB}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27804
+#: doc/guix.texi:28087
 #, no-wrap
 msgid "(gdb) set debug-file-directory ~/.guix-profile/lib/debug\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27808
+#: doc/guix.texi:28091
 msgid "From there on, GDB will pick up debugging information from the @code{.debug} files under @file{~/.guix-profile/lib/debug}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27815
+#: doc/guix.texi:28098
 msgid "In addition, you will most likely want GDB to be able to show the source code being debugged.  To do that, you will have to unpack the source code of the package of interest (obtained with @code{guix build --source}, @pxref{Invoking guix build}), and to point GDB to that source directory using the @code{directory} command (@pxref{Source Path, @code{directory},, gdb, Debugging with GDB})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27824
+#: doc/guix.texi:28107
 msgid "The @code{debug} output mechanism in Guix is implemented by the @code{gnu-build-system} (@pxref{Build Systems}).  Currently, it is opt-in---debugging information is available only for the packages with definitions explicitly declaring a @code{debug} output.  This may be changed to opt-out in the future if our build farm servers can handle the load.  To check whether a package has a @code{debug} output, use @command{guix package --list-available} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27829
+#: doc/guix.texi:28112
 #, no-wrap
 msgid "security updates"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27838
+#: doc/guix.texi:28121
 msgid "Occasionally, important security vulnerabilities are discovered in software packages and must be patched.  Guix developers try hard to keep track of known vulnerabilities and to apply fixes as soon as possible in the @code{master} branch of Guix (we do not yet provide a ``stable'' branch containing only security updates.)  The @command{guix lint} tool helps developers find out about vulnerable versions of software packages in the distribution:"
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:27845
+#: doc/guix.texi:28128
 #, no-wrap
 msgid ""
 "$ guix lint -c cve\n"
@@ -50066,39 +50803,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27848
+#: doc/guix.texi:28131
 msgid "@xref{Invoking guix lint}, for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27857
+#: doc/guix.texi:28140
 msgid "Guix follows a functional package management discipline (@pxref{Introduction}), which implies that, when a package is changed, @emph{every package that depends on it} must be rebuilt.  This can significantly slow down the deployment of fixes in core packages such as libc or Bash, since basically the whole distribution would need to be rebuilt.  Using pre-built binaries helps (@pxref{Substitutes}), but deployment may still take more time than desired."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27858
+#: doc/guix.texi:28141
 #, no-wrap
 msgid "grafts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27866
+#: doc/guix.texi:28149
 msgid "To address this, Guix implements @dfn{grafts}, a mechanism that allows for fast deployment of critical updates without the costs associated with a whole-distribution rebuild.  The idea is to rebuild only the package that needs to be patched, and then to ``graft'' it onto packages explicitly installed by the user and that were previously referring to the original package.  The cost of grafting is typically very low, and order of magnitudes lower than a full rebuild of the dependency chain."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27867
+#: doc/guix.texi:28150
 #, no-wrap
 msgid "replacements of packages, for grafts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27873
+#: doc/guix.texi:28156
 msgid "For instance, suppose a security update needs to be applied to Bash.  Guix developers will provide a package definition for the ``fixed'' Bash, say @code{bash-fixed}, in the usual way (@pxref{Defining Packages}).  Then, the original package definition is augmented with a @code{replacement} field pointing to the package containing the bug fix:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:27880
+#: doc/guix.texi:28163
 #, no-wrap
 msgid ""
 "(define bash\n"
@@ -50109,177 +50846,177 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27890
+#: doc/guix.texi:28173
 msgid "From there on, any package depending directly or indirectly on Bash---as reported by @command{guix gc --requisites} (@pxref{Invoking guix gc})---that is installed is automatically ``rewritten'' to refer to @code{bash-fixed} instead of @code{bash}.  This grafting process takes time proportional to the size of the package, usually less than a minute for an ``average'' package on a recent machine.  Grafting is recursive: when an indirect dependency requires grafting, then grafting ``propagates'' up to the package that the user is installing."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27898
+#: doc/guix.texi:28181
 msgid "Currently, the length of the name and version of the graft and that of the package it replaces (@code{bash-fixed} and @code{bash} in the example above) must be equal.  This restriction mostly comes from the fact that grafting works by patching files, including binary files, directly.  Other restrictions may apply: for instance, when adding a graft to a package providing a shared library, the original shared library and its replacement must have the same @code{SONAME} and be binary-compatible."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27902
+#: doc/guix.texi:28185
 msgid "The @option{--no-grafts} command-line option allows you to forcefully avoid grafting (@pxref{Common Build Options, @option{--no-grafts}}).  Thus, the command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27905
+#: doc/guix.texi:28188
 #, no-wrap
 msgid "guix build bash --no-grafts\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27909
+#: doc/guix.texi:28192
 msgid "returns the store file name of the original Bash, whereas:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27912
+#: doc/guix.texi:28195
 #, no-wrap
 msgid "guix build bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27917
+#: doc/guix.texi:28200
 msgid "returns the store file name of the ``fixed'', replacement Bash.  This allows you to distinguish between the two variants of Bash."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27920
+#: doc/guix.texi:28203
 msgid "To verify which Bash your whole profile refers to, you can run (@pxref{Invoking guix gc}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27923
+#: doc/guix.texi:28206
 #, no-wrap
 msgid "guix gc -R `readlink -f ~/.guix-profile` | grep bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27928
+#: doc/guix.texi:28211
 msgid "@dots{} and compare the store file names that you get with those above.  Likewise for a complete Guix system generation:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27931
+#: doc/guix.texi:28214
 #, no-wrap
 msgid "guix gc -R `guix system build my-config.scm` | grep bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27935
+#: doc/guix.texi:28218
 msgid "Lastly, to check which Bash running processes are using, you can use the @command{lsof} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:27938
+#: doc/guix.texi:28221
 #, no-wrap
 msgid "lsof | grep /gnu/store/.*bash\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27946
+#: doc/guix.texi:28229
 #, no-wrap
 msgid "bootstrapping"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27956
+#: doc/guix.texi:28239
 msgid "Bootstrapping in our context refers to how the distribution gets built ``from nothing''.  Remember that the build environment of a derivation contains nothing but its declared inputs (@pxref{Introduction}).  So there's an obvious chicken-and-egg problem: how does the first package get built? How does the first compiler get compiled? Note that this is a question of interest only to the curious hacker, not to the regular user, so you can shamelessly skip this section if you consider yourself a ``regular user''."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:27957 doc/guix.texi:28160
+#: doc/guix.texi:28240 doc/guix.texi:28443
 #, no-wrap
 msgid "bootstrap binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27967
+#: doc/guix.texi:28250
 msgid "The GNU system is primarily made of C code, with libc at its core.  The GNU build system itself assumes the availability of a Bourne shell and command-line tools provided by GNU Coreutils, Awk, Findutils, `sed', and `grep'.  Furthermore, build programs---programs that run @code{./configure}, @code{make}, etc.---are written in Guile Scheme (@pxref{Derivations}).  Consequently, to be able to build anything at all, from scratch, Guix relies on pre-built binaries of Guile, GCC, Binutils, libc, and the other packages mentioned above---the @dfn{bootstrap binaries}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27970
+#: doc/guix.texi:28253
 msgid "These bootstrap binaries are ``taken for granted'', though we can also re-create them if needed (more on that later)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27973
+#: doc/guix.texi:28256
 msgid "For @code{i686-linux} and @code{x86_64-linux} the Guix bootstrap process is more elaborate, @pxref{Reduced Binary Seed Bootstrap}."
 msgstr ""
 
 #. type: node
-#: doc/guix.texi:27977 doc/guix.texi:27979
+#: doc/guix.texi:28260 doc/guix.texi:28262
 #, no-wrap
 msgid "Reduced Binary Seed Bootstrap"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:27977
+#: doc/guix.texi:28260
 msgid "A Bootstrap worthy of GNU."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:27977 doc/guix.texi:28043 doc/guix.texi:28044
+#: doc/guix.texi:28260 doc/guix.texi:28326 doc/guix.texi:28327
 #, no-wrap
 msgid "Preparing to Use the Bootstrap Binaries"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:27977
+#: doc/guix.texi:28260
 msgid "Building that what matters most."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:27980
+#: doc/guix.texi:28263
 #, no-wrap
 msgid "The Reduced Binary Seed Bootstrap"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27987
+#: doc/guix.texi:28270
 msgid "Guix---like other GNU/Linux distributions---is traditionally bootstrapped from a set of bootstrap binaries: Bourne shell, command-line tools provided by GNU Coreutils, Awk, Findutils, `sed', and `grep' and Guile, GCC, Binutils, and the GNU C Library (@pxref{Bootstrapping}).  Usually, these bootstrap binaries are ``taken for granted.''"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27993
+#: doc/guix.texi:28276
 msgid "Taking these binaries for granted means that we consider them to be a correct and trustworthy `seed' for building the complete system.  Therein lies a problem: the current combined size of these bootstrap binaries is about 250MB (@pxref{Bootstrappable Builds,,, mes, GNU Mes}).  Auditing or even inspecting these is next to impossible."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:27998
+#: doc/guix.texi:28281
 msgid "For @code{i686-linux} and @code{x86_64-linux}, Guix now features a ``Reduced Binary Seed'' bootstrap @footnote{We would like to say: ``Full Source Bootstrap'' and while we are working towards that goal it would be hyperbole to use that term for what we do now.}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28034
+#: doc/guix.texi:28317
 msgid "The Reduced Binary Seed bootstrap removes the most critical tools---from a trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C Library are replaced by: @code{bootstrap-mescc-tools} (a tiny assembler and linker) and @code{bootstrap-mes} (a small Scheme Interpreter and a C compiler written in Scheme and the Mes C Library, built for TinyCC and for GCC).  Using these new binary seeds and a new set of packages@footnote{nyacc-boot, mes-boot, tcc-boot0, tcc-boot, make-mesboot0, diffutils-mesboot, binutils-mesboot0, gcc-core-mesboot, mesboot-headers, glibc-mesboot0, gcc-mesboot0, binutils-mesboot, make-mesboot, gcc-mesboot1, gcc-mesboot1-wrapper, glibc-headers-mesboot, glibc-mesboot, gcc-mesboot, and gcc-mesboot-wrapper.  } the ``missing'' Binutils, GCC, and the GNU C Library are built from source.  From here on the more traditional bootstrap process resumes.  This approach has reduced the bootstrap binaries in size to about 130MB.  Work is ongoing to reduce this further.  If you are interested, join us on @code{#bootstrappable} on the Freenode IRC network."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28040
+#: doc/guix.texi:28323
 msgid "Below is the generated dependency graph for @code{gcc-mesboot}, the bootstrap compiler used to build the rest of GuixSD."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28042
+#: doc/guix.texi:28325
 msgid "@image{images/gcc-mesboot-bag-graph,6in,,Dependency graph of the gcc-mesboot}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28049
+#: doc/guix.texi:28332
 msgid "@image{images/bootstrap-graph,6in,,Dependency graph of the early bootstrap derivations}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28054
+#: doc/guix.texi:28337
 msgid "The figure above shows the very beginning of the dependency graph of the distribution, corresponding to the package definitions of the @code{(gnu packages bootstrap)} module.  A similar figure can be generated with @command{guix graph} (@pxref{Invoking guix graph}), along the lines of:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:28059
+#: doc/guix.texi:28342
 #, no-wrap
 msgid ""
 "guix graph -t derivation \\\n"
@@ -50288,12 +51025,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28062
+#: doc/guix.texi:28345
 msgid "or, for the Reduced Binary Seed bootstrap"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:28067
+#: doc/guix.texi:28350
 #, no-wrap
 msgid ""
 "guix graph -t derivation \\\n"
@@ -50302,43 +51039,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28076
+#: doc/guix.texi:28359
 msgid "At this level of detail, things are slightly complex.  First, Guile itself consists of an ELF executable, along with many source and compiled Scheme files that are dynamically loaded when it runs.  This gets stored in the @file{guile-2.0.7.tar.xz} tarball shown in this graph.  This tarball is part of Guix's ``source'' distribution, and gets inserted into the store with @code{add-to-store} (@pxref{The Store})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28085
+#: doc/guix.texi:28368
 msgid "But how do we write a derivation that unpacks this tarball and adds it to the store? To solve this problem, the @code{guile-bootstrap-2.0.drv} derivation---the first one that gets built---uses @code{bash} as its builder, which runs @code{build-bootstrap-guile.sh}, which in turn calls @code{tar} to unpack the tarball.  Thus, @file{bash}, @file{tar}, @file{xz}, and @file{mkdir} are statically-linked binaries, also part of the Guix source distribution, whose sole purpose is to allow the Guile tarball to be unpacked."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28097
+#: doc/guix.texi:28380
 msgid "Once @code{guile-bootstrap-2.0.drv} is built, we have a functioning Guile that can be used to run subsequent build programs.  Its first task is to download tarballs containing the other pre-built binaries---this is what the @code{.tar.xz.drv} derivations do.  Guix modules such as @code{ftp-client.scm} are used for this purpose.  The @code{module-import.drv} derivations import those modules in a directory in the store, using the original layout.  The @code{module-import-compiled.drv} derivations compile those modules, and write them in an output directory with the right layout.  This corresponds to the @code{#:modules} argument of @code{build-expression->derivation} (@pxref{Derivations})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28102
+#: doc/guix.texi:28385
 msgid "Finally, the various tarballs are unpacked by the derivations @code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, or @code{bootstrap-mes-0.drv} and @code{bootstrap-mescc-tools-0.drv}, at which point we have a working C tool chain."
 msgstr ""
 
 #. type: unnumberedsec
-#: doc/guix.texi:28103
+#: doc/guix.texi:28386
 #, no-wrap
 msgid "Building the Build Tools"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28112
+#: doc/guix.texi:28395
 msgid "Bootstrapping is complete when we have a full tool chain that does not depend on the pre-built bootstrap tools discussed above.  This no-dependency requirement is verified by checking whether the files of the final tool chain contain references to the @file{/gnu/store} directories of the bootstrap inputs.  The process that leads to this ``final'' tool chain is described by the package definitions found in the @code{(gnu packages commencement)} module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28119
+#: doc/guix.texi:28402
 msgid "The @command{guix graph} command allows us to ``zoom out'' compared to the graph above, by looking at the level of package objects instead of individual derivations---remember that a package may translate to several derivations, typically one derivation to download its source, one to build the Guile modules it needs, and one to actually build the package from source.  The command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:28124
+#: doc/guix.texi:28407
 #, no-wrap
 msgid ""
 "guix graph -t bag \\\n"
@@ -50347,168 +51084,185 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28131
+#: doc/guix.texi:28414
 msgid "produces the dependency graph leading to the ``final'' C library@footnote{You may notice the @code{glibc-intermediate} label, suggesting that it is not @emph{quite} final, but as a good approximation, we will consider it final.}, depicted below."
 msgstr "создает граф зависимостей, ведущий к «финальной» библиотеке C @footnote{Вы могли обратить внимание на метку @code{glibc-intermediate}, полагая, что библиотека является @emph{недостаточно} финальной, но в данном приближении мы будем считать её финальной.}, показанной ниже."
 
 #. type: Plain text
-#: doc/guix.texi:28133
+#: doc/guix.texi:28416
 msgid "@image{images/bootstrap-packages,6in,,Dependency graph of the early packages}"
 msgstr "@image{images/bootstrap-packages,6in,,График зависимости ранних пакетов}"
 
 #. type: Plain text
-#: doc/guix.texi:28139
+#: doc/guix.texi:28422
 msgid "The first tool that gets built with the bootstrap binaries is GNU@tie{}Make---noted @code{make-boot0} above---which is a prerequisite for all the following packages.  From there Findutils and Diffutils get built."
 msgstr "Первый инструмент, который собирается с помощью двоичных файлов начальной загрузки, - это GNU@tie{}Make---отмеченный @code{make-boot0} выше---который является обязательным для всех следующих пакетов. После собираются Findutils и Diffutils."
 
 #. type: Plain text
-#: doc/guix.texi:28144
+#: doc/guix.texi:28427
 msgid "Then come the first-stage Binutils and GCC, built as pseudo cross tools---i.e., with @code{--target} equal to @code{--host}.  They are used to build libc.  Thanks to this cross-build trick, this libc is guaranteed not to hold any reference to the initial tool chain."
 msgstr "Затем идут Binutils и GCC, построенные как псевдо-кросс-инструменты---т.е. с @code{--target}, равным @code{--host}. Они используются для сборки libc. Благодаря этому кросс-сборочному трюку, libc гарантированно не будет содержать никаких ссылок на начальный набор инструментов."
 
 #. type: Plain text
-#: doc/guix.texi:28150
+#: doc/guix.texi:28433
 msgid "From there the final Binutils and GCC (not shown above) are built.  GCC uses @code{ld} from the final Binutils, and links programs against the just-built libc.  This tool chain is used to build the other packages used by Guix and by the GNU Build System: Guile, Bash, Coreutils, etc."
 msgstr "Оттуда создаются финальные версии Binutils и GCC (не показаны выше). GCC использует @code{ld} из финального Binutils и связывает программы с только что созданным libc. Эта цепочка инструментов используется для сборки других пакетов, используемых Guix и система сборки GNU: Guile, Bash, Coreutils и т.д."
 
 #. type: Plain text
-#: doc/guix.texi:28156
+#: doc/guix.texi:28439
 msgid "And voilà! At this point we have the complete set of build tools that the GNU Build System expects.  These are in the @code{%final-inputs} variable of the @code{(gnu packages commencement)} module, and are implicitly used by any package that uses @code{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})."
 msgstr "И вуаля! Теперь у нас есть полный набор инструментов сборки, который ожидает система сборки GNU. Они находятся в переменной @code{%final-input} модуля @code{(gnu packages commencement)} и неявно используются любым пакетом, использующим @code{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})."
 
 #. type: unnumberedsec
-#: doc/guix.texi:28158
+#: doc/guix.texi:28441
 #, no-wrap
 msgid "Building the Bootstrap Binaries"
 msgstr "Сборка двоичных файлов двоичной загрузки"
 
 #. type: Plain text
-#: doc/guix.texi:28165
+#: doc/guix.texi:28448
 msgid "Because the final tool chain does not depend on the bootstrap binaries, those rarely need to be updated.  Nevertheless, it is useful to have an automated way to produce them, should an update occur, and this is what the @code{(gnu packages make-bootstrap)} module provides."
 msgstr "Поскольку окончательный набор инструментов не зависит от двоичных файлов начальной загрузки, их редко требуется обновлять. Тем не менее, полезно иметь автоматический способ их создания, если произойдет обновление, и это то, что обеспечивает модуль @code{(gnu packages make-bootstrap)}."
 
 #. type: Plain text
-#: doc/guix.texi:28171
+#: doc/guix.texi:28454
 msgid "The following command builds the tarballs containing the bootstrap binaries (Binutils, GCC, glibc, for the traditional bootstrap and linux-libre-headers, bootstrap-mescc-tools, bootstrap-mes for the Reduced Binary Seed bootstrap, and Guile, and a tarball containing a mixture of Coreutils and other basic command-line tools):"
 msgstr "Следующая команда создает tar-архивы, содержащие двоичные файлы начальной загрузки (Binutils, GCC, glibc, для традиционной загрузки и linux-libre-headers, bootstrap-mescc-tools, bootstrap-mes для начальной загрузки Reduced Binary Seed, Guile и tarball содержащий смесь Coreutils и других основных инструментов командной строки):"
 
 #. type: example
-#: doc/guix.texi:28174
+#: doc/guix.texi:28457
 #, no-wrap
 msgid "guix build bootstrap-tarballs\n"
 msgstr "tar архив начальной сборки guix\n"
 
 #. type: Plain text
-#: doc/guix.texi:28179
+#: doc/guix.texi:28462
 msgid "The generated tarballs are those that should be referred to in the @code{(gnu packages bootstrap)} module mentioned at the beginning of this section."
 msgstr "Сгенерированные тарболы - это те, на которые нужно ссылаться в модуле @code{(gnu packages bootstrap)}, упомянутом в начале этого раздела."
 
 #. type: Plain text
-#: doc/guix.texi:28185
+#: doc/guix.texi:28468
 msgid "Still here? Then perhaps by now you've started to wonder: when do we reach a fixed point? That is an interesting question! The answer is unknown, but if you would like to investigate further (and have significant computational and storage resources to do so), then let us know."
 msgstr "Все еще здесь? Тогда, может быть, вы задались вопросом: когда мы достигнем фиксированной точки? Это интересный вопрос! Ответ неизвестен, но если вы хотите продолжить исследование (и располагаете значительными вычислительными ресурсами для этого), сообщите нам."
 
 #. type: unnumberedsec
-#: doc/guix.texi:28186
+#: doc/guix.texi:28469
 #, no-wrap
 msgid "Reducing the Set of Bootstrap Binaries"
 msgstr "Сокращение набора Bootstrap Binaries"
 
 #. type: Plain text
-#: doc/guix.texi:28194
+#: doc/guix.texi:28477
 msgid "Our traditional bootstrap includes GCC, GNU Libc, Guile, etc.  That's a lot of binary code! Why is that a problem? It's a problem because these big chunks of binary code are practically non-auditable, which makes it hard to establish what source code produced them.  Every unauditable binary also leaves us vulnerable to compiler backdoors as described by Ken Thompson in the 1984 paper @emph{Reflections on Trusting Trust}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28200
+#: doc/guix.texi:28483
 msgid "This is mitigated by the fact that our bootstrap binaries were generated from an earlier Guix revision.  Nevertheless it lacks the level of transparency that we get in the rest of the package dependency graph, where Guix always gives us a source-to-binary mapping.  Thus, our goal is to reduce the set of bootstrap binaries to the bare minimum."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28206
-msgid "The @uref{http://bootstrappable.org, Bootstrappable.org web site} lists on-going projects to do that.  One of these is about replacing the bootstrap GCC with a sequence of assemblers, interpreters, and compilers of increasing complexity, which could be built from source starting from a simple and auditable assembler."
+#: doc/guix.texi:28489
+msgid "The @uref{https://bootstrappable.org, Bootstrappable.org web site} lists on-going projects to do that.  One of these is about replacing the bootstrap GCC with a sequence of assemblers, interpreters, and compilers of increasing complexity, which could be built from source starting from a simple and auditable assembler."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28215
+#: doc/guix.texi:28498
 msgid "Our first major achievement is the replacement of of GCC, the GNU C Library and Binutils by MesCC-Tools (a simple hex linker and macro assembler) and Mes (@pxref{Top, GNU Mes Reference Manual,, mes, GNU Mes}, a Scheme interpreter and C compiler in Scheme).  Neither MesCC-Tools nor Mes can be fully bootstrapped yet and thus we inject them as binary seeds.  We call this the Reduced Binary Seed bootstrap, as it has halved the size of our bootstrap binaries! Also, it has eliminated the C compiler binary; i686-linux and x86_64-linux Guix packages are now bootstrapped without any binary C compiler."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28218
+#: doc/guix.texi:28501
 msgid "Work is ongoing to make MesCC-Tools and Mes fully bootstrappable and we are also looking at any other bootstrap binaries.  Your help is welcome!"
 msgstr ""
 
 #. type: chapter
-#: doc/guix.texi:28220
+#: doc/guix.texi:28503
 #, no-wrap
 msgid "Porting to a New Platform"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28229
+#: doc/guix.texi:28512
 msgid "As discussed above, the GNU distribution is self-contained, and self-containment is achieved by relying on pre-built ``bootstrap binaries'' (@pxref{Bootstrapping}).  These binaries are specific to an operating system kernel, CPU architecture, and application binary interface (ABI).  Thus, to port the distribution to a platform that is not yet supported, one must build those bootstrap binaries, and update the @code{(gnu packages bootstrap)} module to use them on that platform."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28234
+#: doc/guix.texi:28517
 msgid "Fortunately, Guix can @emph{cross compile} those bootstrap binaries.  When everything goes well, and assuming the GNU tool chain supports the target platform, this can be as simple as running a command like this one:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:28237
+#: doc/guix.texi:28520
 #, no-wrap
 msgid "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28244
+#: doc/guix.texi:28527
 msgid "For this to work, the @code{glibc-dynamic-linker} procedure in @code{(gnu packages bootstrap)} must be augmented to return the right file name for libc's dynamic linker on that platform; likewise, @code{system->linux-architecture} in @code{(gnu packages linux)} must be taught about the new platform."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28253
+#: doc/guix.texi:28536
 msgid "Once these are built, the @code{(gnu packages bootstrap)} module needs to be updated to refer to these binaries on the target platform.  That is, the hashes and URLs of the bootstrap tarballs for the new platform must be added alongside those of the currently supported platforms.  The bootstrap Guile tarball is treated specially: it is expected to be available locally, and @file{gnu/local.mk} has rules to download it for the supported architectures; a rule for the new platform must be added as well."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28262
+#: doc/guix.texi:28545
 msgid "In practice, there may be some complications.  First, it may be that the extended GNU triplet that specifies an ABI (like the @code{eabi} suffix above) is not recognized by all the GNU tools.  Typically, glibc recognizes some of these, whereas GCC uses an extra @code{--with-abi} configure flag (see @code{gcc.scm} for examples of how to handle this).  Second, some of the required packages could fail to build for that platform.  Lastly, the generated binaries could be broken for some reason."
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:28264
+#: doc/guix.texi:28547
 #, no-wrap
 msgid "contributing.texi"
 msgstr "contributing.ru.texi"
 
 #. type: Plain text
-#: doc/guix.texi:28277
+#: doc/guix.texi:28560
 msgid "Guix is based on the @uref{https://nixos.org/nix/, Nix package manager}, which was designed and implemented by Eelco Dolstra, with contributions from other people (see the @file{nix/AUTHORS} file in Guix.)  Nix pioneered functional package management, and promoted unprecedented features, such as transactional package upgrades and rollbacks, per-user profiles, and referentially transparent build processes.  Without this work, Guix would not exist."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28280
+#: doc/guix.texi:28563
 msgid "The Nix-based software distributions, Nixpkgs and NixOS, have also been an inspiration for Guix."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:28286
+#: doc/guix.texi:28569
 msgid "GNU@tie{}Guix itself is a collective work with contributions from a number of people.  See the @file{AUTHORS} file in Guix for more information on these fine people.  The @file{THANKS} file lists people who have helped by reporting bugs, taking care of the infrastructure, providing artwork and themes, making suggestions, and more---thank you!"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:28291
+#: doc/guix.texi:28574
 #, no-wrap
 msgid "license, GNU Free Documentation License"
 msgstr "лицензия, GNU Free Documentation License"
 
 #. type: include
-#: doc/guix.texi:28292
+#: doc/guix.texi:28575
 #, no-wrap
 msgid "fdl-1.3.texi"
 msgstr ""
 
+#, fuzzy
+#~| msgid "After installing fonts you may have to refresh the font cache to use them in applications.  The same applies when applications installed via Guix do not seem to find fonts.  To force rebuilding of the font cache run @code{fc-cache -f}.  The @code{fc-cache} command is provided by the @code{fontconfig} package."
+#~ msgid "After installing fonts you may have to refresh the font cache to use them in applications.  The same applies when applications installed via Guix do not seem to find fonts.  To force rebuilding of the font cache run @code{fc-cache -rv}.  The @code{fc-cache} command is provided by the @code{fontconfig} package."
+#~ msgstr "После установки шрифтов, возможно вам потребуется обновить кеш шрифтов, чтобы использовать их в приложениях. Это необходимо делать, когда приложения, установленные с помощью Guix, не находят шрифты. Для того чтобы пересобрать кеш шрифтов, запустите @code{fc-cache -f}. Команда @code{fc-cache} предоставляется пакетом @code{fontconfig}."
+
+#~ msgid "When you install Emacs packages with Guix, the elisp files may be placed either in @file{$HOME/.guix-profile/share/emacs/site-lisp/} or in sub-directories of @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}.  The latter directory exists because potentially there may exist thousands of Emacs packages and storing all their files in a single directory may not be reliable (because of name conflicts).  So we think using a separate directory for each package is a good idea.  It is very similar to how the Emacs package system organizes the file structure (@pxref{Package Files,,, emacs, The GNU Emacs Manual})."
+#~ msgstr "Когда вы устанавливаете пакеты Emacs с помощью Guix, файлы elisp могут помещаться в @file{$HOME/.guix-profile/share/emacs/site-lisp/} или поддиректориях @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}. Последняя директория существует, потому что потенциально могут существовать тысячи пакетов Emacs, и сохранение всех их файлов в одной директории может быть неприемлемо (из-за конфликта имён). Так что мы считаем хорошей идеей использовать отдельную директорию для каждого пакета. Это очень похоже на то, как система пакетов Emacs организует файловую структуру (@pxref{Package Files,,, emacs, The GNU Emacs Manual})."
+
+#~ msgid "For containers, share the file system @var{source} from the host system as the writable file system @var{target} within the container.  If @var{target} is not specified, @var{source} is used as the target mount point in the container."
+#~ msgstr "Разделять в контейнере файловую систему @var{source} хостящей системы как файловую систему, доступную для записи, с целью @var{target} внутри контейнера. Если цель @var{target} не задана, источник @var{source} используется в качестве целевой точки монтирования в контейнере."
+
+#~ msgid "The example below spawns a Guile REPL in a container in which the user's home directory is accessible for both reading and writing via the @file{/exchange} directory:"
+#~ msgstr "Пример ниже порождает Guile REPL в контейнере, в котором домашняя директория пользователя доступна для чтения и записи через директорию @file{/exchange}:"
+
+#~ msgid "guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile\n"
+#~ msgstr "guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile\n"
+
 #~ msgid "@xref{Invoking guix environment}, for more information on that command.  Extra dependencies can be added with @option{--ad-hoc}:"
 #~ msgstr "см. @xref{Invoking guix environment} для информации об этой команде. Дополнительные зависимости можно добавить опцией @option{--ad-hoc}:"
 
-- 
cgit v1.2.3


From ef0cb0dd1d05efcfd3dba082a126eb75e8443485 Mon Sep 17 00:00:00 2001
From: Jack Hill 
Date: Sat, 2 May 2020 00:26:56 -0400
Subject: gnu: emacs-next: Upgrade to 27.0.91.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs.scm (emacs-next): Upgrade to 27.0.91.
[inputs]: Remove imagemagick.

Co-authored-by: Ludovic Courtès 
---
 gnu/packages/emacs.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ab7cc20d10..b6119c7dce 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2019 Valentin Ignatev 
 ;;; Copyright © 2019 Leo Prikler 
 ;;; Copyright © 2019 Amin Bandali 
+;;; Copyright © 2020 Jack Hill 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -69,6 +70,7 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (guix utils)
+  #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
 
 (define-public emacs
@@ -242,9 +244,9 @@ languages.")
     (license license:gpl3+)))
 
 (define-public emacs-next
-  (let ((commit "36abf6864604b3061c2e070f8997491fa2bce44c")
+  (let ((commit "c36c5a3dedbb2e0349be1b6c3b7567ea7b594f1c")
         (revision "0")
-        (emacs-version "27.0.50"))
+        (emacs-version "27.0.91"))
     (package
       (inherit emacs)
       (name "emacs-next")
@@ -256,7 +258,7 @@ languages.")
                (url "https://git.savannah.gnu.org/git/emacs.git")
                (commit commit)))
          (sha256
-          (base32 "1ckn607p0clz0dhhlizvv7l03p4nminy48h53xrpz55w4rcrcm2l"))
+          (base32 "0mlrg2npy1r79laahkgzhxd1qassfcdz8qk1cpw7mqgf6y5x505h"))
          (file-name (git-file-name name version))
          (patches (search-patches "emacs27-exec-path.patch"
                                   "emacs-fix-scheme-indent-function.patch"
@@ -321,7 +323,9 @@ languages.")
       (inputs
        `(("jansson" ,jansson)
          ("harfbuzz" ,harfbuzz)
-         ,@(package-inputs emacs)))
+         ;; Emacs no longer uses ImageMagick by default
+         ;; https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-27.0.91&id=c36c5a3dedbb2e0349be1b6c3b7567ea7b594f1c#n102
+         ,@(alist-delete "imagemagick" (package-inputs emacs))))
       (native-inputs
        `(("autoconf" ,autoconf)      ; needed when building from trunk
          ,@(package-native-inputs emacs)))
-- 
cgit v1.2.3


From c26146881ac826ec0f1a49d86bfe874be8d355e6 Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Tue, 5 May 2020 17:07:29 -0400
Subject: gnu: icecat: Update to 68.8.0-guix0-preview1 [security fixes].

Includes fixes for CVE-2020-6831, CVE-2020-12387, CVE-2020-12388,
CVE-2020-12389, CVE-2020-12392, CVE-2020-12393, and CVE-2020-12395.

* gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update.
(icecat-source): Update gnuzilla commit, base version, and hashes.
Apply icecat-use-older-reveal-hidden-html.patch.
* gnu/packages/patches/icecat-makeicecat.patch: Adapt to new version.
* gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  3 +-
 gnu/packages/gnuzilla.scm                          | 18 +++---
 gnu/packages/patches/icecat-makeicecat.patch       |  4 +-
 .../icecat-use-older-reveal-hidden-html.patch      | 70 ++++++++++++++++++++++
 4 files changed, 85 insertions(+), 10 deletions(-)
 create mode 100644 gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 4e0521baa5..fafc92c979 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2,7 +2,7 @@
 # Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
 # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge 
 # Copyright © 2016 Mathieu Lirzin 
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver 
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver 
 # Copyright © 2016 Chris Marusich 
 # Copyright © 2016, 2017, 2018 Kei Kebreau 
 # Copyright © 2016, 2017 Rene Saavedra 
@@ -1057,6 +1057,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/hydra-disable-darcs-test.patch		\
   %D%/packages/patches/icecat-makeicecat.patch			\
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch	\
+  %D%/packages/patches/icecat-use-older-reveal-hidden-html.patch	\
   %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch	\
   %D%/packages/patches/icecat-use-system-media-libs.patch	\
   %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch  \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 06d855ee3e..7020879b64 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -554,8 +554,8 @@ from forcing GEXP-PROMISE."
                       #:system system
                       #:guile-for-build guile)))
 
-(define %icecat-version "68.7.0-guix0-preview1")
-(define %icecat-build-id "20200406000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-version "68.8.0-guix0-preview1")
+(define %icecat-build-id "20200505000000") ;must be of the form YYYYMMDDhhmmss
 
 ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
 ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@@ -577,11 +577,11 @@ from forcing GEXP-PROMISE."
                   "firefox-" upstream-firefox-version ".source.tar.xz"))
             (sha256
              (base32
-              "0w3mad0r4khcd7hfmm3xix9x6mp5yp8g8kyh18vanfnjqdls0gmd"))))
+              "0hp8cc7xk6qj4q1s8n97qv9sdrypkzvphik96m5qv1r5s9k24nzs"))))
 
-         (upstream-icecat-base-version "68.7.0") ; maybe older than base-version
+         (upstream-icecat-base-version "68.8.0") ; maybe older than base-version
          ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
-         (gnuzilla-commit "d185c5a67506311e19440fd4b824a822ce840369")
+         (gnuzilla-commit "5358ff2963a6136f8acafdc598cad540231ad23e")
          (gnuzilla-source
           (origin
             (method git-fetch)
@@ -593,10 +593,12 @@ from forcing GEXP-PROMISE."
                                       (string-take gnuzilla-commit 8)))
             (sha256
              (base32
-              "09skws692qv5kbhj8bvy3prj7v0iyfz68xjck4vbfxkahldfppqx"))))
+              "1bq0qzgkxz9q61g48bc05i0zx1z8k0pklxnmn54ch136aqgsyli4"))))
 
          (makeicecat-patch
-          (local-file (search-patch "icecat-makeicecat.patch"))))
+          (local-file (search-patch "icecat-makeicecat.patch")))
+         (gnuzilla-fixes-patch
+          (local-file (search-patch "icecat-use-older-reveal-hidden-html.patch"))))
 
     (origin
       (method computed-origin-method)
@@ -642,6 +644,8 @@ from forcing GEXP-PROMISE."
                   (make-file-writable "makeicecat")
                   (invoke "patch" "--force" "--no-backup-if-mismatch"
                           "-p1" "--input" #+makeicecat-patch)
+                  (invoke "patch" "--force" "--no-backup-if-mismatch"
+                          "-p1" "--input" #+gnuzilla-fixes-patch)
                   (patch-shebang "makeicecat")
                   (substitute* "makeicecat"
                     (("^FFMAJOR=(.*)" all ffmajor)
diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch
index c2c59ec855..2978a5789e 100644
--- a/gnu/packages/patches/icecat-makeicecat.patch
+++ b/gnu/packages/patches/icecat-makeicecat.patch
@@ -25,7 +25,7 @@ index 8be2362..48716f2 100755
 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
 -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
--echo -n ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+-echo -n fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
 -
 -echo Extracting Firefox tarball
 -tar -xf firefox-${FFVERSION}esr.source.tar.xz
@@ -37,7 +37,7 @@ index 8be2362..48716f2 100755
 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
 +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
-+# echo -n ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
++# echo -n fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
 +# 
 +# echo Extracting Firefox tarball
 +# tar -xf firefox-${FFVERSION}esr.source.tar.xz
diff --git a/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch b/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch
new file mode 100644
index 0000000000..228adc23f1
--- /dev/null
+++ b/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch
@@ -0,0 +1,70 @@
+From 2e8618d22568b6e00892a17303d437dd700eca98 Mon Sep 17 00:00:00 2001
+From: Mark H Weaver 
+Date: Tue, 5 May 2020 21:27:41 -0400
+Subject: [PATCH] Revert "Update Reveal hidden HTML."
+
+I prefer the user interface of the old version.
+
+This reverts commit f6e3adb6b2344ee2c7bb453a305fd2d6fb4c194c.
+---
+ .../passive_improve_css.js                    | 23 ++++++++++++++-----
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js b/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js
+index 7692990..ca57982 100644
+--- a/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js
++++ b/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js
+@@ -10,6 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
+ */
+ 
+ 
++var bad = [];
++
+ function escapeHTML (unsafe_str) {
+     return unsafe_str
+       .replace(/&/g, '&')
+@@ -20,9 +22,14 @@ function escapeHTML (unsafe_str) {
+       .replace(/\//g, '/')
+ }
+ 
++function dounhide(){
++        for(var i = 0; i < bad.length; i++){
++                        bad[i].remove();
++                }
++}
++
+ console.log("passive_improve_css.js");
+ function reveal_css(){
+-	var bad = [];
+ 
+ 	var elements = document.getElementsByTagName("style");
+ 	for(var i = 0; i < elements.length; i++){
+@@ -41,16 +48,20 @@ function reveal_css(){
+ 
+ 		}
+ 	}
+-	if(bad.length > 0 && window.confirm("Hidden HTML detected, would you like to reveal it?")){
+-		for(var i = 0; i < bad.length; i++){
+-			bad[i].remove();
+-		}
++	if(bad.length > 0){
++		const insertedDiv = document.createElement('div');
++		insertedDiv.innerHTML= '
' +
++	                'Reveal hidden elements' +
++			'';
++		insertedDiv.style="position:fixed; bottom:1em; right:1em; opacity:0.8; z-index: 2147483647 !important; border-radius: 3px !important; background-color: #fff !important; padding: 0.5em !important;   box-shadow: 0 0 3px grey !important; font-color:#bbb!important; cursor: pointer!important;";
++		insertedDiv.addEventListener("click", dounhide, false);
++		document.body.insertBefore(insertedDiv, document.body.firstChild);
+ 	}
+ }
+ 
+ reveal_css();
+ 
+-
+ /*
+ var a = document.getElementsByTagName("style")[2];
+ var btn = document.createElement("style");        // Create a